loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-07 23:50:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refer to E-AC3 JOC rather than Atmos in MIME type/comments

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=184501752
This commit is contained in:
andrewlewis 2018-02-05 02:30:25 -08:00 committed by Oliver Woodman
parent 1a6c8c6934
commit 2d76d63c3e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
View File

@ -198,7 +198,7 @@ public final class Ac3Util {
if (data.bytesLeft() > 0) { if (data.bytesLeft() > 0) {
nextByte = data.readUnsignedByte(); nextByte = data.readUnsignedByte();
if ((nextByte & 0x01) != 0) { // flag_ec3_extension_type_a if ((nextByte & 0x01) != 0) { // flag_ec3_extension_type_a
mimeType = MimeTypes.AUDIO_ATMOS; mimeType = MimeTypes.AUDIO_E_AC3_JOC;
} }
} }
return Format.createAudioSampleFormat(trackId, mimeType, null, Format.NO_VALUE, return Format.createAudioSampleFormat(trackId, mimeType, null, Format.NO_VALUE,
@ -385,7 +385,7 @@ public final class Ac3Util {
if (data.readBit()) { // addbsie if (data.readBit()) { // addbsie
int addbsil = data.readBits(6); int addbsil = data.readBits(6);
if (addbsil == 1 && data.readBits(8) == 1) { // addbsi if (addbsil == 1 && data.readBits(8) == 1) { // addbsi
mimeType = MimeTypes.AUDIO_ATMOS; mimeType = MimeTypes.AUDIO_E_AC3_JOC;
} }
} }
} else /* is AC-3 */ { } else /* is AC-3 */ {

8
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
View File

@ -158,8 +158,8 @@ public final class MediaCodecUtil {
+ ". Assuming: " + decoderInfos.get(0).name); + ". Assuming: " + decoderInfos.get(0).name);
} }
} }
if (MimeTypes.AUDIO_ATMOS.equals(mimeType)) { if (MimeTypes.AUDIO_E_AC3_JOC.equals(mimeType)) {
// E-AC3 decoders can decode Atmos streams, but in 2-D rather than 3-D. // E-AC3 decoders can decode JOC streams, but in 2-D rather than 3-D.
CodecKey eac3Key = new CodecKey(MimeTypes.AUDIO_E_AC3, key.secure); CodecKey eac3Key = new CodecKey(MimeTypes.AUDIO_E_AC3, key.secure);
ArrayList<MediaCodecInfo> eac3DecoderInfos = ArrayList<MediaCodecInfo> eac3DecoderInfos =
getDecoderInfosInternal(eac3Key, mediaCodecList, mimeType); getDecoderInfosInternal(eac3Key, mediaCodecList, mimeType);
@ -382,8 +382,8 @@ public final class MediaCodecUtil {
return false; return false;
} }
// MTK E-AC3 decoder doesn't support decoding Atmos streams in 2-D. See [Internal: b/69400041]. // MTK E-AC3 decoder doesn't support decoding JOC streams in 2-D. See [Internal: b/69400041].
if (MimeTypes.AUDIO_ATMOS.equals(requestedMimeType) if (MimeTypes.AUDIO_E_AC3_JOC.equals(requestedMimeType)
&& "OMX.MTK.AUDIO.DECODER.DSPAC3".equals(name)) { && "OMX.MTK.AUDIO.DECODER.DSPAC3".equals(name)) {
return false; return false;
} }

6
library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
View File

@ -52,7 +52,7 @@ public final class MimeTypes {
public static final String AUDIO_MLAW = BASE_TYPE_AUDIO + "/g711-mlaw"; public static final String AUDIO_MLAW = BASE_TYPE_AUDIO + "/g711-mlaw";
public static final String AUDIO_AC3 = BASE_TYPE_AUDIO + "/ac3"; public static final String AUDIO_AC3 = BASE_TYPE_AUDIO + "/ac3";
public static final String AUDIO_E_AC3 = BASE_TYPE_AUDIO + "/eac3"; public static final String AUDIO_E_AC3 = BASE_TYPE_AUDIO + "/eac3";
public static final String AUDIO_ATMOS = BASE_TYPE_AUDIO + "/eac3-joc"; public static final String AUDIO_E_AC3_JOC = BASE_TYPE_AUDIO + "/eac3-joc";
public static final String AUDIO_TRUEHD = BASE_TYPE_AUDIO + "/true-hd"; public static final String AUDIO_TRUEHD = BASE_TYPE_AUDIO + "/true-hd";
public static final String AUDIO_DTS = BASE_TYPE_AUDIO + "/vnd.dts"; public static final String AUDIO_DTS = BASE_TYPE_AUDIO + "/vnd.dts";
public static final String AUDIO_DTS_HD = BASE_TYPE_AUDIO + "/vnd.dts.hd"; public static final String AUDIO_DTS_HD = BASE_TYPE_AUDIO + "/vnd.dts.hd";
@ -200,7 +200,7 @@ public final class MimeTypes {
} else if (codec.startsWith("ec-3") || codec.startsWith("dec3")) { } else if (codec.startsWith("ec-3") || codec.startsWith("dec3")) {
return MimeTypes.AUDIO_E_AC3; return MimeTypes.AUDIO_E_AC3;
} else if (codec.startsWith("ec+3")) { } else if (codec.startsWith("ec+3")) {
return MimeTypes.AUDIO_ATMOS; return MimeTypes.AUDIO_E_AC3_JOC;
} else if (codec.startsWith("dtsc") || codec.startsWith("dtse")) { } else if (codec.startsWith("dtsc") || codec.startsWith("dtse")) {
return MimeTypes.AUDIO_DTS; return MimeTypes.AUDIO_DTS;
} else if (codec.startsWith("dtsh") || codec.startsWith("dtsl")) { } else if (codec.startsWith("dtsh") || codec.startsWith("dtsl")) {
@ -258,7 +258,7 @@ public final class MimeTypes {
case MimeTypes.AUDIO_AC3: case MimeTypes.AUDIO_AC3:
return C.ENCODING_AC3; return C.ENCODING_AC3;
case MimeTypes.AUDIO_E_AC3: case MimeTypes.AUDIO_E_AC3:
case MimeTypes.AUDIO_ATMOS: case MimeTypes.AUDIO_E_AC3_JOC:
return C.ENCODING_E_AC3; return C.ENCODING_E_AC3;
case MimeTypes.AUDIO_DTS: case MimeTypes.AUDIO_DTS:
return C.ENCODING_DTS; return C.ENCODING_DTS;

2
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
View File

@ -1072,7 +1072,7 @@ public class DashManifestParser extends DefaultHandler
String schemeIdUri = descriptor.schemeIdUri; String schemeIdUri = descriptor.schemeIdUri;
if ("tag:dolby.com,2014:dash:DolbyDigitalPlusExtensionType:2014".equals(schemeIdUri) if ("tag:dolby.com,2014:dash:DolbyDigitalPlusExtensionType:2014".equals(schemeIdUri)
&& "ec+3".equals(descriptor.value)) { && "ec+3".equals(descriptor.value)) {
return MimeTypes.AUDIO_ATMOS; return MimeTypes.AUDIO_E_AC3_JOC;
} }
} }
return MimeTypes.AUDIO_E_AC3; return MimeTypes.AUDIO_E_AC3;