Commit 6682e623 by xufuji456

Compat video coding with mpeg1video in Mp4Extractor

parent 4bc392a8
...@@ -385,6 +385,9 @@ import java.util.List; ...@@ -385,6 +385,9 @@ import java.util.List;
@SuppressWarnings("ConstantCaseForConstants") @SuppressWarnings("ConstantCaseForConstants")
public static final int TYPE_twos = 0x74776f73; public static final int TYPE_twos = 0x74776f73;
@SuppressWarnings("ConstantCaseForConstants")
public static final int TYPE__m1v = 0x6d317620;
public final int type; public final int type;
public Atom(int type) { public Atom(int type) {
......
...@@ -869,7 +869,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -869,7 +869,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
|| childAtomType == Atom.TYPE_dvav || childAtomType == Atom.TYPE_dvav
|| childAtomType == Atom.TYPE_dva1 || childAtomType == Atom.TYPE_dva1
|| childAtomType == Atom.TYPE_dvhe || childAtomType == Atom.TYPE_dvhe
|| childAtomType == Atom.TYPE_dvh1) { || childAtomType == Atom.TYPE_dvh1
|| childAtomType == Atom.TYPE__m1v) {
parseVideoSampleEntry(stsd, childAtomType, childStartPosition, childAtomSize, trackId, parseVideoSampleEntry(stsd, childAtomType, childStartPosition, childAtomSize, trackId,
rotationDegrees, drmInitData, out, i); rotationDegrees, drmInitData, out, i);
} else if (childAtomType == Atom.TYPE_mp4a } else if (childAtomType == Atom.TYPE_mp4a
...@@ -1087,6 +1088,10 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -1087,6 +1088,10 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
childPosition += childAtomSize; childPosition += childAtomSize;
} }
if (mimeType == null && atomType == Atom.TYPE__m1v) {
mimeType = MimeTypes.VIDEO_MPEG;
}
// If the media type was not recognized, ignore the track. // If the media type was not recognized, ignore the track.
if (mimeType == null) { if (mimeType == null) {
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment