sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-22 14:05:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More changes based on the internal review

Browse source
This commit is contained in:
Rohit Singh 2024-04-16 17:12:12 +01:00
parent cbe17bcd0a
commit aba51191aa
2 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libraries/extractor/src/main/java/androidx/media3/extractor/MpeghUtil.java
View file

@ -36,8 +36,6 @@ public final class MpeghUtil {
/** See ISO_IEC_23003-8;2022, 14.4.4. */
private static final int MHAS_SYNC_WORD = 0xC001A5;
public static final int MHAS_SYNC_WORD_LENGTH = 3;
public static final int MAX_MHAS_PACKET_HEADER_SIZE = 15;
/**
@ -210,7 +208,14 @@ public final class MpeghUtil {
@Nullable byte[] compatibleProfileLevelSet = null;
int profileLevelIndication = data.readBits(8);
int usacSamplingFrequency = getSamplingFrequency(data);
int usacSamplingFrequency;
int samplingFrequencyIndex = data.readBits(5);
if (samplingFrequencyIndex == 0x1F) {
usacSamplingFrequency = data.readBits(24);
} else {
usacSamplingFrequency = getSamplingFrequency(samplingFrequencyIndex);
}
int coreSbrFrameLengthIndex = data.readBits(3);
int outputFrameLength = getOutputFrameLength(coreSbrFrameLengthIndex);
int sbrRatioIndex = getSbrRatioIndex(coreSbrFrameLengthIndex);
@ -252,23 +257,15 @@ public final class MpeghUtil {
}
/**
* Obtains the sampling rate of the current MPEG-H frame. See ISO_IEC_23003-3;2020, 5.2, Table 7.
* The reading position of {@code data} will be modified.
* Obtains the sampling rate of the current MPEG-H frame. See ISO_IEC_23003-3;2020, 6.1.1.1, Table
* 72.
*
* @param data The data to parse, positioned at the start of the fields to obtain the sampling
* rate from.
* @param index The samplingFrequencyIndex which determines the sampling frequency.
* @return The sampling frequency.
* @throws ParserException if sampling frequency could not be obtained.
*/
private static int getSamplingFrequency(ParsableBitArray data) throws ParserException {
int samplingFrequencyIndex = data.readBits(5);
if (samplingFrequencyIndex == 0x1F) {
return data.readBits(24);
}
// See ISO_IEC_23003-3;2020, 6.1.1.1, Table 72.
switch (samplingFrequencyIndex) {
private static int getSamplingFrequency(int index) throws ParserException {
switch (index) {
case 0:
return 96_000;
case 1:
@ -323,7 +320,7 @@ public final class MpeghUtil {
return 9_600;
default:
throw ParserException.createForUnsupportedContainerFeature(
"Unsupported sampling rate index " + samplingFrequencyIndex);
"Unsupported sampling rate index " + index);
}
}

16
libraries/extractor/src/main/java/androidx/media3/extractor/ts/MpeghReader.java
View file

@ -198,12 +198,13 @@ public final class MpeghReader implements ElementaryStreamReader {
}
/**
* Continues a read from the provided {@code source} into a given {@code target}.
* Reads data from the provided {@code source} into a given {@code target}, attempting to fill the
* target buffer up to the specified {@code targetLength}.
*
* @param source The source from which to read.
* @param target The target into which data is to be read.
* @param targetLength The target length of the read.
* @return Whether the target length was reached.
* @param targetLength The desired total length of data in the target after the read.
* @return Whether the target now contains {@code targetLength} bytes of data.
*/
private boolean continueRead(
ParsableByteArray source, ParsableByteArray target, int targetLength) {
@ -299,12 +300,13 @@ public final class MpeghReader implements ElementaryStreamReader {
}
/**
* Copies data from the provided {@code source} into a given {@code target} without progressing
* the position of the {@code source}.
* Copies up to {@code targetLength} bytes from the {@code source} to the {@code target} without
* modifying the {@code source} position. Advances the {@code target} position to reflect the
* copied data.
*
* @param source The source from which to read.
* @param target The target into which data is to be read.
* @param targetLength The target length of the read.
* @param target The target into which data is to be written.
* @param targetLength The maximum number of bytes to copy.
*/
private void copyData(ParsableByteArray source, ParsableByteArray target, int targetLength) {
int sourcePosition = source.getPosition();