
This reverts commit 806e06d1366b58878ced05cdd8d1d56394982fe6. Reason for revert: Breaks WebRTC roll to Chromium. https://chromium-review.googlesource.com/c/chromium/src/+/1375538 02:52:35.346 7748 [6936:11248:1213/025234.206:ERROR:mediaengine.cc(80)] Attempted to set RtpParameters with modified codecPayloadType (INVALID_MODIFICATION) Original change's description: > Implement read-only codecPayloadType in RtpParameters > > Bug: webrtc:7580 > Change-Id: I6d901afa97262b6c6d9fe6c7366df465ec77bfb3 > Reviewed-on: https://webrtc-review.googlesource.com/c/113944 > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Reviewed-by: Seth Hampson <shampson@webrtc.org> > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > Reviewed-by: Steve Anton <steveanton@webrtc.org> > Commit-Queue: Florent Castelli <orphis@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#25993} TBR=steveanton@webrtc.org,sakal@webrtc.org,andersc@webrtc.org,shampson@webrtc.org,orphis@webrtc.org Change-Id: I157f9a79ae7133395431891e15e2c053559d359b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7580 Reviewed-on: https://webrtc-review.googlesource.com/c/114300 Reviewed-by: Henrik Grunell <henrikg@webrtc.org> Commit-Queue: Henrik Grunell <henrikg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26000}
250 lines
6.6 KiB
Java
250 lines
6.6 KiB
Java
/*
|
|
* Copyright 2013 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
package org.webrtc;
|
|
|
|
import android.support.annotation.Nullable;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import org.webrtc.MediaStreamTrack;
|
|
|
|
/**
|
|
* The parameters for an {@code RtpSender}, as defined in
|
|
* http://w3c.github.io/webrtc-pc/#rtcrtpsender-interface.
|
|
*
|
|
* Note: These structures use nullable Integer/etc. types because in the
|
|
* future, they may be used to construct ORTC RtpSender/RtpReceivers, in
|
|
* which case "null" will be used to represent "choose the implementation
|
|
* default value".
|
|
*/
|
|
public class RtpParameters {
|
|
public static class Encoding {
|
|
// Set to true to cause this encoding to be sent, and false for it not to
|
|
// be sent.
|
|
public boolean active = true;
|
|
// If non-null, this represents the Transport Independent Application
|
|
// Specific maximum bandwidth defined in RFC3890. If null, there is no
|
|
// maximum bitrate.
|
|
@Nullable public Integer maxBitrateBps;
|
|
// The minimum bitrate in bps for video.
|
|
@Nullable public Integer minBitrateBps;
|
|
// The max framerate in fps for video.
|
|
@Nullable public Integer maxFramerate;
|
|
// The number of temporal layers for video.
|
|
@Nullable public Integer numTemporalLayers;
|
|
// SSRC to be used by this encoding.
|
|
// Can't be changed between getParameters/setParameters.
|
|
public Long ssrc;
|
|
|
|
@CalledByNative("Encoding")
|
|
Encoding(boolean active, Integer maxBitrateBps, Integer minBitrateBps, Integer maxFramerate,
|
|
Integer numTemporalLayers, Long ssrc) {
|
|
this.active = active;
|
|
this.maxBitrateBps = maxBitrateBps;
|
|
this.minBitrateBps = minBitrateBps;
|
|
this.maxFramerate = maxFramerate;
|
|
this.numTemporalLayers = numTemporalLayers;
|
|
this.ssrc = ssrc;
|
|
}
|
|
|
|
@CalledByNative("Encoding")
|
|
boolean getActive() {
|
|
return active;
|
|
}
|
|
|
|
@Nullable
|
|
@CalledByNative("Encoding")
|
|
Integer getMaxBitrateBps() {
|
|
return maxBitrateBps;
|
|
}
|
|
|
|
@Nullable
|
|
@CalledByNative("Encoding")
|
|
Integer getMinBitrateBps() {
|
|
return minBitrateBps;
|
|
}
|
|
|
|
@Nullable
|
|
@CalledByNative("Encoding")
|
|
Integer getMaxFramerate() {
|
|
return maxFramerate;
|
|
}
|
|
|
|
@Nullable
|
|
@CalledByNative("Encoding")
|
|
Integer getNumTemporalLayers() {
|
|
return numTemporalLayers;
|
|
}
|
|
|
|
@CalledByNative("Encoding")
|
|
Long getSsrc() {
|
|
return ssrc;
|
|
}
|
|
}
|
|
|
|
public static class Codec {
|
|
// Payload type used to identify this codec in RTP packets.
|
|
public int payloadType;
|
|
// Name used to identify the codec. Equivalent to MIME subtype.
|
|
public String name;
|
|
// The media type of this codec. Equivalent to MIME top-level type.
|
|
MediaStreamTrack.MediaType kind;
|
|
// Clock rate in Hertz.
|
|
public Integer clockRate;
|
|
// The number of audio channels used. Set to null for video codecs.
|
|
public Integer numChannels;
|
|
// The "format specific parameters" field from the "a=fmtp" line in the SDP
|
|
public Map<String, String> parameters;
|
|
|
|
@CalledByNative("Codec")
|
|
Codec(int payloadType, String name, MediaStreamTrack.MediaType kind, Integer clockRate,
|
|
Integer numChannels, Map<String, String> parameters) {
|
|
this.payloadType = payloadType;
|
|
this.name = name;
|
|
this.kind = kind;
|
|
this.clockRate = clockRate;
|
|
this.numChannels = numChannels;
|
|
this.parameters = parameters;
|
|
}
|
|
|
|
@CalledByNative("Codec")
|
|
int getPayloadType() {
|
|
return payloadType;
|
|
}
|
|
|
|
@CalledByNative("Codec")
|
|
String getName() {
|
|
return name;
|
|
}
|
|
|
|
@CalledByNative("Codec")
|
|
MediaStreamTrack.MediaType getKind() {
|
|
return kind;
|
|
}
|
|
|
|
@CalledByNative("Codec")
|
|
Integer getClockRate() {
|
|
return clockRate;
|
|
}
|
|
|
|
@CalledByNative("Codec")
|
|
Integer getNumChannels() {
|
|
return numChannels;
|
|
}
|
|
|
|
@CalledByNative("Codec")
|
|
Map getParameters() {
|
|
return parameters;
|
|
}
|
|
}
|
|
|
|
public static class Rtcp {
|
|
/** The Canonical Name used by RTCP */
|
|
private final String cname;
|
|
/** Whether reduced size RTCP is configured or compound RTCP */
|
|
private final boolean reducedSize;
|
|
|
|
@CalledByNative("Rtcp")
|
|
Rtcp(String cname, boolean reducedSize) {
|
|
this.cname = cname;
|
|
this.reducedSize = reducedSize;
|
|
}
|
|
|
|
@CalledByNative("Rtcp")
|
|
public String getCname() {
|
|
return cname;
|
|
}
|
|
|
|
@CalledByNative("Rtcp")
|
|
public boolean getReducedSize() {
|
|
return reducedSize;
|
|
}
|
|
}
|
|
|
|
public static class HeaderExtension {
|
|
/** The URI of the RTP header extension, as defined in RFC5285. */
|
|
private final String uri;
|
|
/** The value put in the RTP packet to identify the header extension. */
|
|
private final int id;
|
|
/** Whether the header extension is encrypted or not. */
|
|
private final boolean encrypted;
|
|
|
|
@CalledByNative("HeaderExtension")
|
|
HeaderExtension(String uri, int id, boolean encrypted) {
|
|
this.uri = uri;
|
|
this.id = id;
|
|
this.encrypted = encrypted;
|
|
}
|
|
|
|
@CalledByNative("HeaderExtension")
|
|
public String getUri() {
|
|
return uri;
|
|
}
|
|
|
|
@CalledByNative("HeaderExtension")
|
|
public int getId() {
|
|
return id;
|
|
}
|
|
|
|
@CalledByNative("HeaderExtension")
|
|
public boolean getEncrypted() {
|
|
return encrypted;
|
|
}
|
|
}
|
|
|
|
public final String transactionId;
|
|
|
|
private final Rtcp rtcp;
|
|
|
|
private final List<HeaderExtension> headerExtensions;
|
|
|
|
public final List<Encoding> encodings;
|
|
// Codec parameters can't currently be changed between getParameters and
|
|
// setParameters. Though in the future it will be possible to reorder them or
|
|
// remove them.
|
|
public final List<Codec> codecs;
|
|
|
|
@CalledByNative
|
|
RtpParameters(String transactionId, Rtcp rtcp, List<HeaderExtension> headerExtensions,
|
|
List<Encoding> encodings, List<Codec> codecs) {
|
|
this.transactionId = transactionId;
|
|
this.rtcp = rtcp;
|
|
this.headerExtensions = headerExtensions;
|
|
this.encodings = encodings;
|
|
this.codecs = codecs;
|
|
}
|
|
|
|
@CalledByNative
|
|
String getTransactionId() {
|
|
return transactionId;
|
|
}
|
|
|
|
@CalledByNative
|
|
public Rtcp getRtcp() {
|
|
return rtcp;
|
|
}
|
|
|
|
@CalledByNative
|
|
public List<HeaderExtension> getHeaderExtensions() {
|
|
return headerExtensions;
|
|
}
|
|
|
|
@CalledByNative
|
|
List<Encoding> getEncodings() {
|
|
return encodings;
|
|
}
|
|
|
|
@CalledByNative
|
|
List<Codec> getCodecs() {
|
|
return codecs;
|
|
}
|
|
}
|