Remove obsolete @CalledByNative annotation values Bug: chromium:496331306 Change-Id: I40c14806f226c024e8325bf73a4275b91f0cff21 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/460920 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Auto-Submit: Andrew Grieve <agrieve@google.com> Commit-Queue: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47522}
diff --git a/sdk/android/api/org/webrtc/CryptoOptions.java b/sdk/android/api/org/webrtc/CryptoOptions.java index 23f1e70..cb302df 100644 --- a/sdk/android/api/org/webrtc/CryptoOptions.java +++ b/sdk/android/api/org/webrtc/CryptoOptions.java
@@ -48,17 +48,17 @@ this.enableEncryptedRtpHeaderExtensions = enableEncryptedRtpHeaderExtensions; } - @CalledByNative("Srtp") + @CalledByNative public boolean getEnableGcmCryptoSuites() { return enableGcmCryptoSuites; } - @CalledByNative("Srtp") + @CalledByNative public boolean getEnableAes128Sha1_32CryptoCipher() { return enableAes128Sha1_32CryptoCipher; } - @CalledByNative("Srtp") + @CalledByNative public boolean getEnableEncryptedRtpHeaderExtensions() { return enableEncryptedRtpHeaderExtensions; } @@ -80,7 +80,7 @@ this.requireFrameEncryption = requireFrameEncryption; } - @CalledByNative("SFrame") + @CalledByNative public boolean getRequireFrameEncryption() { return requireFrameEncryption; }
diff --git a/sdk/android/api/org/webrtc/DataChannel.java b/sdk/android/api/org/webrtc/DataChannel.java index c69111b..be125e2 100644 --- a/sdk/android/api/org/webrtc/DataChannel.java +++ b/sdk/android/api/org/webrtc/DataChannel.java
@@ -26,32 +26,32 @@ // Optional unsigned short in WebIDL, -1 means unspecified. public int id = -1; - @CalledByNative("Init") + @CalledByNative boolean getOrdered() { return ordered; } - @CalledByNative("Init") + @CalledByNative int getMaxRetransmitTimeMs() { return maxRetransmitTimeMs; } - @CalledByNative("Init") + @CalledByNative int getMaxRetransmits() { return maxRetransmits; } - @CalledByNative("Init") + @CalledByNative String getProtocol() { return protocol; } - @CalledByNative("Init") + @CalledByNative boolean getNegotiated() { return negotiated; } - @CalledByNative("Init") + @CalledByNative int getId() { return id; } @@ -68,7 +68,7 @@ */ public final boolean binary; - @CalledByNative("Buffer") + @CalledByNative public Buffer(ByteBuffer data, boolean binary) { this.data = data; this.binary = binary; @@ -78,15 +78,15 @@ /** Java version of C++ DataChannelObserver. */ public interface Observer { /** The data channel's bufferedAmount has changed. */ - @CalledByNative("Observer") public void onBufferedAmountChange(long previousAmount); + @CalledByNative public void onBufferedAmountChange(long previousAmount); /** The data channel state has changed. */ - @CalledByNative("Observer") public void onStateChange(); + @CalledByNative public void onStateChange(); /** * A data buffer was successfully received. NOTE: `buffer.data` will be * freed once this function returns so callers who want to use the data * asynchronously must make sure to copy it first. */ - @CalledByNative("Observer") public void onMessage(Buffer buffer); + @CalledByNative public void onMessage(Buffer buffer); } /** Keep in sync with DataChannelInterface::DataState. */ @@ -96,7 +96,7 @@ CLOSING, CLOSED; - @CalledByNative("State") + @CalledByNative static State fromNativeIndex(int nativeIndex) { return values()[nativeIndex]; }
diff --git a/sdk/android/api/org/webrtc/EncodedImage.java b/sdk/android/api/org/webrtc/EncodedImage.java index 849a602..ad7192a 100644 --- a/sdk/android/api/org/webrtc/EncodedImage.java +++ b/sdk/android/api/org/webrtc/EncodedImage.java
@@ -35,7 +35,7 @@ return nativeIndex; } - @CalledByNative("FrameType") + @CalledByNative static FrameType fromNativeIndex(int nativeIndex) { for (FrameType type : FrameType.values()) { if (type.getNative() == nativeIndex) {
diff --git a/sdk/android/api/org/webrtc/MediaConstraints.java b/sdk/android/api/org/webrtc/MediaConstraints.java index 9da3c77..2e77f0d 100644 --- a/sdk/android/api/org/webrtc/MediaConstraints.java +++ b/sdk/android/api/org/webrtc/MediaConstraints.java
@@ -29,12 +29,12 @@ this.value = value; } - @CalledByNative("KeyValuePair") + @CalledByNative public String getKey() { return key; } - @CalledByNative("KeyValuePair") + @CalledByNative public String getValue() { return value; }
diff --git a/sdk/android/api/org/webrtc/MediaSource.java b/sdk/android/api/org/webrtc/MediaSource.java index 9245e3e..66e4af5 100644 --- a/sdk/android/api/org/webrtc/MediaSource.java +++ b/sdk/android/api/org/webrtc/MediaSource.java
@@ -19,7 +19,7 @@ ENDED, MUTED; - @CalledByNative("State") + @CalledByNative static State fromNativeIndex(int nativeIndex) { return values()[nativeIndex]; }
diff --git a/sdk/android/api/org/webrtc/MediaStreamTrack.java b/sdk/android/api/org/webrtc/MediaStreamTrack.java index 8e39d3c..c73ee20 100644 --- a/sdk/android/api/org/webrtc/MediaStreamTrack.java +++ b/sdk/android/api/org/webrtc/MediaStreamTrack.java
@@ -22,7 +22,7 @@ LIVE, ENDED; - @CalledByNative("State") + @CalledByNative static State fromNativeIndex(int nativeIndex) { return values()[nativeIndex]; } @@ -39,12 +39,12 @@ this.nativeIndex = nativeIndex; } - @CalledByNative("MediaType") + @CalledByNative int getNative() { return nativeIndex; } - @CalledByNative("MediaType") + @CalledByNative static MediaType fromNativeIndex(int nativeIndex) { for (MediaType type : MediaType.values()) { if (type.getNative() == nativeIndex) {
diff --git a/sdk/android/api/org/webrtc/Metrics.java b/sdk/android/api/org/webrtc/Metrics.java index 2533768..6f641bd 100644 --- a/sdk/android/api/org/webrtc/Metrics.java +++ b/sdk/android/api/org/webrtc/Metrics.java
@@ -47,14 +47,14 @@ public final Map<Integer, Integer> samples = new HashMap<Integer, Integer>(); // <value, # of events> - @CalledByNative("HistogramInfo") + @CalledByNative public HistogramInfo(int min, int max, int bucketCount) { this.min = min; this.max = max; this.bucketCount = bucketCount; } - @CalledByNative("HistogramInfo") + @CalledByNative public void addSample(int value, int numEvents) { samples.put(value, numEvents); }
diff --git a/sdk/android/api/org/webrtc/NetworkChangeDetector.java b/sdk/android/api/org/webrtc/NetworkChangeDetector.java index 4dea3ea..e1e1766 100644 --- a/sdk/android/api/org/webrtc/NetworkChangeDetector.java +++ b/sdk/android/api/org/webrtc/NetworkChangeDetector.java
@@ -49,7 +49,7 @@ } @SuppressWarnings("UnusedMethod") - @CalledByNative("IPAddress") + @CalledByNative private byte[] getAddress() { return address; } @@ -81,37 +81,37 @@ } @SuppressWarnings("UnusedMethod") - @CalledByNative("NetworkInformation") + @CalledByNative private IPAddress[] getIpAddresses() { return ipAddresses; } @SuppressWarnings("UnusedMethod") - @CalledByNative("NetworkInformation") + @CalledByNative private ConnectionType getConnectionType() { return type; } @SuppressWarnings("UnusedMethod") - @CalledByNative("NetworkInformation") + @CalledByNative private ConnectionType getUnderlyingConnectionTypeForVpn() { return underlyingTypeForVpn; } @SuppressWarnings("UnusedMethod") - @CalledByNative("NetworkInformation") + @CalledByNative private long getHandle() { return handle; } @SuppressWarnings("UnusedMethod") - @CalledByNative("NetworkInformation") + @CalledByNative private String getName() { return name; } @SuppressWarnings("UnusedMethod") - @CalledByNative("NetworkInformation") + @CalledByNative private int getSliceAsInt() { return slice.code; }
diff --git a/sdk/android/api/org/webrtc/PeerConnection.java b/sdk/android/api/org/webrtc/PeerConnection.java index 245c7a3..6f0d82d 100644 --- a/sdk/android/api/org/webrtc/PeerConnection.java +++ b/sdk/android/api/org/webrtc/PeerConnection.java
@@ -38,7 +38,7 @@ GATHERING, COMPLETE; - @CalledByNative("IceGatheringState") + @CalledByNative static IceGatheringState fromNativeIndex(int nativeIndex) { return values()[nativeIndex]; } @@ -54,7 +54,7 @@ DISCONNECTED, CLOSED; - @CalledByNative("IceConnectionState") + @CalledByNative static IceConnectionState fromNativeIndex(int nativeIndex) { return values()[nativeIndex]; } @@ -69,7 +69,7 @@ FAILED, CLOSED; - @CalledByNative("PeerConnectionState") + @CalledByNative static PeerConnectionState fromNativeIndex(int nativeIndex) { return values()[nativeIndex]; } @@ -90,7 +90,7 @@ HAVE_REMOTE_PRANSWER, CLOSED; - @CalledByNative("SignalingState") + @CalledByNative static SignalingState fromNativeIndex(int nativeIndex) { return values()[nativeIndex]; } @@ -99,69 +99,69 @@ /** Java version of PeerConnectionObserver. */ public static interface Observer { /** Triggered when the SignalingState changes. */ - @CalledByNative("Observer") void onSignalingChange(SignalingState newState); + @CalledByNative void onSignalingChange(SignalingState newState); /** Triggered when the IceConnectionState changes. */ - @CalledByNative("Observer") void onIceConnectionChange(IceConnectionState newState); + @CalledByNative void onIceConnectionChange(IceConnectionState newState); /* Triggered when the standard-compliant state transition of IceConnectionState happens. */ - @CalledByNative("Observer") + @CalledByNative default void onStandardizedIceConnectionChange(IceConnectionState newState) {} /** Triggered when the PeerConnectionState changes. */ - @CalledByNative("Observer") + @CalledByNative default void onConnectionChange(PeerConnectionState newState) {} /** Triggered when the ICE connection receiving status changes. */ - @CalledByNative("Observer") void onIceConnectionReceivingChange(boolean receiving); + @CalledByNative void onIceConnectionReceivingChange(boolean receiving); /** Triggered when the IceGatheringState changes. */ - @CalledByNative("Observer") void onIceGatheringChange(IceGatheringState newState); + @CalledByNative void onIceGatheringChange(IceGatheringState newState); /** Triggered when a new ICE candidate has been found. */ - @CalledByNative("Observer") void onIceCandidate(IceCandidate candidate); + @CalledByNative void onIceCandidate(IceCandidate candidate); /** Triggered when gathering of an ICE candidate failed. */ - default @CalledByNative("Observer") void onIceCandidateError(IceCandidateErrorEvent event) {} + default @CalledByNative void onIceCandidateError(IceCandidateErrorEvent event) {} /** Triggered when some ICE candidates have been removed. */ - @CalledByNative("Observer") void onIceCandidatesRemoved(IceCandidate[] candidates); + @CalledByNative void onIceCandidatesRemoved(IceCandidate[] candidates); /** Triggered when the ICE candidate pair is changed. */ - @CalledByNative("Observer") + @CalledByNative default void onSelectedCandidatePairChanged(CandidatePairChangeEvent event) {} /** Triggered when media is received on a new stream from remote peer. */ - @CalledByNative("Observer") void onAddStream(MediaStream stream); + @CalledByNative void onAddStream(MediaStream stream); /** Triggered when a remote peer close a stream. */ - @CalledByNative("Observer") void onRemoveStream(MediaStream stream); + @CalledByNative void onRemoveStream(MediaStream stream); /** Triggered when a remote peer opens a DataChannel. */ - @CalledByNative("Observer") void onDataChannel(DataChannel dataChannel); + @CalledByNative void onDataChannel(DataChannel dataChannel); /** Triggered when renegotiation is necessary. */ - @CalledByNative("Observer") void onRenegotiationNeeded(); + @CalledByNative void onRenegotiationNeeded(); /** * Triggered when a new track is signaled by the remote peer, as a result of * setRemoteDescription. */ - @CalledByNative("Observer") + @CalledByNative default void onAddTrack(RtpReceiver receiver, MediaStream[] mediaStreams){}; /** * Triggered when a previously added remote track is removed by the remote * peer, as a result of setRemoteDescription. */ - @CalledByNative("Observer") default void onRemoveTrack(RtpReceiver receiver){}; + @CalledByNative default void onRemoveTrack(RtpReceiver receiver){}; /** * Triggered when the signaling from SetRemoteDescription indicates that a transceiver * will be receiving media from a remote endpoint. This is only called if UNIFIED_PLAN * semantics are specified. The transceiver will be disposed automatically. */ - @CalledByNative("Observer") default void onTrack(RtpTransceiver transceiver){}; + @CalledByNative default void onTrack(RtpTransceiver transceiver){}; } /** Java version of PeerConnectionInterface.IceServer. */ @@ -333,40 +333,40 @@ } @Nullable - @CalledByNative("IceServer") + @CalledByNative List<String> getUrls() { return urls; } @Nullable - @CalledByNative("IceServer") + @CalledByNative String getUsername() { return username; } @Nullable - @CalledByNative("IceServer") + @CalledByNative String getPassword() { return password; } - @CalledByNative("IceServer") + @CalledByNative TlsCertPolicy getTlsCertPolicy() { return tlsCertPolicy; } @Nullable - @CalledByNative("IceServer") + @CalledByNative String getHostname() { return hostname; } - @CalledByNative("IceServer") + @CalledByNative List<String> getTlsAlpnProtocols() { return tlsAlpnProtocols; } - @CalledByNative("IceServer") + @CalledByNative List<String> getTlsEllipticCurves() { return tlsEllipticCurves; } @@ -413,7 +413,7 @@ } @Nullable - @CalledByNative("AdapterType") + @CalledByNative static AdapterType fromNativeIndex(int nativeIndex) { return BY_BITMASK.get(nativeIndex); } @@ -627,219 +627,219 @@ portAllocatorFlags = 0; } - @CalledByNative("RTCConfiguration") + @CalledByNative IceTransportsType getIceTransportsType() { return iceTransportsType; } - @CalledByNative("RTCConfiguration") + @CalledByNative List<IceServer> getIceServers() { return iceServers; } - @CalledByNative("RTCConfiguration") + @CalledByNative BundlePolicy getBundlePolicy() { return bundlePolicy; } - @CalledByNative("RTCConfiguration") + @CalledByNative PortPrunePolicy getTurnPortPrunePolicy() { return turnPortPrunePolicy; } @Nullable - @CalledByNative("RTCConfiguration") + @CalledByNative RtcCertificatePem getCertificate() { return certificate; } - @CalledByNative("RTCConfiguration") + @CalledByNative RtcpMuxPolicy getRtcpMuxPolicy() { return rtcpMuxPolicy; } - @CalledByNative("RTCConfiguration") + @CalledByNative TcpCandidatePolicy getTcpCandidatePolicy() { return tcpCandidatePolicy; } - @CalledByNative("RTCConfiguration") + @CalledByNative CandidateNetworkPolicy getCandidateNetworkPolicy() { return candidateNetworkPolicy; } - @CalledByNative("RTCConfiguration") + @CalledByNative int getAudioJitterBufferMaxPackets() { return audioJitterBufferMaxPackets; } - @CalledByNative("RTCConfiguration") + @CalledByNative boolean getAudioJitterBufferFastAccelerate() { return audioJitterBufferFastAccelerate; } - @CalledByNative("RTCConfiguration") + @CalledByNative int getIceConnectionReceivingTimeout() { return iceConnectionReceivingTimeout; } - @CalledByNative("RTCConfiguration") + @CalledByNative int getIceBackupCandidatePairPingInterval() { return iceBackupCandidatePairPingInterval; } - @CalledByNative("RTCConfiguration") + @CalledByNative KeyType getKeyType() { return keyType; } - @CalledByNative("RTCConfiguration") + @CalledByNative ContinualGatheringPolicy getContinualGatheringPolicy() { return continualGatheringPolicy; } - @CalledByNative("RTCConfiguration") + @CalledByNative int getIceCandidatePoolSize() { return iceCandidatePoolSize; } - @CalledByNative("RTCConfiguration") + @CalledByNative boolean getPruneTurnPorts() { return pruneTurnPorts; } - @CalledByNative("RTCConfiguration") + @CalledByNative boolean getPresumeWritableWhenFullyRelayed() { return presumeWritableWhenFullyRelayed; } - @CalledByNative("RTCConfiguration") + @CalledByNative boolean getSurfaceIceCandidatesOnIceTransportTypeChanged() { return surfaceIceCandidatesOnIceTransportTypeChanged; } @Nullable - @CalledByNative("RTCConfiguration") + @CalledByNative Integer getIceCheckIntervalStrongConnectivity() { return iceCheckIntervalStrongConnectivityMs; } @Nullable - @CalledByNative("RTCConfiguration") + @CalledByNative Integer getIceCheckIntervalWeakConnectivity() { return iceCheckIntervalWeakConnectivityMs; } @Nullable - @CalledByNative("RTCConfiguration") + @CalledByNative Integer getIceCheckMinInterval() { return iceCheckMinInterval; } @Nullable - @CalledByNative("RTCConfiguration") + @CalledByNative Integer getIceUnwritableTimeout() { return iceUnwritableTimeMs; } @Nullable - @CalledByNative("RTCConfiguration") + @CalledByNative Integer getIceUnwritableMinChecks() { return iceUnwritableMinChecks; } @Nullable - @CalledByNative("RTCConfiguration") + @CalledByNative Integer getStunCandidateKeepaliveInterval() { return stunCandidateKeepaliveIntervalMs; } @Nullable - @CalledByNative("RTCConfiguration") + @CalledByNative Integer getStableWritableConnectionPingIntervalMs() { return stableWritableConnectionPingIntervalMs; } - @CalledByNative("RTCConfiguration") + @CalledByNative boolean getDisableIPv6OnWifi() { return disableIPv6OnWifi; } - @CalledByNative("RTCConfiguration") + @CalledByNative int getMaxIPv6Networks() { return maxIPv6Networks; } @Nullable - @CalledByNative("RTCConfiguration") + @CalledByNative TurnCustomizer getTurnCustomizer() { return turnCustomizer; } - @CalledByNative("RTCConfiguration") + @CalledByNative boolean getEnableDscp() { return enableDscp; } - @CalledByNative("RTCConfiguration") + @CalledByNative boolean getEnableCpuOveruseDetection() { return enableCpuOveruseDetection; } - @CalledByNative("RTCConfiguration") + @CalledByNative boolean getSuspendBelowMinBitrate() { return suspendBelowMinBitrate; } @Nullable - @CalledByNative("RTCConfiguration") + @CalledByNative Integer getScreencastMinBitrate() { return screencastMinBitrate; } - @CalledByNative("RTCConfiguration") + @CalledByNative AdapterType getNetworkPreference() { return networkPreference; } - @CalledByNative("RTCConfiguration") + @CalledByNative SdpSemantics getSdpSemantics() { return sdpSemantics; } @Nullable - @CalledByNative("RTCConfiguration") + @CalledByNative CryptoOptions getCryptoOptions() { return cryptoOptions; } @Nullable - @CalledByNative("RTCConfiguration") + @CalledByNative String getTurnLoggingId() { return turnLoggingId; } - @CalledByNative("RTCConfiguration") + @CalledByNative boolean getEnableImplicitRollback() { return enableImplicitRollback; } - @CalledByNative("RTCConfiguration") + @CalledByNative boolean getOfferExtmapAllowMixed() { return offerExtmapAllowMixed; } - @CalledByNative("RTCConfiguration") + @CalledByNative int getPortAllocatorMinPort() { return portAllocatorMinPort; } - @CalledByNative("RTCConfiguration") + @CalledByNative int getPortAllocatorMaxPort() { return portAllocatorMaxPort; } - @CalledByNative("RTCConfiguration") + @CalledByNative @PortAllocatorFlags int getPortAllocatorFlags() { return portAllocatorFlags;
diff --git a/sdk/android/api/org/webrtc/PeerConnectionFactory.java b/sdk/android/api/org/webrtc/PeerConnectionFactory.java index 857b23c..bd6bff1 100644 --- a/sdk/android/api/org/webrtc/PeerConnectionFactory.java +++ b/sdk/android/api/org/webrtc/PeerConnectionFactory.java
@@ -148,17 +148,17 @@ public boolean disableEncryption; public boolean disableNetworkMonitor; - @CalledByNative("Options") + @CalledByNative int getNetworkIgnoreMask() { return networkIgnoreMask; } - @CalledByNative("Options") + @CalledByNative boolean getDisableEncryption() { return disableEncryption; } - @CalledByNative("Options") + @CalledByNative boolean getDisableNetworkMonitor() { return disableNetworkMonitor; }
diff --git a/sdk/android/api/org/webrtc/RtpCapabilities.java b/sdk/android/api/org/webrtc/RtpCapabilities.java index 18acfd3..a95b301 100644 --- a/sdk/android/api/org/webrtc/RtpCapabilities.java +++ b/sdk/android/api/org/webrtc/RtpCapabilities.java
@@ -33,7 +33,7 @@ public CodecCapability() {} - @CalledByNative("CodecCapability") + @CalledByNative CodecCapability(int preferredPayloadType, String name, MediaStreamTrack.MediaType kind, Integer clockRate, Integer numChannels, String mimeType, Map<String, String> parameters) { this.preferredPayloadType = preferredPayloadType; @@ -45,32 +45,32 @@ this.mimeType = mimeType; } - @CalledByNative("CodecCapability") + @CalledByNative int getPreferredPayloadType() { return preferredPayloadType; } - @CalledByNative("CodecCapability") + @CalledByNative String getName() { return name; } - @CalledByNative("CodecCapability") + @CalledByNative MediaStreamTrack.MediaType getKind() { return kind; } - @CalledByNative("CodecCapability") + @CalledByNative Integer getClockRate() { return clockRate; } - @CalledByNative("CodecCapability") + @CalledByNative Integer getNumChannels() { return numChannels; } - @CalledByNative("CodecCapability") + @CalledByNative Map<String, String> getParameters() { return parameters; } @@ -81,24 +81,24 @@ private final int preferredId; private final boolean preferredEncrypted; - @CalledByNative("HeaderExtensionCapability") + @CalledByNative HeaderExtensionCapability(String uri, int preferredId, boolean preferredEncrypted) { this.uri = uri; this.preferredId = preferredId; this.preferredEncrypted = preferredEncrypted; } - @CalledByNative("HeaderExtensionCapability") + @CalledByNative public String getUri() { return uri; } - @CalledByNative("HeaderExtensionCapability") + @CalledByNative public int getPreferredId() { return preferredId; } - @CalledByNative("HeaderExtensionCapability") + @CalledByNative public boolean getPreferredEncrypted() { return preferredEncrypted; }
diff --git a/sdk/android/api/org/webrtc/RtpParameters.java b/sdk/android/api/org/webrtc/RtpParameters.java index 2c9a537..1166563 100644 --- a/sdk/android/api/org/webrtc/RtpParameters.java +++ b/sdk/android/api/org/webrtc/RtpParameters.java
@@ -45,7 +45,7 @@ /** Does not degrade resolution or framerate. */ DISABLED; - @CalledByNative("DegradationPreference") + @CalledByNative static DegradationPreference fromNativeIndex(int nativeIndex) { return values()[nativeIndex]; } @@ -98,7 +98,7 @@ this.scaleResolutionDownBy = scaleResolutionDownBy; } - @CalledByNative("Encoding") + @CalledByNative Encoding(String rid, boolean active, double bitratePriority, @Priority int networkPriority, Integer maxBitrateBps, Integer minBitrateBps, Integer maxFramerate, Integer numTemporalLayers, Double scaleResolutionDownBy, Long ssrc, @@ -117,63 +117,63 @@ } @Nullable - @CalledByNative("Encoding") + @CalledByNative String getRid() { return rid; } - @CalledByNative("Encoding") + @CalledByNative boolean getActive() { return active; } - @CalledByNative("Encoding") + @CalledByNative double getBitratePriority() { return bitratePriority; } - @CalledByNative("Encoding") + @CalledByNative @Priority int getNetworkPriority() { return networkPriority; } @Nullable - @CalledByNative("Encoding") + @CalledByNative Integer getMaxBitrateBps() { return maxBitrateBps; } @Nullable - @CalledByNative("Encoding") + @CalledByNative Integer getMinBitrateBps() { return minBitrateBps; } @Nullable - @CalledByNative("Encoding") + @CalledByNative Integer getMaxFramerate() { return maxFramerate; } @Nullable - @CalledByNative("Encoding") + @CalledByNative Integer getNumTemporalLayers() { return numTemporalLayers; } @Nullable - @CalledByNative("Encoding") + @CalledByNative Double getScaleResolutionDownBy() { return scaleResolutionDownBy; } - @CalledByNative("Encoding") + @CalledByNative Long getSsrc() { return ssrc; } - @CalledByNative("Encoding") + @CalledByNative boolean getAdaptivePTime() { return adaptiveAudioPacketTime; } @@ -193,7 +193,7 @@ // The "format specific parameters" field from the "a=fmtp" line in the SDP public Map<String, String> parameters; - @CalledByNative("Codec") + @CalledByNative Codec(int payloadType, String name, MediaStreamTrack.MediaType kind, Integer clockRate, Integer numChannels, Map<String, String> parameters) { this.payloadType = payloadType; @@ -204,32 +204,32 @@ this.parameters = parameters; } - @CalledByNative("Codec") + @CalledByNative int getPayloadType() { return payloadType; } - @CalledByNative("Codec") + @CalledByNative String getName() { return name; } - @CalledByNative("Codec") + @CalledByNative MediaStreamTrack.MediaType getKind() { return kind; } - @CalledByNative("Codec") + @CalledByNative Integer getClockRate() { return clockRate; } - @CalledByNative("Codec") + @CalledByNative Integer getNumChannels() { return numChannels; } - @CalledByNative("Codec") + @CalledByNative Map<String, String> getParameters() { return parameters; } @@ -241,18 +241,18 @@ /** Whether reduced size RTCP is configured or compound RTCP */ private final boolean reducedSize; - @CalledByNative("Rtcp") + @CalledByNative Rtcp(String cname, boolean reducedSize) { this.cname = cname; this.reducedSize = reducedSize; } - @CalledByNative("Rtcp") + @CalledByNative public String getCname() { return cname; } - @CalledByNative("Rtcp") + @CalledByNative public boolean getReducedSize() { return reducedSize; } @@ -266,24 +266,24 @@ /** Whether the header extension is encrypted or not. */ private final boolean encrypted; - @CalledByNative("HeaderExtension") + @CalledByNative HeaderExtension(String uri, int id, boolean encrypted) { this.uri = uri; this.id = id; this.encrypted = encrypted; } - @CalledByNative("HeaderExtension") + @CalledByNative public String getUri() { return uri; } - @CalledByNative("HeaderExtension") + @CalledByNative public int getId() { return id; } - @CalledByNative("HeaderExtension") + @CalledByNative public boolean getEncrypted() { return encrypted; }
diff --git a/sdk/android/api/org/webrtc/RtpReceiver.java b/sdk/android/api/org/webrtc/RtpReceiver.java index adb7b31..37bcbf4 100644 --- a/sdk/android/api/org/webrtc/RtpReceiver.java +++ b/sdk/android/api/org/webrtc/RtpReceiver.java
@@ -18,12 +18,12 @@ /** Java wrapper for a C++ RtpReceiverObserverInterface*/ public static interface Observer { // Called when the first audio or video packet is received. - @CalledByNative("Observer") + @CalledByNative public void onFirstPacketReceived(MediaStreamTrack.MediaType media_type); // Called when the first audio or video packet is received after // receptiveness changed. // TODO: crbug.com/40821064 - remove default implementation. - @CalledByNative("Observer") + @CalledByNative public default void onFirstPacketReceivedAfterReceptiveChange( MediaStreamTrack.MediaType media_type) {} }
diff --git a/sdk/android/api/org/webrtc/RtpTransceiver.java b/sdk/android/api/org/webrtc/RtpTransceiver.java index f3bb436..cac7c88 100644 --- a/sdk/android/api/org/webrtc/RtpTransceiver.java +++ b/sdk/android/api/org/webrtc/RtpTransceiver.java
@@ -47,12 +47,12 @@ this.nativeIndex = nativeIndex; } - @CalledByNative("RtpTransceiverDirection") + @CalledByNative int getNativeIndex() { return nativeIndex; } - @CalledByNative("RtpTransceiverDirection") + @CalledByNative static RtpTransceiverDirection fromNativeIndex(int nativeIndex) { for (RtpTransceiverDirection type : RtpTransceiverDirection.values()) { if (type.getNativeIndex() == nativeIndex) { @@ -94,17 +94,17 @@ this.sendEncodings = new ArrayList<RtpParameters.Encoding>(sendEncodings); } - @CalledByNative("RtpTransceiverInit") + @CalledByNative int getDirectionNativeIndex() { return direction.getNativeIndex(); } - @CalledByNative("RtpTransceiverInit") + @CalledByNative List<String> getStreamIds() { return new ArrayList<String>(this.streamIds); } - @CalledByNative("RtpTransceiverInit") + @CalledByNative List<RtpParameters.Encoding> getSendEncodings() { return new ArrayList<RtpParameters.Encoding>(this.sendEncodings); }
diff --git a/sdk/android/api/org/webrtc/SessionDescription.java b/sdk/android/api/org/webrtc/SessionDescription.java index be89599..fad366d 100644 --- a/sdk/android/api/org/webrtc/SessionDescription.java +++ b/sdk/android/api/org/webrtc/SessionDescription.java
@@ -29,7 +29,7 @@ return name().toLowerCase(Locale.US); } - @CalledByNative("Type") + @CalledByNative public static Type fromCanonicalForm(String canonical) { return Type.valueOf(Type.class, canonical.toUpperCase(Locale.US)); }
diff --git a/sdk/android/api/org/webrtc/StatsReport.java b/sdk/android/api/org/webrtc/StatsReport.java index b8f1cf8..29a5fe9 100644 --- a/sdk/android/api/org/webrtc/StatsReport.java +++ b/sdk/android/api/org/webrtc/StatsReport.java
@@ -17,7 +17,7 @@ public final String name; public final String value; - @CalledByNative("Value") + @CalledByNative public Value(String name, String value) { this.name = name; this.value = value;
diff --git a/sdk/android/api/org/webrtc/VideoDecoder.java b/sdk/android/api/org/webrtc/VideoDecoder.java index 195daf5..509045d 100644 --- a/sdk/android/api/org/webrtc/VideoDecoder.java +++ b/sdk/android/api/org/webrtc/VideoDecoder.java
@@ -21,7 +21,7 @@ public final int width; public final int height; - @CalledByNative("Settings") + @CalledByNative public Settings(int numberOfCores, int width, int height) { this.numberOfCores = numberOfCores; this.width = width;
diff --git a/sdk/android/api/org/webrtc/VideoEncoder.java b/sdk/android/api/org/webrtc/VideoEncoder.java index 7c07c82..3682d78 100644 --- a/sdk/android/api/org/webrtc/VideoEncoder.java +++ b/sdk/android/api/org/webrtc/VideoEncoder.java
@@ -38,7 +38,7 @@ automaticResizeOn, new VideoEncoder.Capabilities(false /* lossNotification */)); } - @CalledByNative("Settings") + @CalledByNative public Settings(int numberOfCores, int width, int height, int startBitrate, int maxFramerate, int numberOfSimulcastStreams, boolean automaticResizeOn, Capabilities capabilities) { this.numberOfCores = numberOfCores; @@ -60,7 +60,7 @@ */ public final boolean lossNotification; - @CalledByNative("Capabilities") + @CalledByNative public Capabilities(boolean lossNotification) { this.lossNotification = lossNotification; } @@ -70,7 +70,7 @@ public class EncodeInfo { public final EncodedImage.FrameType[] frameTypes; - @CalledByNative("EncodeInfo") + @CalledByNative public EncodeInfo(EncodedImage.FrameType[] frameTypes) { this.frameTypes = frameTypes; } @@ -100,7 +100,7 @@ * Initializes the allocation with a two dimensional array of bitrates. The first index of the * array is the spatial layer and the second index in the temporal layer. */ - @CalledByNative("BitrateAllocation") + @CalledByNative public BitrateAllocation(int[][] bitratesBbs) { this.bitratesBbs = bitratesBbs; } @@ -215,22 +215,22 @@ this.maxBitrateBps = maxBitrateBps; } - @CalledByNative("ResolutionBitrateLimits") + @CalledByNative public int getFrameSizePixels() { return frameSizePixels; } - @CalledByNative("ResolutionBitrateLimits") + @CalledByNative public int getMinStartBitrateBps() { return minStartBitrateBps; } - @CalledByNative("ResolutionBitrateLimits") + @CalledByNative public int getMinBitrateBps() { return minBitrateBps; } - @CalledByNative("ResolutionBitrateLimits") + @CalledByNative public int getMaxBitrateBps() { return maxBitrateBps; } @@ -251,7 +251,7 @@ */ public final double framerateFps; - @CalledByNative("RateControlParameters") + @CalledByNative public RateControlParameters(BitrateAllocation bitrate, double framerateFps) { this.bitrate = bitrate; this.framerateFps = framerateFps; @@ -280,12 +280,12 @@ this.applyAlignmentToAllSimulcastLayers = applyAlignmentToAllSimulcastLayers; } - @CalledByNative("EncoderInfo") + @CalledByNative public int getRequestedResolutionAlignment() { return requestedResolutionAlignment; } - @CalledByNative("EncoderInfo") + @CalledByNative public boolean getApplyAlignmentToAllSimulcastLayers() { return applyAlignmentToAllSimulcastLayers; }
diff --git a/sdk/android/api/org/webrtc/VideoEncoderFactory.java b/sdk/android/api/org/webrtc/VideoEncoderFactory.java index 2a46662..87bff62 100644 --- a/sdk/android/api/org/webrtc/VideoEncoderFactory.java +++ b/sdk/android/api/org/webrtc/VideoEncoderFactory.java
@@ -16,20 +16,20 @@ public interface VideoEncoderFactory { public interface VideoEncoderSelector { /** Called with the VideoCodecInfo of the currently used encoder. */ - @CalledByNative("VideoEncoderSelector") void onCurrentEncoder(VideoCodecInfo info); + @CalledByNative void onCurrentEncoder(VideoCodecInfo info); /** * Called with the current available bitrate. Returns null if the encoder selector prefers to * keep the current encoder or a VideoCodecInfo if a new encoder is preferred. */ - @Nullable @CalledByNative("VideoEncoderSelector") VideoCodecInfo onAvailableBitrate(int kbps); + @Nullable @CalledByNative VideoCodecInfo onAvailableBitrate(int kbps); /** * Called every time the encoder input resolution change. Returns null if the encoder selector * prefers to keep the current encoder or a VideoCodecInfo if a new encoder is preferred. */ @Nullable - @CalledByNative("VideoEncoderSelector") + @CalledByNative default VideoCodecInfo onResolutionChange(int widht, int height) { return null; } @@ -39,7 +39,7 @@ * selector prefers to keep the current encoder or a VideoCodecInfo if a new encoder is * preferred. */ - @Nullable @CalledByNative("VideoEncoderSelector") VideoCodecInfo onEncoderBroken(); + @Nullable @CalledByNative VideoCodecInfo onEncoderBroken(); } /** Creates an encoder for the given video codec. */
diff --git a/sdk/android/api/org/webrtc/VideoFrame.java b/sdk/android/api/org/webrtc/VideoFrame.java index 443a031..2ab97cf 100644 --- a/sdk/android/api/org/webrtc/VideoFrame.java +++ b/sdk/android/api/org/webrtc/VideoFrame.java
@@ -38,7 +38,7 @@ /** * Representation of the underlying buffer. Currently, only NATIVE and I420 are supported. */ - @CalledByNative("Buffer") + @CalledByNative @VideoFrameBufferType default int getBufferType() { return VideoFrameBufferType.NATIVE; @@ -47,8 +47,8 @@ /** * Resolution of the buffer in pixels. */ - @CalledByNative("Buffer") int getWidth(); - @CalledByNative("Buffer") int getHeight(); + @CalledByNative int getWidth(); + @CalledByNative int getHeight(); /** * Returns a memory-backed frame in I420 format. If the pixel data is in another format, a @@ -58,16 +58,16 @@ * <p> Conversion may fail, for example if reading the pixel data from a texture fails. If the * conversion fails, null is returned. */ - @Nullable @CalledByNative("Buffer") I420Buffer toI420(); + @Nullable @CalledByNative I420Buffer toI420(); - @Override @CalledByNative("Buffer") void retain(); - @Override @CalledByNative("Buffer") void release(); + @Override @CalledByNative void retain(); + @Override @CalledByNative void release(); /** * Crops a region defined by `cropx`, `cropY`, `cropWidth` and `cropHeight`. Scales it to size * `scaleWidth` x `scaleHeight`. */ - @CalledByNative("Buffer") + @CalledByNative Buffer cropAndScale( int cropX, int cropY, int cropWidth, int cropHeight, int scaleWidth, int scaleHeight); } @@ -87,25 +87,25 @@ * be 0. Callers may mutate the ByteBuffer (eg. through relative-read operations), so * implementations must return a new ByteBuffer or slice for each call. */ - @CalledByNative("I420Buffer") ByteBuffer getDataY(); + @CalledByNative ByteBuffer getDataY(); /** * Returns a direct ByteBuffer containing U-plane data. The buffer capacity is at least * getStrideU() * ((getHeight() + 1) / 2) bytes. The position of the returned buffer is ignored * and must be 0. Callers may mutate the ByteBuffer (eg. through relative-read operations), so * implementations must return a new ByteBuffer or slice for each call. */ - @CalledByNative("I420Buffer") ByteBuffer getDataU(); + @CalledByNative ByteBuffer getDataU(); /** * Returns a direct ByteBuffer containing V-plane data. The buffer capacity is at least * getStrideV() * ((getHeight() + 1) / 2) bytes. The position of the returned buffer is ignored * and must be 0. Callers may mutate the ByteBuffer (eg. through relative-read operations), so * implementations must return a new ByteBuffer or slice for each call. */ - @CalledByNative("I420Buffer") ByteBuffer getDataV(); + @CalledByNative ByteBuffer getDataV(); - @CalledByNative("I420Buffer") int getStrideY(); - @CalledByNative("I420Buffer") int getStrideU(); - @CalledByNative("I420Buffer") int getStrideV(); + @CalledByNative int getStrideY(); + @CalledByNative int getStrideU(); + @CalledByNative int getStrideV(); } /**