Use passthrough decoder for (E)AC3 formats

media/base/android/media_codec_util.cc

 // Copyright 2015 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_util.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 23 matching lines @@
 
 namespace media {
 
 namespace {
 const char kMp3MimeType[] = "audio/mpeg";
 const char kAacMimeType[] = "audio/mp4a-latm";
 const char kOpusMimeType[] = "audio/opus";
 const char kVorbisMimeType[] = "audio/vorbis";
 const char kAc3MimeType[] = "audio/ac3";
 const char kEac3MimeType[] = "audio/eac3";
+const char kBitstreamAudioMimeType[] = "audio/raw";
 const char kAvcMimeType[] = "video/avc";
 const char kHevcMimeType[] = "video/hevc";
 const char kVp8MimeType[] = "video/x-vnd.on2.vp8";
 const char kVp9MimeType[] = "video/x-vnd.on2.vp9";
+
 }  // namespace
 
 static CodecProfileLevel MediaCodecProfileLevelToChromiumProfileLevel(
     JNIEnv* env,
     const jobject& j_codec_profile_level) {
   VideoCodec codec = static_cast<VideoCodec>(
       Java_CodecProfileLevelAdapter_getCodec(env, j_codec_profile_level));
   VideoCodecProfile profile = static_cast<VideoCodecProfile>(
       Java_CodecProfileLevelAdapter_getProfile(env, j_codec_profile_level));
   int level =
@@ skipping 33 matching lines @@
 static bool IsEncoderSupportedByDevice(const std::string& android_mime_type) {
   DCHECK(MediaCodecUtil::IsMediaCodecAvailable());
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_mime =
       ConvertUTF8ToJavaString(env, android_mime_type);
   return Java_MediaCodecUtil_isEncoderSupportedByDevice(env, j_mime);
 }
 
 // static
 std::string MediaCodecUtil::CodecToAndroidMimeType(AudioCodec codec) {
+  if (IsPassthroughAudioFormat(codec))
+    return kBitstreamAudioMimeType;
+
   switch (codec) {
     case kCodecMP3:
       return kMp3MimeType;
     case kCodecVorbis:
       return kVorbisMimeType;
     case kCodecOpus:
       return kOpusMimeType;
     case kCodecAAC:
       return kAacMimeType;
     case kCodecAC3:
@@ skipping 242 matching lines @@
   return true;
 }
 
 // static
 bool MediaCodecUtil::IsSetOutputSurfaceSupported() {
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecUtil_isSetOutputSurfaceSupported(env);
 }
 
 // static
+bool MediaCodecUtil::IsPassthroughAudioFormat(AudioCodec codec) {
+  return (codec == kCodecAC3 || codec == kCodecEAC3);

[DaleCurtis, 2017/05/04 19:05:44]

Drop unnecessary parens.

[AndyWu, 2017/05/06 01:46:48]

Done.

+}
+
+// static
 bool MediaCodecUtil::CodecNeedsFlushWorkaround(MediaCodecBridge* codec) {
   int sdk_int = base::android::BuildInfo::GetInstance()->sdk_int();
   std::string codec_name = codec->GetName();
   return sdk_int < 18 ||
          (sdk_int == 18 && ("OMX.SEC.avc.dec" == codec_name ||
                             "OMX.SEC.avc.dec.secure" == codec_name)) ||
          (sdk_int == 19 &&
           base::StartsWith(base::android::BuildInfo::GetInstance()->model(),
                            "SM-G800", base::CompareCase::INSENSITIVE_ASCII) &&
           ("OMX.Exynos.avc.dec" == codec_name ||
            "OMX.Exynos.avc.dec.secure" == codec_name));
 }
 
 }  // namespace media