Add AAC codec specific data for MSE on android

media/base/android/media_codec_bridge.cc

 // 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.
 
 #include "media/base/android/media_codec_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
@@ skipping 175 matching lines @@
   JNIEnv* env = AttachCurrentThread();
   DCHECK(AudioCodecToMimeType(codec));
 
   ScopedJavaLocalRef<jstring> j_mime =
       ConvertUTF8ToJavaString(env, AudioCodecToMimeType(codec));
   ScopedJavaLocalRef<jobject> j_format(
       Java_MediaCodecBridge_createAudioFormat(
           env, j_mime.obj(), sample_rate, channel_count));
   DCHECK(!j_format.is_null());
 
-  if (extra_data_size > 0) {
-    DCHECK_EQ(kCodecVorbis, codec);
-    if (extra_data[0] != 2) {
-      LOG(ERROR) << "Invalid number of headers before the codec header: "
-                 << extra_data[0];
-      return false;
-    }
-
-    size_t header_length[2];
-    // |total_length| keeps track of the total number of bytes before the last
-    // header.
-    size_t total_length = 1;
-    const uint8* current_pos = extra_data;
-    // Calculate the length of the first 2 headers.
-    for (int i = 0; i < 2; ++i) {
-      header_length[i] = 0;
-      while (total_length < extra_data_size) {
-        size_t size = *(++current_pos);
-        total_length += 1 + size;
-        if (total_length > 0x80000000) {
-          LOG(ERROR) << "Header size too large";
-          return false;
-        }
-        header_length[i] += size;
-        if (size < 0xFF)
-          break;
-      }
-      if (total_length >= extra_data_size) {
-        LOG(ERROR) << "Invalid header size in the extra data";
-        return false;
-      }
-    }
-    current_pos++;
-    // The first header is identification header.
-    jobject identification_header = env->NewDirectByteBuffer(
-        const_cast<uint8*>(current_pos), header_length[0]);
-    Java_MediaCodecBridge_setCodecSpecificData(
-        env, j_format.obj(), 0, identification_header);
-    // The last header is codec header.
-    jobject codec_header = env->NewDirectByteBuffer(
-        const_cast<uint8*>(extra_data + total_length),
-        extra_data_size - total_length);
-    Java_MediaCodecBridge_setCodecSpecificData(
-        env, j_format.obj(), 1, codec_header);
-    env->DeleteLocalRef(codec_header);
-    env->DeleteLocalRef(identification_header);
-  }
+  if (!ConfigureMediaFormat(j_format.obj(), codec, extra_data, extra_data_size))
+    return false;
 
   Java_MediaCodecBridge_configureAudio(
       env, media_codec(), j_format.obj(), NULL, 0, play_audio);
   StartInternal();
   return true;
 }
 
+bool AudioCodecBridge::ConfigureMediaFormat(
+    jobject j_format, const AudioCodec codec, const uint8* extra_data,
+    size_t extra_data_size) {
+  if (extra_data_size == 0)
+    return true;
+
+  JNIEnv* env = AttachCurrentThread();
+  switch(codec) {
+    case kCodecVorbis:
+    {
+      if (extra_data[0] != 2) {
+        LOG(ERROR) << "Invalid number of vorbis headers before the codec "
+                   << "header: " << extra_data[0];
+        return false;
+      }
+
+      size_t header_length[2];
+      // |total_length| keeps track of the total number of bytes before the last
+      // header.
+      size_t total_length = 1;
+      const uint8* current_pos = extra_data;
+      // Calculate the length of the first 2 headers.
+      for (int i = 0; i < 2; ++i) {
+        header_length[i] = 0;
+        while (total_length < extra_data_size) {
+          size_t size = *(++current_pos);
+          total_length += 1 + size;
+          if (total_length > 0x80000000) {
+            LOG(ERROR) << "Vorbis header size too large";
+            return false;
+          }
+          header_length[i] += size;
+          if (size < 0xFF)
+            break;
+        }
+        if (total_length >= extra_data_size) {
+          LOG(ERROR) << "Invalid vorbis header size in the extra data";
+          return false;
+        }
+      }
+      current_pos++;
+      // The first header is identification header.
+      jobject identification_header = env->NewDirectByteBuffer(
+          const_cast<uint8*>(current_pos), header_length[0]);
+      Java_MediaCodecBridge_setCodecSpecificData(
+          env, j_format, 0, identification_header);
+      // The last header is codec header.
+      jobject codec_header = env->NewDirectByteBuffer(
+          const_cast<uint8*>(extra_data + total_length),
+          extra_data_size - total_length);
+      Java_MediaCodecBridge_setCodecSpecificData(
+          env, j_format, 1, codec_header);
+      env->DeleteLocalRef(codec_header);
+      env->DeleteLocalRef(identification_header);
+      break;
+    }
+    case kCodecAAC:
+    {
+      DCHECK_EQ(2u, extra_data_size);
+      jobject header = env->NewDirectByteBuffer(
+          const_cast<uint8*>(extra_data), extra_data_size);
+      Java_MediaCodecBridge_setCodecSpecificData(
+          env, j_format, 0, header);
+      // TODO(qinmin): pass an extra variable to this function to determine
+      // whether we need to call this.
+      Java_MediaCodecBridge_setFrameHasADTSHeader(env, j_format);
+      env->DeleteLocalRef(header);
+      break;
+    }
+    default:
+      LOG(ERROR) << "Invalid header encountered for codec: "
+                 << AudioCodecToMimeType(codec);
+      return false;
+  }
+  return true;
+}
+
 void AudioCodecBridge::PlayOutputBuffer(int index, size_t size) {
   DCHECK_LE(0, index);
   int numBytes = base::checked_numeric_cast<int>(size);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> buf =
       Java_MediaCodecBridge_getOutputBuffer(env, media_codec(), index);
   uint8* buffer = static_cast<uint8*>(env->GetDirectBufferAddress(buf.obj()));
 
   ScopedJavaLocalRef<jbyteArray> byte_array =
       base::android::ToJavaByteArray(env, buffer, numBytes);
@@ skipping 31 matching lines @@
   const char* mime = VideoCodecToMimeType(codec);
   return mime ? new VideoCodecBridge(mime) : NULL;
 }
 
 bool MediaCodecBridge::RegisterMediaCodecBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace media