commit f4810ddfd992e183feffbaeb2998f897d4f6f08f
author Magnus Jedvert <magjed@webrtc.org> Wed Sep 27 11:56:45 2017 +0000
committer Commit Bot <commit-bot@chromium.org> Wed Sep 27 11:56:57 2017 +0000
tree 01c023756b0baba4cd9cc72691b30793548198ba
parent beffdd4c6a8196fe8e61236c6453d3fb48986252

Revert "Android: Generate JNI code for VideoSink and VideoEncoder"

This reverts commit ba78b5a905bffa05933a135673996df02328f2a4.

Reason for revert: Breaks external projects.

Original change's description:
> Android: Generate JNI code for VideoSink and VideoEncoder
> 
> This is the first CL to start generating JNI code. It has updated two of
> the most recent classes to use JNI code generation.
> 
> Bug: webrtc:8278
> Change-Id: I1b19ee78c273346ceeaa0401dbdf8696803f16c7
> Reviewed-on: https://webrtc-review.googlesource.com/3820
> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#19994}

TBR=magjed@webrtc.org,sakal@webrtc.org

Change-Id: I48e079f3ab9661ae4171a3ae5cca571a75d14810
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:8278
Reviewed-on: https://webrtc-review.googlesource.com/4100
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19997}

sdk/android/api/org/webrtc/VideoEncoder.java

diff --git a/sdk/android/api/org/webrtc/VideoEncoder.java b/sdk/android/api/org/webrtc/VideoEncoder.java
index b7dc369..1fb9601 100644
--- a/sdk/android/api/org/webrtc/VideoEncoder.java
+++ b/sdk/android/api/org/webrtc/VideoEncoder.java
@@ -123,32 +123,26 @@
   /**
    * Initializes the encoding process. Call before any calls to encode.
    */
-  @CalledByNative VideoCodecStatus initEncode(Settings settings, Callback encodeCallback);
-
+  VideoCodecStatus initEncode(Settings settings, Callback encodeCallback);
   /**
    * Releases the encoder. No more calls to encode will be made after this call.
    */
-  @CalledByNative VideoCodecStatus release();
-
+  VideoCodecStatus release();
   /**
    * Requests the encoder to encode a frame.
    */
-  @CalledByNative VideoCodecStatus encode(VideoFrame frame, EncodeInfo info);
-
+  VideoCodecStatus encode(VideoFrame frame, EncodeInfo info);
   /**
    * Informs the encoder of the packet loss and the round-trip time of the network.
    *
    * @param packetLoss How many packets are lost on average per 255 packets.
    * @param roundTripTimeMs Round-trip time of the network in milliseconds.
    */
-  @CalledByNative VideoCodecStatus setChannelParameters(short packetLoss, long roundTripTimeMs);
-
+  VideoCodecStatus setChannelParameters(short packetLoss, long roundTripTimeMs);
   /** Sets the bitrate allocation and the target framerate for the encoder. */
-  @CalledByNative VideoCodecStatus setRateAllocation(BitrateAllocation allocation, int framerate);
-
+  VideoCodecStatus setRateAllocation(BitrateAllocation allocation, int framerate);
   /** Any encoder that wants to use WebRTC provided quality scaler must implement this method. */
-  @CalledByNative ScalingSettings getScalingSettings();
-
+  ScalingSettings getScalingSettings();
   /** Should return a descriptive name for the implementation. Gets called once and cached. */
-  @CalledByNative String getImplementationName();
+  String getImplementationName();
 }

sdk/android/api/org/webrtc/VideoSink.java

diff --git a/sdk/android/api/org/webrtc/VideoSink.java b/sdk/android/api/org/webrtc/VideoSink.java
index 5a0a6c7..e4162fe 100644
--- a/sdk/android/api/org/webrtc/VideoSink.java
+++ b/sdk/android/api/org/webrtc/VideoSink.java
@@ -19,5 +19,5 @@
    * this function returns. Each call to retain() should be followed by a call to frame.release()
    * when the reference is no longer needed.
    */
-  @CalledByNative void onFrame(VideoFrame frame);
+  void onFrame(VideoFrame frame);
 }