Skip to content

SDK / exoplayer

Go to a project
Commit 9108dc5b by Oliver Woodman
Options

Merge pull request #9421 from MarcusWichelmann:hevc-sps-parsing 

PiperOrigin-RevId: 398749045
parents a9867880 65001cc0
Expand all
Inline Side-by-side
Showing with 114 additions and 62 deletions
RELEASENOTES.md
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
* `SubtitleView` no longer implements `TextOutput`. `SubtitleView` * `SubtitleView` no longer implements `TextOutput`. `SubtitleView`
implements `Player.Listener`, so can be registered to a player with implements `Player.Listener`, so can be registered to a player with
`Player.addListener`. `Player.addListener`.
* Extractors:
* MP4: Correctly handle HEVC tracks with pixel aspect ratios other than 1.
* TS: Correctly handle HEVC tracks with pixel aspect ratios other than 1.
* Downloads and caching: * Downloads and caching:
* Modify `DownloadService` behavior when `DownloadService.getScheduler` * Modify `DownloadService` behavior when `DownloadService.getScheduler`
returns `null`, or returns a `Scheduler` that does not support the returns `null`, or returns a `Scheduler` that does not support the
......
library/common/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java
...@@ -85,29 +85,14 @@ public final class CodecSpecificDataUtil { ...@@ -85,29 +85,14 @@ public final class CodecSpecificDataUtil {
"avc1.%02X%02X%02X", profileIdc, constraintsFlagsAndReservedZero2Bits, levelIdc); "avc1.%02X%02X%02X", profileIdc, constraintsFlagsAndReservedZero2Bits, levelIdc);
} }
/** /** Builds an RFC 6381 HEVC codec string using the provided parameters. */
* Returns an RFC 6381 HEVC codec string based on the SPS NAL unit read from the provided bit public static String buildHevcCodecString(
* array. The position of the bit array must be the start of an SPS NALU (nal_unit_header), and int generalProfileSpace,
* the position may be modified by this method. boolean generalTierFlag,
*/ int generalProfileIdc,
public static String buildHevcCodecStringFromSps(ParsableNalUnitBitArray bitArray) { int generalProfileCompatibilityFlags,
// Skip nal_unit_header, sps_video_parameter_set_id, sps_max_sub_layers_minus1 and int[] constraintBytes,
// sps_temporal_id_nesting_flag. int generalLevelIdc) {
bitArray.skipBits(16 + 4 + 3 + 1);
int generalProfileSpace = bitArray.readBits(2);
boolean generalTierFlag = bitArray.readBit();
int generalProfileIdc = bitArray.readBits(5);
int generalProfileCompatibilityFlags = 0;
for (int i = 0; i < 32; i++) {
if (bitArray.readBit()) {
generalProfileCompatibilityFlags |= (1 << i);
}
}
int[] constraintBytes = new int[6];
for (int i = 0; i < constraintBytes.length; ++i) {
constraintBytes[i] = bitArray.readBits(8);
}
int generalLevelIdc = bitArray.readBits(8);
StringBuilder builder = StringBuilder builder =
new StringBuilder( new StringBuilder(
Util.formatInvariant( Util.formatInvariant(
......
library/common/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
...@@ -131,7 +131,7 @@ public final class NalUnitUtilTest { ...@@ -131,7 +131,7 @@ public final class NalUnitUtilTest {
assertThat(data.frameNumLength).isEqualTo(4); assertThat(data.frameNumLength).isEqualTo(4);
assertThat(data.picOrderCntLsbLength).isEqualTo(6); assertThat(data.picOrderCntLsbLength).isEqualTo(6);
assertThat(data.seqParameterSetId).isEqualTo(0); assertThat(data.seqParameterSetId).isEqualTo(0);
assertThat(data.pixelWidthAspectRatio).isEqualTo(1.0f); assertThat(data.pixelWidthHeightRatio).isEqualTo(1.0f);
assertThat(data.picOrderCountType).isEqualTo(0); assertThat(data.picOrderCountType).isEqualTo(0);
assertThat(data.separateColorPlaneFlag).isFalse(); assertThat(data.separateColorPlaneFlag).isFalse();
} }
......
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
...@@ -92,7 +92,7 @@ import com.google.android.exoplayer2.video.AvcConfig; ...@@ -92,7 +92,7 @@ import com.google.android.exoplayer2.video.AvcConfig;
.setCodecs(avcConfig.codecs) .setCodecs(avcConfig.codecs)
.setWidth(avcConfig.width) .setWidth(avcConfig.width)
.setHeight(avcConfig.height) .setHeight(avcConfig.height)
.setPixelWidthHeightRatio(avcConfig.pixelWidthAspectRatio) .setPixelWidthHeightRatio(avcConfig.pixelWidthHeightRatio)
.setInitializationData(avcConfig.initializationData) .setInitializationData(avcConfig.initializationData)
.build(); .build();
output.format(format); output.format(format);
......
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
...@@ -1130,7 +1130,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -1130,7 +1130,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
initializationData = avcConfig.initializationData; initializationData = avcConfig.initializationData;
out.nalUnitLengthFieldLength = avcConfig.nalUnitLengthFieldLength; out.nalUnitLengthFieldLength = avcConfig.nalUnitLengthFieldLength;
if (!pixelWidthHeightRatioFromPasp) { if (!pixelWidthHeightRatioFromPasp) {
pixelWidthHeightRatio = avcConfig.pixelWidthAspectRatio; pixelWidthHeightRatio = avcConfig.pixelWidthHeightRatio;
} }
codecs = avcConfig.codecs; codecs = avcConfig.codecs;
} else if (childAtomType == Atom.TYPE_hvcC) { } else if (childAtomType == Atom.TYPE_hvcC) {
...@@ -1140,6 +1140,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -1140,6 +1140,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
HevcConfig hevcConfig = HevcConfig.parse(parent); HevcConfig hevcConfig = HevcConfig.parse(parent);
initializationData = hevcConfig.initializationData; initializationData = hevcConfig.initializationData;
out.nalUnitLengthFieldLength = hevcConfig.nalUnitLengthFieldLength; out.nalUnitLengthFieldLength = hevcConfig.nalUnitLengthFieldLength;
if (!pixelWidthHeightRatioFromPasp) {
pixelWidthHeightRatio = hevcConfig.pixelWidthHeightRatio;
}
codecs = hevcConfig.codecs; codecs = hevcConfig.codecs;
} else if (childAtomType == Atom.TYPE_dvcC || childAtomType == Atom.TYPE_dvvC) { } else if (childAtomType == Atom.TYPE_dvcC || childAtomType == Atom.TYPE_dvvC) {
@Nullable DolbyVisionConfig dolbyVisionConfig = DolbyVisionConfig.parse(parent); @Nullable DolbyVisionConfig dolbyVisionConfig = DolbyVisionConfig.parse(parent);
......
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java
...@@ -218,7 +218,7 @@ public final class H264Reader implements ElementaryStreamReader { ...@@ -218,7 +218,7 @@ public final class H264Reader implements ElementaryStreamReader {
.setCodecs(codecs) .setCodecs(codecs)
.setWidth(spsData.width) .setWidth(spsData.width)
.setHeight(spsData.height) .setHeight(spsData.height)
.setPixelWidthHeightRatio(spsData.pixelWidthAspectRatio) .setPixelWidthHeightRatio(spsData.pixelWidthHeightRatio)
.setInitializationData(initializationData) .setInitializationData(initializationData)
.build()); .build());
hasOutputFormat = true; hasOutputFormat = true;
......
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java
...@@ -247,10 +247,20 @@ public final class H265Reader implements ElementaryStreamReader { ...@@ -247,10 +247,20 @@ public final class H265Reader implements ElementaryStreamReader {
bitArray.skipBits(40 + 4); // NAL header, sps_video_parameter_set_id bitArray.skipBits(40 + 4); // NAL header, sps_video_parameter_set_id
int maxSubLayersMinus1 = bitArray.readBits(3); int maxSubLayersMinus1 = bitArray.readBits(3);
bitArray.skipBit(); // sps_temporal_id_nesting_flag bitArray.skipBit(); // sps_temporal_id_nesting_flag
int generalProfileSpace = bitArray.readBits(2);
// profile_tier_level(1, sps_max_sub_layers_minus1) boolean generalTierFlag = bitArray.readBit();
bitArray.skipBits(88); // if (profilePresentFlag) {...} int generalProfileIdc = bitArray.readBits(5);
bitArray.skipBits(8); // general_level_idc int generalProfileCompatibilityFlags = 0;
for (int i = 0; i < 32; i++) {
if (bitArray.readBit()) {
generalProfileCompatibilityFlags |= (1 << i);
}
}
int[] constraintBytes = new int[6];
for (int i = 0; i < constraintBytes.length; ++i) {
constraintBytes[i] = bitArray.readBits(8);
}
int generalLevelIdc = bitArray.readBits(8);
int toSkip = 0; int toSkip = 0;
for (int i = 0; i < maxSubLayersMinus1; i++) { for (int i = 0; i < maxSubLayersMinus1; i++) {
if (bitArray.readBit()) { // sub_layer_profile_present_flag[i] if (bitArray.readBit()) { // sub_layer_profile_present_flag[i]
...@@ -360,10 +370,14 @@ public final class H265Reader implements ElementaryStreamReader { ...@@ -360,10 +370,14 @@ public final class H265Reader implements ElementaryStreamReader {
} }
} }
// Parse the SPS to derive an RFC 6381 codecs string. String codecs =
bitArray.reset(sps.nalData, 0, sps.nalLength); CodecSpecificDataUtil.buildHevcCodecString(
bitArray.skipBits(24); // Skip start code. generalProfileSpace,
String codecs = CodecSpecificDataUtil.buildHevcCodecStringFromSps(bitArray); generalTierFlag,
generalProfileIdc,
generalProfileCompatibilityFlags,
constraintBytes,
generalLevelIdc);
return new Format.Builder() return new Format.Builder()
.setId(formatId) .setId(formatId)
......
library/extractor/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java
...@@ -28,13 +28,6 @@ import java.util.List; ...@@ -28,13 +28,6 @@ import java.util.List;
/** AVC configuration data. */ /** AVC configuration data. */
public final class AvcConfig { public final class AvcConfig {
public final List<byte[]> initializationData;
public final int nalUnitLengthFieldLength;
public final int width;
public final int height;
public final float pixelWidthAspectRatio;
@Nullable public final String codecs;
/** /**
* Parses AVC configuration data. * Parses AVC configuration data.
* *
...@@ -62,7 +55,7 @@ public final class AvcConfig { ...@@ -62,7 +55,7 @@ public final class AvcConfig {
int width = Format.NO_VALUE; int width = Format.NO_VALUE;
int height = Format.NO_VALUE; int height = Format.NO_VALUE;
float pixelWidthAspectRatio = 1; float pixelWidthHeightRatio = 1;
@Nullable String codecs = null; @Nullable String codecs = null;
if (numSequenceParameterSets > 0) { if (numSequenceParameterSets > 0) {
byte[] sps = initializationData.get(0); byte[] sps = initializationData.get(0);
...@@ -71,7 +64,7 @@ public final class AvcConfig { ...@@ -71,7 +64,7 @@ public final class AvcConfig {
initializationData.get(0), nalUnitLengthFieldLength, sps.length); initializationData.get(0), nalUnitLengthFieldLength, sps.length);
width = spsData.width; width = spsData.width;
height = spsData.height; height = spsData.height;
pixelWidthAspectRatio = spsData.pixelWidthAspectRatio; pixelWidthHeightRatio = spsData.pixelWidthHeightRatio;
codecs = codecs =
CodecSpecificDataUtil.buildAvcCodecString( CodecSpecificDataUtil.buildAvcCodecString(
spsData.profileIdc, spsData.constraintsFlagsAndReservedZero2Bits, spsData.levelIdc); spsData.profileIdc, spsData.constraintsFlagsAndReservedZero2Bits, spsData.levelIdc);
...@@ -82,25 +75,51 @@ public final class AvcConfig { ...@@ -82,25 +75,51 @@ public final class AvcConfig {
nalUnitLengthFieldLength, nalUnitLengthFieldLength,
width, width,
height, height,
pixelWidthAspectRatio, pixelWidthHeightRatio,
codecs); codecs);
} catch (ArrayIndexOutOfBoundsException e) { } catch (ArrayIndexOutOfBoundsException e) {
throw ParserException.createForMalformedContainer("Error parsing AVC config", e); throw ParserException.createForMalformedContainer("Error parsing AVC config", e);
} }
} }
/**
* List of buffers containing the codec-specific data to be provided to the decoder.
*
* @see com.google.android.exoplayer2.Format#initializationData
*/
public final List<byte[]> initializationData;
/** The length of the NAL unit length field in the bitstream's container, in bytes. */
public final int nalUnitLengthFieldLength;
/** The width of each decoded frame, or {@link Format#NO_VALUE} if unknown. */
public final int width;
/** The height of each decoded frame, or {@link Format#NO_VALUE} if unknown. */
public final int height;
/** The pixel width to height ratio. */
public final float pixelWidthHeightRatio;
/**
* An RFC 6381 codecs string representing the video format, or {@code null} if not known.
*
* @see com.google.android.exoplayer2.Format#codecs
*/
@Nullable public final String codecs;
private AvcConfig( private AvcConfig(
List<byte[]> initializationData, List<byte[]> initializationData,
int nalUnitLengthFieldLength, int nalUnitLengthFieldLength,
int width, int width,
int height, int height,
float pixelWidthAspectRatio, float pixelWidthHeightRatio,
@Nullable String codecs) { @Nullable String codecs) {
this.initializationData = initializationData; this.initializationData = initializationData;
this.nalUnitLengthFieldLength = nalUnitLengthFieldLength; this.nalUnitLengthFieldLength = nalUnitLengthFieldLength;
this.width = width; this.width = width;
this.height = height; this.height = height;
this.pixelWidthAspectRatio = pixelWidthAspectRatio; this.pixelWidthHeightRatio = pixelWidthHeightRatio;
this.codecs = codecs; this.codecs = codecs;
} }
......
library/extractor/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
package com.google.android.exoplayer2.video; package com.google.android.exoplayer2.video;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.ParserException;
import com.google.android.exoplayer2.util.CodecSpecificDataUtil; import com.google.android.exoplayer2.util.CodecSpecificDataUtil;
import com.google.android.exoplayer2.util.NalUnitUtil; import com.google.android.exoplayer2.util.NalUnitUtil;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.ParsableNalUnitBitArray;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -58,6 +58,9 @@ public final class HevcConfig { ...@@ -58,6 +58,9 @@ public final class HevcConfig {
data.setPosition(csdStartPosition); data.setPosition(csdStartPosition);
byte[] buffer = new byte[csdLength]; byte[] buffer = new byte[csdLength];
int bufferPosition = 0; int bufferPosition = 0;
int width = Format.NO_VALUE;
int height = Format.NO_VALUE;
float pixelWidthHeightRatio = 1;
@Nullable String codecs = null; @Nullable String codecs = null;
for (int i = 0; i < numberOfArrays; i++) { for (int i = 0; i < numberOfArrays; i++) {
int nalUnitType = data.readUnsignedByte() & 0x7F; // completeness (1), nal_unit_type (7) int nalUnitType = data.readUnsignedByte() & 0x7F; // completeness (1), nal_unit_type (7)
...@@ -74,21 +77,30 @@ public final class HevcConfig { ...@@ -74,21 +77,30 @@ public final class HevcConfig {
System.arraycopy( System.arraycopy(
data.getData(), data.getPosition(), buffer, bufferPosition, nalUnitLength); data.getData(), data.getPosition(), buffer, bufferPosition, nalUnitLength);
if (nalUnitType == SPS_NAL_UNIT_TYPE && j == 0) { if (nalUnitType == SPS_NAL_UNIT_TYPE && j == 0) {
ParsableNalUnitBitArray bitArray = NalUnitUtil.H265SpsData spsData =
new ParsableNalUnitBitArray( NalUnitUtil.parseH265SpsNalUnit(
buffer, buffer, bufferPosition, bufferPosition + nalUnitLength);
/* offset= */ bufferPosition, width = spsData.width;
/* limit= */ bufferPosition + nalUnitLength); height = spsData.height;
codecs = CodecSpecificDataUtil.buildHevcCodecStringFromSps(bitArray); pixelWidthHeightRatio = spsData.pixelWidthHeightRatio;
codecs =
CodecSpecificDataUtil.buildHevcCodecString(
spsData.generalProfileSpace,
spsData.generalTierFlag,
spsData.generalProfileIdc,
spsData.generalProfileCompatibilityFlags,
spsData.constraintBytes,
spsData.generalLevelIdc);
} }
bufferPosition += nalUnitLength; bufferPosition += nalUnitLength;
data.skipBytes(nalUnitLength); data.skipBytes(nalUnitLength);
} }
} }
@Nullable List<byte[]> initializationData =
List<byte[]> initializationData = csdLength == 0 ? null : Collections.singletonList(buffer); csdLength == 0 ? Collections.emptyList() : Collections.singletonList(buffer);
return new HevcConfig(initializationData, lengthSizeMinusOne + 1, codecs); return new HevcConfig(
initializationData, lengthSizeMinusOne + 1, width, height, pixelWidthHeightRatio, codecs);
} catch (ArrayIndexOutOfBoundsException e) { } catch (ArrayIndexOutOfBoundsException e) {
throw ParserException.createForMalformedContainer("Error parsing HEVC config", e); throw ParserException.createForMalformedContainer("Error parsing HEVC config", e);
} }
...@@ -97,14 +109,24 @@ public final class HevcConfig { ...@@ -97,14 +109,24 @@ public final class HevcConfig {
private static final int SPS_NAL_UNIT_TYPE = 33; private static final int SPS_NAL_UNIT_TYPE = 33;
/** /**
* List of buffers containing the codec-specific data to be provided to the decoder, or {@code * List of buffers containing the codec-specific data to be provided to the decoder.
* null} if not known.
* *
* @see com.google.android.exoplayer2.Format#initializationData * @see com.google.android.exoplayer2.Format#initializationData
*/ */
@Nullable public final List<byte[]> initializationData; public final List<byte[]> initializationData;
/** The length of the NAL unit length field in the bitstream's container, in bytes. */ /** The length of the NAL unit length field in the bitstream's container, in bytes. */
public final int nalUnitLengthFieldLength; public final int nalUnitLengthFieldLength;
/** The width of each decoded frame, or {@link Format#NO_VALUE} if unknown. */
public final int width;
/** The height of each decoded frame, or {@link Format#NO_VALUE} if unknown. */
public final int height;
/** The pixel width to height ratio. */
public final float pixelWidthHeightRatio;
/** /**
* An RFC 6381 codecs string representing the video format, or {@code null} if not known. * An RFC 6381 codecs string representing the video format, or {@code null} if not known.
* *
...@@ -113,11 +135,17 @@ public final class HevcConfig { ...@@ -113,11 +135,17 @@ public final class HevcConfig {
@Nullable public final String codecs; @Nullable public final String codecs;
private HevcConfig( private HevcConfig(
@Nullable List<byte[]> initializationData, List<byte[]> initializationData,
int nalUnitLengthFieldLength, int nalUnitLengthFieldLength,
int width,
int height,
float pixelWidthHeightRatio,
@Nullable String codecs) { @Nullable String codecs) {
this.initializationData = initializationData; this.initializationData = initializationData;
this.nalUnitLengthFieldLength = nalUnitLengthFieldLength; this.nalUnitLengthFieldLength = nalUnitLengthFieldLength;
this.width = width;
this.height = height;
this.pixelWidthHeightRatio = pixelWidthHeightRatio;
this.codecs = codecs; this.codecs = codecs;
} }
} }
library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrack.java
...@@ -177,7 +177,7 @@ import com.google.common.collect.ImmutableMap; ...@@ -177,7 +177,7 @@ import com.google.common.collect.ImmutableMap;
NalUnitUtil.SpsData spsData = NalUnitUtil.SpsData spsData =
NalUnitUtil.parseSpsNalUnit( NalUnitUtil.parseSpsNalUnit(
spsNalDataWithStartCode, NAL_START_CODE.length, spsNalDataWithStartCode.length); spsNalDataWithStartCode, NAL_START_CODE.length, spsNalDataWithStartCode.length);
formatBuilder.setPixelWidthHeightRatio(spsData.pixelWidthAspectRatio); formatBuilder.setPixelWidthHeightRatio(spsData.pixelWidthHeightRatio);
formatBuilder.setHeight(spsData.height); formatBuilder.setHeight(spsData.height);
formatBuilder.setWidth(spsData.width); formatBuilder.setWidth(spsData.width);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment