loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compute format maxInputSize in FlacReader

Browse Source 
Use the maximum frame size as the maximum sample size if provided.

PiperOrigin-RevId: 279722820
This commit is contained in:
kimvde 2019-11-11 14:22:30 +00:00 committed by Oliver Woodman
parent 2b1c2171e7
commit a8b65ca8d6
11 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java
View File

@ -73,6 +73,8 @@ import java.util.List;
byte[] data = packet.data;
if (streamMetadata == null) {
streamMetadata = new FlacStreamMetadata(data, 17);
int maxInputSize =
streamMetadata.maxFrameSize == 0 ? Format.NO_VALUE : streamMetadata.maxFrameSize;
byte[] metadata = Arrays.copyOfRange(data, 9, packet.limit());
metadata[4] = (byte) 0x80; // Set the last metadata block flag, ignore the other blocks
List<byte[]> initializationData = Collections.singletonList(metadata);
@ -82,7 +84,7 @@ import java.util.List;
MimeTypes.AUDIO_FLAC,
/* codecs= */ null,
streamMetadata.bitRate(),
/* maxInputSize= */ Format.NO_VALUE,
maxInputSize,
streamMetadata.channels,
streamMetadata.sampleRate,
initializationData,

2
library/core/src/test/assets/ogg/bear_flac.ogg.0.dump
View File

@ -9,7 +9,7 @@ track 0:
id = null
containerMimeType = null
sampleMimeType = audio/flac
maxInputSize = -1
maxInputSize = 5776
width = -1
height = -1
frameRate = -1.0

2
library/core/src/test/assets/ogg/bear_flac.ogg.1.dump
View File

@ -9,7 +9,7 @@ track 0:
id = null
containerMimeType = null
sampleMimeType = audio/flac
maxInputSize = -1
maxInputSize = 5776
width = -1
height = -1
frameRate = -1.0

2
library/core/src/test/assets/ogg/bear_flac.ogg.2.dump
View File

@ -9,7 +9,7 @@ track 0:
id = null
containerMimeType = null
sampleMimeType = audio/flac
maxInputSize = -1
maxInputSize = 5776
width = -1
height = -1
frameRate = -1.0

2
library/core/src/test/assets/ogg/bear_flac.ogg.3.dump
View File

@ -9,7 +9,7 @@ track 0:
id = null
containerMimeType = null
sampleMimeType = audio/flac
maxInputSize = -1
maxInputSize = 5776
width = -1
height = -1
frameRate = -1.0

2
library/core/src/test/assets/ogg/bear_flac.ogg.unklen.dump
View File

@ -9,7 +9,7 @@ track 0:
id = null
containerMimeType = null
sampleMimeType = audio/flac
maxInputSize = -1
maxInputSize = 5776
width = -1
height = -1
frameRate = -1.0

2
library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump
View File

@ -9,7 +9,7 @@ track 0:
id = null
containerMimeType = null
sampleMimeType = audio/flac
maxInputSize = -1
maxInputSize = 5776
width = -1
height = -1
frameRate = -1.0

2
library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump
View File

@ -9,7 +9,7 @@ track 0:
id = null
containerMimeType = null
sampleMimeType = audio/flac
maxInputSize = -1
maxInputSize = 5776
width = -1
height = -1
frameRate = -1.0

2
library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump
View File

@ -9,7 +9,7 @@ track 0:
id = null
containerMimeType = null
sampleMimeType = audio/flac
maxInputSize = -1
maxInputSize = 5776
width = -1
height = -1
frameRate = -1.0

2
library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump
View File

@ -9,7 +9,7 @@ track 0:
id = null
containerMimeType = null
sampleMimeType = audio/flac
maxInputSize = -1
maxInputSize = 5776
width = -1
height = -1
frameRate = -1.0

2
library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
View File

@ -9,7 +9,7 @@ track 0:
id = null
containerMimeType = null
sampleMimeType = audio/flac
maxInputSize = -1
maxInputSize = 5776
width = -1
height = -1
frameRate = -1.0