Merge pull request #8257 from xufuji456:dev-v2

PiperOrigin-RevId: 344057097
google · Nov 24, 2020 · 1cd0851 · 1cd0851
2 parents f04941e + 6682e62
commit 1cd0851
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -59,6 +59,8 @@
  * Matroska: Add support for 32-bit floating point PCM, and 8-bit and
  16-bit big endian integer PCM
  ([#8142](https:/google/ExoPlayer/issues/8142)).
+ * MP4: Add support for mpeg1 video box
+ ([#8257](https:/google/ExoPlayer/issues/8257)).
 * DRM:
  * Fix playback failure when switching from PlayReady protected content to
  Widevine or Clearkey protected content in a playlist.

diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
@@ -280,6 +280,9 @@
  @SuppressWarnings("ConstantCaseForConstants")
  public static final int TYPE_TTML = 0x54544d4c;
 
+ @SuppressWarnings("ConstantCaseForConstants")
+ public static final int TYPE_m1v_ = 0x6d317620;
+
  @SuppressWarnings("ConstantCaseForConstants")
  public static final int TYPE_mp4v = 0x6d703476;
 

diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -853,6 +853,7 @@ private static StsdData parseStsd(
  if (childAtomType == Atom.TYPE_avc1
  || childAtomType == Atom.TYPE_avc3
  || childAtomType == Atom.TYPE_encv
+ || childAtomType == Atom.TYPE_m1v_
  || childAtomType == Atom.TYPE_mp4v
  || childAtomType == Atom.TYPE_hvc1
  || childAtomType == Atom.TYPE_hev1
@@ -993,8 +994,12 @@ private static void parseVideoSampleEntry(
  // drmInitData = null;
  // }
 
- @Nullable List<byte[]> initializationData = null;
  @Nullable String mimeType = null;
+ if (atomType == Atom.TYPE_m1v_) {
+ mimeType = MimeTypes.VIDEO_MPEG;
+ }
+
+ @Nullable List<byte[]> initializationData = null;
  @Nullable String codecs = null;
  @Nullable byte[] projectionData = null;
  @C.StereoMode