AndroidVideoEncodeAccelerator is born!

media/base/android/java/src/org/chromium/media/MediaCodecBridge.java

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.media;
 
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
 import android.media.MediaCrypto;
 import android.media.MediaFormat;
 import android.os.Build;
+import android.os.Bundle;
 import android.util.Log;
 import android.view.Surface;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 
 /**
  * A wrapper of the MediaCodec class to facilitate exception capturing and
  * audio rendering.
  */
@@ skipping 45 matching lines @@
         @CalledByNative("DequeueInputResult")
         private int index() { return mIndex; }
     }
 
     /**
      * This class represents supported android codec information.
      */
     private static class CodecInfo {
         private final String mCodecType;  // e.g. "video/x-vnd.on2.vp8".
         private final String mCodecName;  // e.g. "OMX.google.vp8.decoder".
+        private final boolean mIsEncoder;
 
-        private CodecInfo(String codecType, String codecName) {
+        private CodecInfo(String codecType, String codecName,
+                          boolean isEncoder) {
             mCodecType = codecType;
             mCodecName = codecName;
+            mIsEncoder = isEncoder;
         }
 
         @CalledByNative("CodecInfo")
         private String codecType() { return mCodecType; }
 
         @CalledByNative("CodecInfo")
         private String codecName() { return mCodecName; }
+
+        @CalledByNative("CodecInfo")
+        private boolean isEncoder() { return mIsEncoder; }
     }
 
     private static class DequeueOutputResult {
         private final int mStatus;
         private final int mIndex;
         private final int mFlags;
         private final int mOffset;
         private final long mPresentationTimeMicroseconds;
         private final int mNumBytes;
 
@@ skipping 24 matching lines @@
 
         @CalledByNative("DequeueOutputResult")
         private int numBytes() { return mNumBytes; }
     }
 
     /**
      * Get a list of supported android codec mimes.
      */
     @CalledByNative
     private static CodecInfo[] getCodecsInfo() {
-        Map<String, CodecInfo> CodecInfoMap = new HashMap<String, CodecInfo>();
+        Map<String, CodecInfo> encoderInfoMap = new HashMap<String, CodecInfo>();
+        Map<String, CodecInfo> decoderInfoMap = new HashMap<String, CodecInfo>();

[xhwang, 2013/11/19 00:11:25]

It's a bit odd to have two maps here then merge them together. But I don't know
a better way to do it yet. Also, shall we comment that we prefer the first
returned encoder/decoder in the list?

[Ami GONE FROM CHROMIUM, 2013/11/21 22:59:07]

Agreed.
This whole API is Doing It Wrong(tm) IMO.  The C++ code should be using the
MediaCodec API as proxied by auto-generation, hence my added TODO in this
patchset.
Done.

         int count = MediaCodecList.getCodecCount();
         for (int i = 0; i < count; ++i) {
             MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i);
-            if (info.isEncoder()) {
-                continue;
-            }
-
+            boolean isEncoder = info.isEncoder();
             String codecString = info.getName();
             String[] supportedTypes = info.getSupportedTypes();
             for (int j = 0; j < supportedTypes.length; ++j) {
-                if (!CodecInfoMap.containsKey(supportedTypes[j])) {
-                    CodecInfoMap.put(supportedTypes[j], new CodecInfo(
-                        supportedTypes[j], codecString));
+                Map<String, CodecInfo> map = isEncoder ? encoderInfoMap : decoderInfoMap;
+                if (!map.containsKey(supportedTypes[j])) {
+                    map.put(supportedTypes[j], new CodecInfo(
+                        supportedTypes[j], codecString, isEncoder));
                 }
             }
         }
-        return CodecInfoMap.values().toArray(
-            new CodecInfo[CodecInfoMap.size()]);
+        ArrayList<CodecInfo> codecInfos = new ArrayList<CodecInfo>(
+            decoderInfoMap.size() + encoderInfoMap.size());
+        codecInfos.addAll(encoderInfoMap.values());
+        codecInfos.addAll(decoderInfoMap.values());
+        return codecInfos.toArray(new CodecInfo[codecInfos.size()]);
     }
 
     private static String getSecureDecoderNameForMime(String mime) {
         int count = MediaCodecList.getCodecCount();
         for (int i = 0; i < count; ++i) {
             MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i);
             if (info.isEncoder()) {
                 continue;
             }
 
             String[] supportedTypes = info.getSupportedTypes();
             for (int j = 0; j < supportedTypes.length; ++j) {
                 if (supportedTypes[j].equalsIgnoreCase(mime)) {
                     return info.getName() + ".secure";
                 }
             }
         }
 
         return null;
     }
 
     private MediaCodecBridge(MediaCodec mediaCodec) {
         assert(mediaCodec != null);
         mMediaCodec = mediaCodec;
         mLastPresentationTimeUs = 0;
         mFlushed = true;
     }
 
     @CalledByNative
-    private static MediaCodecBridge create(String mime, boolean isSecure) {
+    private static MediaCodecBridge create(String mime, boolean isSecure, boolean isEncoder) {
         // Creation of ".secure" codecs sometimes crash instead of throwing exceptions
         // on pre-JBMR2 devices.
         if (isSecure && Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
             return null;
         }
         MediaCodec mediaCodec = null;
         try {
             // |isSecure| only applies to video decoders.
-            if (mime.startsWith("video") && isSecure) {
+            if (mime.startsWith("video") && isSecure && !isEncoder) {
                 mediaCodec = MediaCodec.createByCodecName(getSecureDecoderNameForMime(mime));
             } else {
-                mediaCodec = MediaCodec.createDecoderByType(mime);
+                if (isEncoder) {
+                    mediaCodec = MediaCodec.createEncoderByType(mime);
+                } else {
+                    mediaCodec = MediaCodec.createDecoderByType(mime);
+                }
             }
         } catch (Exception e) {
             Log.e(TAG, "Failed to create MediaCodec: " +  mime + ", isSecure: "
-                    + isSecure + ", " + e.toString());
+                    + isSecure + ", isEncoder: " + isEncoder, e);
         }
 
         if (mediaCodec == null) {
             return null;
         }
 
         return new MediaCodecBridge(mediaCodec);
     }
 
     @CalledByNative
     private void release() {
+        String name = mMediaCodec.getName();
+        mMediaCodec.stop();
         mMediaCodec.release();
+        mMediaCodec = null;
         if (mAudioTrack != null) {
             mAudioTrack.release();
         }
     }
 
     @CalledByNative
     private boolean start() {
         try {
             mMediaCodec.start();
             mInputBuffers = mMediaCodec.getInputBuffers();
         } catch (IllegalStateException e) {
-            Log.e(TAG, "Cannot start the media codec " + e.toString());
+            Log.e(TAG, "Cannot start the media codec", e);
             return false;
         }
         return true;
     }
 
     @CalledByNative
     private DequeueInputResult dequeueInputBuffer(long timeoutUs) {
         int status = MEDIA_CODEC_ERROR;
         int index = -1;
         try {
             int index_or_status = mMediaCodec.dequeueInputBuffer(timeoutUs);
             if (index_or_status >= 0) { // index!
                 status = MEDIA_CODEC_OK;
                 index = index_or_status;
             } else if (index_or_status == MediaCodec.INFO_TRY_AGAIN_LATER) {
                 Log.e(TAG, "dequeueInputBuffer: MediaCodec.INFO_TRY_AGAIN_LATER");
                 status = MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER;
             } else {
+                Log.e(TAG, "Unexpected index_or_status: " + index_or_status);
                 assert(false);
             }
         } catch(Exception e) {
-            Log.e(TAG, "Failed to dequeue input buffer: " + e.toString());
+            Log.e(TAG, "Failed to dequeue input buffer", e);
         }
         return new DequeueInputResult(status, index);
     }
 
     @CalledByNative
     private int flush() {
         try {
             mFlushed = true;
             if (mAudioTrack != null) {
                 mAudioTrack.flush();
             }
             mMediaCodec.flush();
         } catch(IllegalStateException e) {
-            Log.e(TAG, "Failed to flush MediaCodec " + e.toString());
+            Log.e(TAG, "Failed to flush MediaCodec", e);
             return MEDIA_CODEC_ERROR;
         }
         return MEDIA_CODEC_OK;
     }
 
     @CalledByNative
     private void stop() {
         mMediaCodec.stop();
         if (mAudioTrack != null) {
             mAudioTrack.pause();
@@ skipping 20 matching lines @@
         return mOutputBuffers[index];
     }
 
     @CalledByNative
     private int queueInputBuffer(
             int index, int offset, int size, long presentationTimeUs, int flags) {
         resetLastPresentationTimeIfNeeded(presentationTimeUs);
         try {
             mMediaCodec.queueInputBuffer(index, offset, size, presentationTimeUs, flags);
         } catch(Exception e) {
-            Log.e(TAG, "Failed to queue input buffer: " + e.toString());
+            Log.e(TAG, "Failed to queue input buffer", e);
             return MEDIA_CODEC_ERROR;
         }
         return MEDIA_CODEC_OK;
     }
 
     @CalledByNative
+    private void setVideoBitrate(int bps) {
+        Bundle b = new Bundle();
+        b.putInt(MediaCodec.PARAMETER_KEY_VIDEO_BITRATE, bps);
+        mMediaCodec.setParameters(b);
+    }
+
+    @CalledByNative
+    private void requestKeyFrameSoon() {
+        Bundle b = new Bundle();
+        b.putInt(MediaCodec.PARAMETER_KEY_REQUEST_SYNC_FRAME, 0);
+        mMediaCodec.setParameters(b);
+    }
+
+    @CalledByNative
     private int queueSecureInputBuffer(
             int index, int offset, byte[] iv, byte[] keyId, int[] numBytesOfClearData,
             int[] numBytesOfEncryptedData, int numSubSamples, long presentationTimeUs) {
         resetLastPresentationTimeIfNeeded(presentationTimeUs);
         try {
             MediaCodec.CryptoInfo cryptoInfo = new MediaCodec.CryptoInfo();
             cryptoInfo.set(numSubSamples, numBytesOfClearData, numBytesOfEncryptedData,
                     keyId, iv, MediaCodec.CRYPTO_MODE_AES_CTR);
             mMediaCodec.queueSecureInputBuffer(index, offset, cryptoInfo, presentationTimeUs, 0);
         } catch (MediaCodec.CryptoException e) {
-            Log.e(TAG, "Failed to queue secure input buffer: " + e.toString());
+            Log.e(TAG, "Failed to queue secure input buffer", e);
             // TODO(xhwang): Replace hard coded value with constant/enum.
             if (e.getErrorCode() == 1) {
                 Log.e(TAG, "No key available.");
                 return MEDIA_CODEC_NO_KEY;
             }
             return MEDIA_CODEC_ERROR;
         } catch(IllegalStateException e) {
-            Log.e(TAG, "Failed to queue secure input buffer: " + e.toString());
+            Log.e(TAG, "Failed to queue secure input buffer", e);
             return MEDIA_CODEC_ERROR;
         }
         return MEDIA_CODEC_OK;
     }
 
     @CalledByNative
     private void releaseOutputBuffer(int index, boolean render) {
         mMediaCodec.releaseOutputBuffer(index, render);
     }
 
     @CalledByNative
+    private int getInputBuffersCount() {
+      return mInputBuffers.length;
+    }
+
+    @CalledByNative
+    private int getOutputBuffersCount() {
+      return mOutputBuffers != null ? mOutputBuffers.length : -1;
+    }
+
+    @CalledByNative
+    private int getOutputBuffersCapacity() {
+      return mOutputBuffers != null ? mOutputBuffers[0].capacity() : -1;
+    }
+
+    @CalledByNative
     private boolean getOutputBuffers() {
         try {
             mOutputBuffers = mMediaCodec.getOutputBuffers();
         } catch (IllegalStateException e) {
-            Log.e(TAG, "Cannot get output buffers " + e.toString());
+            Log.e(TAG, "Cannot get output buffers", e);
             return false;
         }
         return true;
     }

[xhwang, 2013/11/19 00:11:25]

Move l.375-l.399 to l.317?

[Ami GONE FROM CHROMIUM, 2013/11/21 22:59:07]

Done.

 
     @CalledByNative
     private DequeueOutputResult dequeueOutputBuffer(long timeoutUs) {
         MediaCodec.BufferInfo info = new MediaCodec.BufferInfo();
         int status = MEDIA_CODEC_ERROR;
         int index = -1;
         try {
             int index_or_status = mMediaCodec.dequeueOutputBuffer(info, timeoutUs);
             if (info.presentationTimeUs < mLastPresentationTimeUs) {
                 // TODO(qinmin): return a special code through DequeueOutputResult
                 // to notify the native code the the frame has a wrong presentation
                 // timestamp and should be skipped.
                 info.presentationTimeUs = mLastPresentationTimeUs;
             }
             mLastPresentationTimeUs = info.presentationTimeUs;
 
             if (index_or_status >= 0) { // index!
                 status = MEDIA_CODEC_OK;
                 index = index_or_status;
             } else if (index_or_status == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
                 status = MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED;
             } else if (index_or_status == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
                 status = MEDIA_CODEC_OUTPUT_FORMAT_CHANGED;
             } else if (index_or_status == MediaCodec.INFO_TRY_AGAIN_LATER) {
                 status = MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER;
             } else {
+                Log.e(TAG, "Unexpected index_or_status: " + index_or_status);
                 assert(false);
             }
         } catch (IllegalStateException e) {
-            Log.e(TAG, "Failed to dequeue output buffer: " + e.toString());
+            Log.e(TAG, "Failed to dequeue output buffer", e);
         }
 
         return new DequeueOutputResult(
                 status, index, info.flags, info.offset, info.presentationTimeUs, info.size);
     }
 
     @CalledByNative
     private boolean configureVideo(MediaFormat format, Surface surface, MediaCrypto crypto,
             int flags) {
         try {
             mMediaCodec.configure(format, surface, crypto, flags);
             return true;
         } catch (IllegalStateException e) {
-            Log.e(TAG, "Cannot configure the video codec " + e.toString());
+            Log.e(TAG, "Cannot configure the video codec", e);
         }
         return false;
     }
 
     @CalledByNative
     private static MediaFormat createAudioFormat(String mime, int SampleRate, int ChannelCount) {
         return MediaFormat.createAudioFormat(mime, SampleRate, ChannelCount);
     }
 
     @CalledByNative
-    private static MediaFormat createVideoFormat(String mime, int width, int height) {
+    private static MediaFormat createVideoDecoderFormat(String mime, int width, int height) {
         return MediaFormat.createVideoFormat(mime, width, height);
     }
 
     @CalledByNative
+    private static MediaFormat createVideoEncoderFormat(String mime, int width, int height,
+            int bitRate, int frameRate, int iFrameInterval, int colorFormat) {
+        MediaFormat format = MediaFormat.createVideoFormat(mime, width, height);
+        format.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
+        format.setInteger(MediaFormat.KEY_FRAME_RATE, frameRate);
+        format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, iFrameInterval);
+        format.setInteger(MediaFormat.KEY_COLOR_FORMAT, colorFormat);
+        return format;
+    }
+
+    @CalledByNative
     private static void setCodecSpecificData(MediaFormat format, int index, byte[] bytes) {
         String name = null;
         if (index == 0) {
             name = "csd-0";
         } else if (index == 1) {
             name = "csd-1";
         }
         if (name != null) {
             format.setByteBuffer(name, ByteBuffer.wrap(bytes));
         }
@@ skipping 16 matching lines @@
                         AudioFormat.CHANNEL_OUT_STEREO;
                 // Using 16bit PCM for output. Keep this value in sync with
                 // kBytesPerAudioOutputSample in media_codec_bridge.cc.
                 int minBufferSize = AudioTrack.getMinBufferSize(sampleRate, channelConfig,
                         AudioFormat.ENCODING_PCM_16BIT);
                 mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, channelConfig,
                         AudioFormat.ENCODING_PCM_16BIT, minBufferSize, AudioTrack.MODE_STREAM);
             }
             return true;
         } catch (IllegalStateException e) {
-            Log.e(TAG, "Cannot configure the audio codec " + e.toString());
+            Log.e(TAG, "Cannot configure the audio codec", e);
         }
         return false;
     }
 
     @CalledByNative
     private void playOutputBuffer(byte[] buf) {
         if (mAudioTrack != null) {
             if (AudioTrack.PLAYSTATE_PLAYING != mAudioTrack.getPlayState()) {
                 mAudioTrack.play();
             }
@@ skipping 13 matching lines @@
     }
 
     private void resetLastPresentationTimeIfNeeded(long presentationTimeUs) {
         if (mFlushed) {
             mLastPresentationTimeUs =
                     Math.max(presentationTimeUs - MAX_PRESENTATION_TIMESTAMP_SHIFT_US, 0);
             mFlushed = false;
         }
     }
 }