sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8257 from xufuji456:dev-v2

Browse source 
PiperOrigin-RevId: 344057097
This commit is contained in:
kim-vde 2020-11-24 16:04:04 +00:00
commit 1cd08519f1
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASENOTES.md
View file

@ -59,6 +59,8 @@
* Matroska: Add support for 32-bit floating point PCM, and 8-bit and * Matroska: Add support for 32-bit floating point PCM, and 8-bit and
16-bit big endian integer PCM 16-bit big endian integer PCM
([#8142](https://github.com/google/ExoPlayer/issues/8142)). ([#8142](https://github.com/google/ExoPlayer/issues/8142)).
* MP4: Add support for mpeg1 video box
([#8257](https://github.com/google/ExoPlayer/issues/8257)).
* DRM: * DRM:
* Fix playback failure when switching from PlayReady protected content to * Fix playback failure when switching from PlayReady protected content to
Widevine or Clearkey protected content in a playlist. Widevine or Clearkey protected content in a playlist.

3
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
View file

@ -280,6 +280,9 @@ import java.util.List;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
public static final int TYPE_TTML = 0x54544d4c; public static final int TYPE_TTML = 0x54544d4c;
@SuppressWarnings("ConstantCaseForConstants")
public static final int TYPE_m1v_ = 0x6d317620;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
public static final int TYPE_mp4v = 0x6d703476; public static final int TYPE_mp4v = 0x6d703476;

7
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
View file

@ -853,6 +853,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
if (childAtomType == Atom.TYPE_avc1 if (childAtomType == Atom.TYPE_avc1
|| childAtomType == Atom.TYPE_avc3 || childAtomType == Atom.TYPE_avc3
|| childAtomType == Atom.TYPE_encv || childAtomType == Atom.TYPE_encv
|| childAtomType == Atom.TYPE_m1v_
|| childAtomType == Atom.TYPE_mp4v || childAtomType == Atom.TYPE_mp4v
|| childAtomType == Atom.TYPE_hvc1 || childAtomType == Atom.TYPE_hvc1
|| childAtomType == Atom.TYPE_hev1 || childAtomType == Atom.TYPE_hev1
@ -993,8 +994,12 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
// drmInitData = null; // drmInitData = null;
// } // }
@Nullable List<byte[]> initializationData = null;
@Nullable String mimeType = null; @Nullable String mimeType = null;
if (atomType == Atom.TYPE_m1v_) {
mimeType = MimeTypes.VIDEO_MPEG;
}
@Nullable List<byte[]> initializationData = null;
@Nullable String codecs = null; @Nullable String codecs = null;
@Nullable byte[] projectionData = null; @Nullable byte[] projectionData = null;
@C.StereoMode @C.StereoMode