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

Ensure ParsableByteArray is large enough when appending in VorbisReader

Browse Source 
PiperOrigin-RevId: 336643621
This commit is contained in:
ibaker 2020-10-12 13:16:42 +01:00 committed by kim-vde
parent ca3b420cf6
commit d2db0bb74a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
View File

@ -25,6 +25,7 @@ import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
/** /**
* {@link StreamReader} to extract Vorbis data out of Ogg byte stream. * {@link StreamReader} to extract Vorbis data out of Ogg byte stream.
@ -160,8 +161,11 @@ import java.util.ArrayList;
@VisibleForTesting @VisibleForTesting
/* package */ static void appendNumberOfSamples( /* package */ static void appendNumberOfSamples(
ParsableByteArray buffer, long packetSampleCount) { ParsableByteArray buffer, long packetSampleCount) {
if (buffer.capacity() < buffer.limit() + 4) {
buffer.setLimit(buffer.limit() + 4); buffer.reset(Arrays.copyOf(buffer.getData(), buffer.limit() + 4));
} else {
buffer.setLimit(buffer.limit() + 4);
}
// The vorbis decoder expects the number of samples in the packet // The vorbis decoder expects the number of samples in the packet
// to be appended to the audio data as an int32 // to be appended to the audio data as an int32
byte[] data = buffer.getData(); byte[] data = buffer.getData();