commit 4eb0188cb6a63da5fe5960ad1634c2ba5e8ea2bd
author Magnus Jedvert <magjed@webrtc.org> Mon Nov 20 22:33:40 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Mon Nov 20 22:48:02 2017 +0000
tree a9b86d8c126c2328424a73d1222f8c5ba201fa7f
parent 4171afb1865adb374e7529f41292347cd4deb0ab

Android: Generate JNI code for VideoDecoder

Bug: webrtc:8278
Change-Id: I985fa63b0c5a9cdd0fb1817730646bcd4b30288a
Reviewed-on: https://webrtc-review.googlesource.com/24221
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20803}

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

diff --git a/sdk/android/api/org/webrtc/EncodedImage.java b/sdk/android/api/org/webrtc/EncodedImage.java
index c6c56ce..dc8eb62 100644
--- a/sdk/android/api/org/webrtc/EncodedImage.java
+++ b/sdk/android/api/org/webrtc/EncodedImage.java
@@ -12,6 +12,8 @@
 
 import java.nio.ByteBuffer;
 import java.util.concurrent.TimeUnit;
+// TODO(bugs.webrtc.org/8556): Remove unnecessary import.
+import org.webrtc.EncodedImage;
 
 /**
  * An encoded frame from a video stream. Used as an input for decoders and as an output for
@@ -33,6 +35,17 @@
     public int getNative() {
       return nativeIndex;
     }
+
+    // TODO(bugs.webrtc.org/8556): Remove unnecessary 'EncodedImage.'.
+    @CalledByNative("FrameType")
+    static EncodedImage.FrameType fromNativeIndex(int nativeIndex) {
+      for (FrameType type : FrameType.values()) {
+        if (type.getNative() == nativeIndex) {
+          return type;
+        }
+      }
+      throw new IllegalArgumentException("Unknown native frame type: " + nativeIndex);
+    }
   }
 
   public final ByteBuffer buffer;
@@ -125,4 +138,13 @@
           rotation, completeFrame, qp);
     }
   }
+
+  // TODO(bugs.webrtc.org/8551) Remove.
+  @CalledByNative
+  static EncodedImage create(ByteBuffer buffer, int encodedWidth, int encodedHeight,
+      long captureTimeNs, EncodedImage.FrameType frameType, int rotation, boolean completeFrame,
+      Integer qp) {
+    return new EncodedImage(
+        buffer, encodedWidth, encodedHeight, captureTimeNs, frameType, rotation, completeFrame, qp);
+  }
 }

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

diff --git a/sdk/android/api/org/webrtc/VideoDecoder.java b/sdk/android/api/org/webrtc/VideoDecoder.java
index 76b030c..f5acfad 100644
--- a/sdk/android/api/org/webrtc/VideoDecoder.java
+++ b/sdk/android/api/org/webrtc/VideoDecoder.java
@@ -54,23 +54,23 @@
    * Initializes the decoding process with specified settings. Will be called on the decoding thread
    * before any decode calls.
    */
-  VideoCodecStatus initDecode(Settings settings, Callback decodeCallback);
+  @CalledByNative VideoCodecStatus initDecode(Settings settings, Callback decodeCallback);
   /**
    * Called when the decoder is no longer needed. Any more calls to decode will not be made.
    */
-  VideoCodecStatus release();
+  @CalledByNative VideoCodecStatus release();
   /**
    * Request the decoder to decode a frame.
    */
-  VideoCodecStatus decode(EncodedImage frame, DecodeInfo info);
+  @CalledByNative VideoCodecStatus decode(EncodedImage frame, DecodeInfo info);
   /**
    * The decoder should return true if it prefers late decoding. That is, it can not decode
    * infinite number of frames before the decoded frame is consumed.
    */
-  boolean getPrefersLateDecoding();
+  @CalledByNative boolean getPrefersLateDecoding();
   /**
    * Should return a descriptive name for the implementation. Gets called once and cached. May be
    * called from arbitrary thread.
    */
-  String getImplementationName();
+  @CalledByNative String getImplementationName();
 }