loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-15 11:39:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

No-op format changes.

Browse Source
This commit is contained in:
Oliver Woodman 2014-12-08 20:19:24 +00:00
parent 87ca1b3465
commit a254218891
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/src/main/java/com/google/android/exoplayer/hls/TsExtractor.java
View File

@ -787,18 +787,16 @@ public final class TsExtractor {
} }
int spsLength = bitArray.findNextNalUnit(-1, spsOffset + 3) - spsOffset; int spsLength = bitArray.findNextNalUnit(-1, spsOffset + 3) - spsOffset;
int ppsLength = bitArray.findNextNalUnit(-1, ppsOffset + 3) - ppsOffset; int ppsLength = bitArray.findNextNalUnit(-1, ppsOffset + 3) - ppsOffset;
byte[] spsData = new byte[spsLength]; byte[] spsData = new byte[spsLength];
byte[] ppsData = new byte[ppsLength]; byte[] ppsData = new byte[ppsLength];
System.arraycopy(bitArray.getData(), spsOffset, spsData, 0, spsLength); System.arraycopy(bitArray.getData(), spsOffset, spsData, 0, spsLength);
System.arraycopy(bitArray.getData(), ppsOffset, ppsData, 0, ppsLength); System.arraycopy(bitArray.getData(), ppsOffset, ppsData, 0, ppsLength);
List<byte[]> initializationData = new ArrayList<byte[]>(); List<byte[]> initializationData = new ArrayList<byte[]>();
initializationData.add(spsData); initializationData.add(spsData);
initializationData.add(ppsData); initializationData.add(ppsData);
// Unescape the SPS unit. // Unescape the SPS unit.
byte[] unescapedSps = unescapeData(spsData, 0, spsLength); byte[] unescapedSps = unescapeStream(spsData, 0, spsLength);
bitArray.reset(unescapedSps, unescapedSps.length); bitArray.reset(unescapedSps, unescapedSps.length);
// Parse the SPS unit // Parse the SPS unit
@ -913,7 +911,7 @@ public final class TsExtractor {
* <p> * <p>
* See ISO/IEC 14496-10:2005(E) page 36 for more information. * See ISO/IEC 14496-10:2005(E) page 36 for more information.
*/ */
private byte[] unescapeData(byte[] data, int offset, int limit) { private byte[] unescapeStream(byte[] data, int offset, int limit) {
int position = offset; int position = offset;
List<Integer> escapePositions = new ArrayList<Integer>(); List<Integer> escapePositions = new ArrayList<Integer>();
while (position < limit) { while (position < limit) {