| Index: media/base/android/media_codec_util.cc
|
| diff --git a/media/base/android/media_codec_util.cc b/media/base/android/media_codec_util.cc
|
| index 3bb4fc7d39b02243dcf7fa9194457dcee9235f35..5b93fe2ba1e7ab8fbd5bec17c44e55f2544a1305 100644
|
| --- a/media/base/android/media_codec_util.cc
|
| +++ b/media/base/android/media_codec_util.cc
|
| @@ -41,6 +41,7 @@ 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";
|
| @@ -98,6 +99,9 @@ static bool IsEncoderSupportedByDevice(const std::string& android_mime_type) {
|
|
|
| // static
|
| std::string MediaCodecUtil::CodecToAndroidMimeType(AudioCodec codec) {
|
| + if (IsPassthroughAudioFormat(codec))
|
| + return kBitstreamAudioMimeType;
|
| +
|
| switch (codec) {
|
| case kCodecMP3:
|
| return kMp3MimeType;
|
| @@ -359,6 +363,11 @@ bool MediaCodecUtil::IsSetOutputSurfaceSupported() {
|
| return Java_MediaCodecUtil_isSetOutputSurfaceSupported(env);
|
| }
|
|
|
| +// static
|
| +bool MediaCodecUtil::IsPassthroughAudioFormat(AudioCodec codec) {
|
| + return codec == kCodecAC3 || codec == kCodecEAC3;
|
| +}
|
| +
|
| // static
|
| bool MediaCodecUtil::CodecNeedsFlushWorkaround(MediaCodecBridge* codec) {
|
| int sdk_int = base::android::BuildInfo::GetInstance()->sdk_int();
|
|
|