sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-18 13:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle sample size mismatch in MP4 extractors

Browse source 
#minor-release

PiperOrigin-RevId: 352016698
This commit is contained in:
kimvde 2021-01-15 16:44:00 +00:00 committed by Oliver Woodman
parent e869d5dbf9
commit 9faa393a15
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASENOTES.md
View file

@ -143,6 +143,8 @@
* Populate codecs string for H.265/HEVC in MP4, Matroska and MPEG-TS
streams to allow decoder capability checks based on codec profile/level
([#8393](https://github.com/google/ExoPlayer/issues/8393)).
* Handle sample size mismatches between raw audio `stsd` information and
`stsz` fixed sample size in MP4 extractors.
* Track selection:
* Allow parallel adaptation for video and audio
([#5111](https://github.com/google/ExoPlayer/issues/5111)).

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

@ -315,7 +315,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
SampleSizeBox sampleSizeBox;
@Nullable Atom.LeafAtom stszAtom = stblAtom.getLeafAtomOfType(Atom.TYPE_stsz);
if (stszAtom != null) {
sampleSizeBox = new StszSampleSizeBox(stszAtom);
sampleSizeBox = new StszSampleSizeBox(stszAtom, track.format);
} else {
@Nullable Atom.LeafAtom stz2Atom = stblAtom.getLeafAtomOfType(Atom.TYPE_stz2);
if (stz2Atom == null) {
@ -1720,10 +1720,25 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
private final int sampleCount;
private final ParsableByteArray data;
public StszSampleSizeBox(Atom.LeafAtom stszAtom) {
public StszSampleSizeBox(Atom.LeafAtom stszAtom, Format trackFormat) {
data = stszAtom.data;
data.setPosition(Atom.FULL_HEADER_SIZE);
int fixedSampleSize = data.readUnsignedIntToInt();
if (MimeTypes.AUDIO_RAW.equals(trackFormat.sampleMimeType)) {
int pcmFrameSize = Util.getPcmFrameSize(trackFormat.pcmEncoding, trackFormat.channelCount);
if (fixedSampleSize == 0 || fixedSampleSize % pcmFrameSize != 0) {
// The sample size from the stsz box is inconsistent with the PCM encoding and channel
// count derived from the stsd box. Choose stsd box as source of truth
// [Internal ref: b/171627904].
Log.w(
TAG,
"Audio sample size mismatch. stsd sample size: "
+ pcmFrameSize
+ ", stsz sample size: "
+ fixedSampleSize);
fixedSampleSize = pcmFrameSize;
}
}
this.fixedSampleSize = fixedSampleSize == 0 ? C.LENGTH_UNSET : fixedSampleSize;
sampleCount = data.readUnsignedIntToInt();
}