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

Fix review comments on RtpMPEG4Reader

Browse Source
This commit is contained in:
Manisha Jajoo 2022-02-21 13:20:12 +05:30
parent 706d5ac252
commit ef9393a337
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaTrack.java
View File

@ -56,7 +56,7 @@ import com.google.common.collect.ImmutableMap;
/** Prefix for the RFC6381 codecs string for AVC formats. */ /** Prefix for the RFC6381 codecs string for AVC formats. */
private static final String H264_CODECS_PREFIX = "avc1."; private static final String H264_CODECS_PREFIX = "avc1.";
/** Prefix for the RFC6416 codecs string for MPEG4V-ES formats. */ /** Prefix for the RFC6416 codecs string for MPEG4V-ES formats. */
private static final String MPEG4_CODECS_PREFIX = "mp4v"; private static final String MPEG4_CODECS_PREFIX = "mp4v.";
private static final String GENERIC_CONTROL_ATTR = "*"; private static final String GENERIC_CONTROL_ATTR = "*";
@ -181,12 +181,14 @@ import com.google.common.collect.ImmutableMap;
Format.Builder formatBuilder, ImmutableMap<String, String> fmtpAttributes) { Format.Builder formatBuilder, ImmutableMap<String, String> fmtpAttributes) {
@Nullable String configInput = fmtpAttributes.get(PARAMETER_MP4V_CONFIG); @Nullable String configInput = fmtpAttributes.get(PARAMETER_MP4V_CONFIG);
if (configInput != null) { if (configInput != null) {
byte[] csd = Util.getBytesFromHexString(configInput); byte[] configBuffer = Util.getBytesFromHexString(configInput);
formatBuilder.setInitializationData(ImmutableList.of(csd)); formatBuilder.setInitializationData(ImmutableList.of(configBuffer));
Pair<Integer, Integer> resolution = Pair<Integer, Integer> resolution =
CodecSpecificDataUtil.getVideoResolutionFromMpeg4VideoConfig(csd); CodecSpecificDataUtil.getVideoResolutionFromMpeg4VideoConfig(configBuffer);
formatBuilder.setWidth(resolution.first); formatBuilder.setWidth(resolution.first).setHeight(resolution.second);
formatBuilder.setHeight(resolution.second); } else {
// set the default width and height
formatBuilder.setWidth(352).setHeight(288);
} }
@Nullable String profileLevel = fmtpAttributes.get(PARAMETER_PROFILE_LEVEL_ID); @Nullable String profileLevel = fmtpAttributes.get(PARAMETER_PROFILE_LEVEL_ID);
formatBuilder.setCodecs(MPEG4_CODECS_PREFIX + (profileLevel == null ? "1" : profileLevel)); formatBuilder.setCodecs(MPEG4_CODECS_PREFIX + (profileLevel == null ? "1" : profileLevel));

9
libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpMPEG4Reader.java
View File

@ -88,7 +88,9 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
// Parse VOP Type and get the buffer flags // Parse VOP Type and get the buffer flags
int limit = data.bytesLeft(); int limit = data.bytesLeft();
trackOutput.sampleData(data, limit); trackOutput.sampleData(data, limit);
if (sampleLength == 0) bufferFlags = getBufferFlagsFromVop(data); if (sampleLength == 0) {
bufferFlags = getBufferFlagsFromVop(data);
}
sampleLength += limit; sampleLength += limit;
// Marker (M) bit: The marker bit is set to 1 to indicate the last RTP // Marker (M) bit: The marker bit is set to 1 to indicate the last RTP
@ -122,7 +124,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
*/ */
@C.BufferFlags @C.BufferFlags
private static int getBufferFlagsFromVop(ParsableByteArray data) { private static int getBufferFlagsFromVop(ParsableByteArray data) {
int flags = 0;
// search for VOP_START_CODE (00 00 01 B6) // search for VOP_START_CODE (00 00 01 B6)
byte[] inputData = data.getData(); byte[] inputData = data.getData();
byte[] startCode = new byte[] {0x0, 0x0, 0x1, (byte) 0xB6}; byte[] startCode = new byte[] {0x0, 0x0, 0x1, (byte) 0xB6};
@ -130,9 +131,9 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
if (vopStartCodePos != -1) { if (vopStartCodePos != -1) {
data.setPosition(vopStartCodePos + 4); data.setPosition(vopStartCodePos + 4);
int vopType = data.peekUnsignedByte() >> 6; int vopType = data.peekUnsignedByte() >> 6;
flags = vopType == I_VOP ? C.BUFFER_FLAG_KEY_FRAME : 0; return (vopType == I_VOP ? C.BUFFER_FLAG_KEY_FRAME : 0);
} }
return flags; return 0;
} }
private static long toSampleUs( private static long toSampleUs(