diff options
author | Santiago Seifert <aquilescanta@google.com> | 2020-06-24 21:42:30 +0100 |
---|---|---|
committer | Santiago Seifert <aquilescanta@google.com> | 2020-06-24 21:48:55 +0100 |
commit | ad7f868f52bda04573c7a83379f830c73e0c6799 (patch) | |
tree | 56b33a05f879ca8ab2701c1d58ba501b7877215a /apex/media | |
parent | a9d76001a96f2a6aa12cfef8be50eddf4fe7c7f4 (diff) |
Add the "enable emsg" flag
Just in case we need it in a future integration.
Bug: 154120292
Test: Manual.
Change-Id: I53e0db4188359edfb6fd3a641c23e78c5991a6eb
Diffstat (limited to 'apex/media')
-rw-r--r-- | apex/media/framework/java/android/media/MediaParser.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/apex/media/framework/java/android/media/MediaParser.java b/apex/media/framework/java/android/media/MediaParser.java index cc3017ab0777..bc97a367c391 100644 --- a/apex/media/framework/java/android/media/MediaParser.java +++ b/apex/media/framework/java/android/media/MediaParser.java @@ -870,6 +870,14 @@ public final class MediaParser { */ public static final String PARAMETER_OVERRIDE_IN_BAND_CAPTION_DECLARATIONS = "android.media.mediaParser.overrideInBandCaptionDeclarations"; + /** + * Sets whether a track for EMSG events should be exposed in case of parsing a container that + * supports them. {@code boolean} expected. Default value is {@link false}. + * + * @hide + */ + public static final String PARAMETER_EXPOSE_EMSG_TRACK = + "android.media.mediaParser.exposeEmsgTrack"; // Private constants. @@ -1309,6 +1317,10 @@ public final class MediaParser { return new MatroskaExtractor(flags); case PARSER_NAME_FMP4: flags |= + getBooleanParameter(PARAMETER_EXPOSE_EMSG_TRACK) + ? FragmentedMp4Extractor.FLAG_ENABLE_EMSG_TRACK + : 0; + flags |= getBooleanParameter(PARAMETER_MP4_IGNORE_EDIT_LISTS) ? FragmentedMp4Extractor.FLAG_WORKAROUND_IGNORE_EDIT_LISTS : 0; @@ -2102,6 +2114,7 @@ public final class MediaParser { PARAMETER_EXPOSE_CHUNK_INDEX_AS_MEDIA_FORMAT, Boolean.class); expectedTypeByParameterName.put( PARAMETER_OVERRIDE_IN_BAND_CAPTION_DECLARATIONS, Boolean.class); + expectedTypeByParameterName.put(PARAMETER_EXPOSE_EMSG_TRACK, Boolean.class); // We do not check PARAMETER_EXPOSE_CAPTION_FORMATS here, and we do it in setParameters // instead. Checking that the value is a List is insufficient to catch wrong parameter // value types. |