Skip to content

Commit 930709e

Browse files
icbakericbaker
committed
Merge pull request #56 from ittiam-systems:rtp_wav
PiperOrigin-RevId: 437783926
2 parents 544bb85 + 3f8a680 commit 930709e

File tree

5 files changed

+326
-2
lines changed

5 files changed

+326
-2
lines changed

‎library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpPayloadFormat.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
*/
1616
package com.google.android.exoplayer2.source.rtsp;
1717

18+
import static com.google.android.exoplayer2.util.Assertions.checkArgument;
19+
1820
import androidx.annotation.Nullable;
21+
import com.google.android.exoplayer2.C;
1922
import com.google.android.exoplayer2.Format;
2023
import com.google.android.exoplayer2.util.MimeTypes;
2124
import com.google.common.base.Ascii;
@@ -40,6 +43,10 @@ public final class RtpPayloadFormat {
4043
private static final String RTP_MEDIA_MPEG4_GENERIC = "MPEG4-GENERIC";
4144
private static final String RTP_MEDIA_H264 = "H264";
4245
private static final String RTP_MEDIA_H265 = "H265";
46+
private static final String RTP_MEDIA_PCM_L8 = "L8";
47+
private static final String RTP_MEDIA_PCM_L16 = "L16";
48+
private static final String RTP_MEDIA_PCMA = "PCMA";
49+
private static final String RTP_MEDIA_PCMU = "PCMU";
4350
private static final String RTP_MEDIA_VP8 = "VP8";
4451

4552
/** Returns whether the format of a {@link MediaDescription} is supported. */
@@ -51,6 +58,10 @@ public static boolean isFormatSupported(MediaDescription mediaDescription) {
5158
case RTP_MEDIA_H264:
5259
case RTP_MEDIA_H265:
5360
case RTP_MEDIA_MPEG4_GENERIC:
61+
case RTP_MEDIA_PCM_L8:
62+
case RTP_MEDIA_PCM_L16:
63+
case RTP_MEDIA_PCMA:
64+
case RTP_MEDIA_PCMU:
5465
case RTP_MEDIA_VP8:
5566
return true;
5667
default:
@@ -79,13 +90,29 @@ public static String getMimeTypeFromRtpMediaType(String mediaType) {
7990
return MimeTypes.VIDEO_H265;
8091
case RTP_MEDIA_MPEG4_GENERIC:
8192
return MimeTypes.AUDIO_AAC;
93+
case RTP_MEDIA_PCM_L8:
94+
case RTP_MEDIA_PCM_L16:
95+
return MimeTypes.AUDIO_RAW;
96+
case RTP_MEDIA_PCMA:
97+
return MimeTypes.AUDIO_ALAW;
98+
case RTP_MEDIA_PCMU:
99+
return MimeTypes.AUDIO_MLAW;
82100
case RTP_MEDIA_VP8:
83101
return MimeTypes.VIDEO_VP8;
84102
default:
85103
throw new IllegalArgumentException(mediaType);
86104
}
87105
}
88106

107+
/** Returns the PCM encoding type for {@code mediaEncoding}. */
108+
public static @C.PcmEncoding int getRawPcmEncodingType(String mediaEncoding) {
109+
checkArgument(
110+
mediaEncoding.equals(RTP_MEDIA_PCM_L8) || mediaEncoding.equals(RTP_MEDIA_PCM_L16));
111+
return mediaEncoding.equals(RtpPayloadFormat.RTP_MEDIA_PCM_L8)
112+
? C.ENCODING_PCM_8BIT
113+
: C.ENCODING_PCM_16BIT_BIG_ENDIAN;
114+
}
115+
89116
/** The payload type associated with this format. */
90117
public final int rtpPayloadType;
91118
/** The clock rate in Hertz, associated with the format. */

‎library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrack.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@ public int hashCode() {
121121
}
122122

123123
int rtpPayloadType = mediaDescription.rtpMapAttribute.payloadType;
124+
String mediaEncoding = mediaDescription.rtpMapAttribute.mediaEncoding;
124125

125-
String mimeType = getMimeTypeFromRtpMediaType(mediaDescription.rtpMapAttribute.mediaEncoding);
126+
String mimeType = getMimeTypeFromRtpMediaType(mediaEncoding);
126127
formatBuilder.setSampleMimeType(mimeType);
127128

128129
int clockRate = mediaDescription.rtpMapAttribute.clockRate;
@@ -166,8 +167,13 @@ public int hashCode() {
166167
// width and height.
167168
formatBuilder.setWidth(DEFAULT_VP8_WIDTH).setHeight(DEFAULT_VP8_HEIGHT);
168169
break;
170+
case MimeTypes.AUDIO_RAW:
171+
formatBuilder.setPcmEncoding(RtpPayloadFormat.getRawPcmEncodingType(mediaEncoding));
172+
break;
169173
case MimeTypes.AUDIO_AC3:
170-
// AC3 does not require a fmtp attribute. Fall through.
174+
case MimeTypes.AUDIO_ALAW:
175+
case MimeTypes.AUDIO_MLAW:
176+
// Does not require a fmtp attribute. Fall through.
171177
default:
172178
// Do nothing.
173179
}

‎library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/DefaultRtpPayloadReaderFactory.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ public RtpPayloadReader createPayloadReader(RtpPayloadFormat payloadFormat) {
3737
case MimeTypes.AUDIO_AMR_NB:
3838
case MimeTypes.AUDIO_AMR_WB:
3939
return new RtpAmrReader(payloadFormat);
40+
case MimeTypes.AUDIO_RAW:
41+
case MimeTypes.AUDIO_ALAW:
42+
case MimeTypes.AUDIO_MLAW:
43+
return new RtpPcmReader(payloadFormat);
4044
case MimeTypes.VIDEO_H264:
4145
return new RtpH264Reader(payloadFormat);
4246
case MimeTypes.VIDEO_H265:

‎library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpPcmReader.java‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
/*
2+
* Copyright 2022 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.google.android.exoplayer2.source.rtsp.reader;
17+
18+
import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
19+
20+
import android.util.Log;
21+
import com.google.android.exoplayer2.C;
22+
import com.google.android.exoplayer2.extractor.ExtractorOutput;
23+
import com.google.android.exoplayer2.extractor.TrackOutput;
24+
import com.google.android.exoplayer2.source.rtsp.RtpPacket;
25+
import com.google.android.exoplayer2.source.rtsp.RtpPayloadFormat;
26+
import com.google.android.exoplayer2.util.ParsableByteArray;
27+
import com.google.android.exoplayer2.util.Util;
28+
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
29+
30+
/**
31+
* Parses byte stream carried on RTP packets, and extracts PCM frames. Refer to RFC3551 for more
32+
* details.
33+
*/
34+
/* package */ public final class RtpPcmReader implements RtpPayloadReader {
35+
36+
private static final String TAG = "RtpPcmReader";
37+
private final RtpPayloadFormat payloadFormat;
38+
39+
private @MonotonicNonNull TrackOutput trackOutput;
40+
private long firstReceivedTimestamp;
41+
private long startTimeOffsetUs;
42+
private int previousSequenceNumber;
43+
44+
public RtpPcmReader(RtpPayloadFormat payloadFormat) {
45+
this.payloadFormat = payloadFormat;
46+
firstReceivedTimestamp = C.TIME_UNSET;
47+
// Start time offset must be 0 before the first seek.
48+
startTimeOffsetUs = 0;
49+
previousSequenceNumber = C.INDEX_UNSET;
50+
}
51+
52+
@Override
53+
public void createTracks(ExtractorOutput extractorOutput, int trackId) {
54+
trackOutput = extractorOutput.track(trackId, C.TRACK_TYPE_AUDIO);
55+
trackOutput.format(payloadFormat.format);
56+
}
57+
58+
@Override
59+
public void onReceivingFirstPacket(long timestamp, int sequenceNumber) {
60+
firstReceivedTimestamp = timestamp;
61+
}
62+
63+
@Override
64+
public void consume(
65+
ParsableByteArray data, long timestamp, int sequenceNumber, boolean rtpMarker) {
66+
checkNotNull(trackOutput);
67+
if (previousSequenceNumber != C.INDEX_UNSET) {
68+
int expectedSequenceNumber = RtpPacket.getNextSequenceNumber(previousSequenceNumber);
69+
if (sequenceNumber != expectedSequenceNumber) {
70+
Log.w(
71+
TAG,
72+
Util.formatInvariant(
73+
"Received RTP packet with unexpected sequence number. Expected: %d; received: %d.",
74+
expectedSequenceNumber, sequenceNumber));
75+
}
76+
}
77+
78+
long sampleTimeUs =
79+
toSampleUs(startTimeOffsetUs, timestamp, firstReceivedTimestamp, payloadFormat.clockRate);
80+
int size = data.bytesLeft();
81+
trackOutput.sampleData(data, size);
82+
trackOutput.sampleMetadata(
83+
sampleTimeUs, C.BUFFER_FLAG_KEY_FRAME, size, /* offset= */ 0, /* cryptoData= */ null);
84+
85+
previousSequenceNumber = sequenceNumber;
86+
}
87+
88+
@Override
89+
public void seek(long nextRtpTimestamp, long timeUs) {
90+
// TODO(b/198620566) Rename firstReceivedTimestamp to timestampBase for all RtpPayloadReaders.
91+
firstReceivedTimestamp = nextRtpTimestamp;
92+
startTimeOffsetUs = timeUs;
93+
}
94+
95+
/** Returns the correct sample time from RTP timestamp, accounting for the given clock rate. */
96+
private static long toSampleUs(
97+
long startTimeOffsetUs, long rtpTimestamp, long firstReceivedRtpTimestamp, int clockRate) {
98+
return startTimeOffsetUs
99+
+ Util.scaleLargeTimestamp(
100+
rtpTimestamp - firstReceivedRtpTimestamp,
101+
/* multiplier= */ C.MICROS_PER_SECOND,
102+
/* divisor= */ clockRate);
103+
}
104+
}

‎library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/reader/RtpPcmReaderTest.java‎

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
/*
2+
* Copyright 2022 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.google.android.exoplayer2.source.rtsp.reader;
17+
18+
import static com.google.common.truth.Truth.assertThat;
19+
20+
import androidx.test.ext.junit.runners.AndroidJUnit4;
21+
import com.google.android.exoplayer2.C;
22+
import com.google.android.exoplayer2.Format;
23+
import com.google.android.exoplayer2.source.rtsp.RtpPacket;
24+
import com.google.android.exoplayer2.source.rtsp.RtpPayloadFormat;
25+
import com.google.android.exoplayer2.testutil.FakeExtractorOutput;
26+
import com.google.android.exoplayer2.testutil.FakeTrackOutput;
27+
import com.google.android.exoplayer2.testutil.TestUtil;
28+
import com.google.android.exoplayer2.util.MimeTypes;
29+
import com.google.android.exoplayer2.util.ParsableByteArray;
30+
import com.google.common.collect.ImmutableMap;
31+
import org.junit.Before;
32+
import org.junit.Test;
33+
import org.junit.runner.RunWith;
34+
35+
/** Unit test for {@link RtpPcmReader}. */
36+
@RunWith(AndroidJUnit4.class)
37+
public final class RtpPcmReaderTest {
38+
39+
// A typical RTP payload type for audio.
40+
private static final int RTP_PAYLOAD_TYPE = 97;
41+
private static final byte[] FRAME_1_PAYLOAD = TestUtil.buildTestData(/* length= */ 4);
42+
private static final byte[] FRAME_2_PAYLOAD = TestUtil.buildTestData(/* length= */ 4);
43+
44+
private static final RtpPacket PACKET_1 =
45+
createRtpPacket(/* timestamp= */ 2599168056L, /* sequenceNumber= */ 40289, FRAME_1_PAYLOAD);
46+
private static final RtpPacket PACKET_2 =
47+
createRtpPacket(/* timestamp= */ 2599169592L, /* sequenceNumber= */ 40290, FRAME_2_PAYLOAD);
48+
49+
private ParsableByteArray packetData;
50+
private FakeExtractorOutput extractorOutput;
51+
private RtpPcmReader pcmReader;
52+
53+
@Before
54+
public void setUp() {
55+
packetData = new ParsableByteArray();
56+
extractorOutput = new FakeExtractorOutput();
57+
}
58+
59+
@Test
60+
public void consume_twoDualChannelWav8bitPackets() {
61+
pcmReader =
62+
new RtpPcmReader(
63+
new RtpPayloadFormat(
64+
new Format.Builder()
65+
.setChannelCount(2)
66+
.setSampleMimeType(MimeTypes.AUDIO_WAV)
67+
.setPcmEncoding(C.ENCODING_PCM_8BIT)
68+
.setSampleRate(48_000)
69+
.build(),
70+
/* rtpPayloadType= */ RTP_PAYLOAD_TYPE,
71+
/* clockRate= */ 48_000,
72+
/* fmtpParameters= */ ImmutableMap.of()));
73+
74+
pcmReader.createTracks(extractorOutput, /* trackId= */ 0);
75+
pcmReader.onReceivingFirstPacket(PACKET_1.timestamp, PACKET_1.sequenceNumber);
76+
consume(PACKET_1);
77+
consume(PACKET_2);
78+
79+
FakeTrackOutput trackOutput = extractorOutput.trackOutputs.get(0);
80+
assertThat(trackOutput.getSampleCount()).isEqualTo(2);
81+
assertThat(trackOutput.getSampleData(0)).isEqualTo(FRAME_1_PAYLOAD);
82+
assertThat(trackOutput.getSampleTimeUs(0)).isEqualTo(0);
83+
assertThat(trackOutput.getSampleData(1)).isEqualTo(FRAME_2_PAYLOAD);
84+
assertThat(trackOutput.getSampleTimeUs(1)).isEqualTo(32000);
85+
}
86+
87+
@Test
88+
public void consume_twoSingleChannelWav16bitPackets() {
89+
pcmReader =
90+
new RtpPcmReader(
91+
new RtpPayloadFormat(
92+
new Format.Builder()
93+
.setChannelCount(1)
94+
.setSampleMimeType(MimeTypes.AUDIO_WAV)
95+
.setPcmEncoding(C.ENCODING_PCM_16BIT_BIG_ENDIAN)
96+
.setSampleRate(60_000)
97+
.build(),
98+
/* rtpPayloadType= */ RTP_PAYLOAD_TYPE,
99+
/* clockRate= */ 60_000,
100+
/* fmtpParameters= */ ImmutableMap.of()));
101+
102+
pcmReader.createTracks(extractorOutput, /* trackId= */ 0);
103+
pcmReader.onReceivingFirstPacket(PACKET_1.timestamp, PACKET_1.sequenceNumber);
104+
consume(PACKET_1);
105+
consume(PACKET_2);
106+
107+
FakeTrackOutput trackOutput = extractorOutput.trackOutputs.get(0);
108+
assertThat(trackOutput.getSampleCount()).isEqualTo(2);
109+
assertThat(trackOutput.getSampleData(0)).isEqualTo(FRAME_1_PAYLOAD);
110+
assertThat(trackOutput.getSampleTimeUs(0)).isEqualTo(0);
111+
assertThat(trackOutput.getSampleData(1)).isEqualTo(FRAME_2_PAYLOAD);
112+
assertThat(trackOutput.getSampleTimeUs(1)).isEqualTo(25600);
113+
}
114+
115+
@Test
116+
public void consume_twoDualChannelAlawPackets() {
117+
pcmReader =
118+
new RtpPcmReader(
119+
new RtpPayloadFormat(
120+
new Format.Builder()
121+
.setChannelCount(2)
122+
.setSampleMimeType(MimeTypes.AUDIO_ALAW)
123+
.setSampleRate(16_000)
124+
.build(),
125+
/* rtpPayloadType= */ RTP_PAYLOAD_TYPE,
126+
/* clockRate= */ 16_000,
127+
/* fmtpParameters= */ ImmutableMap.of()));
128+
129+
pcmReader.createTracks(extractorOutput, /* trackId= */ 0);
130+
pcmReader.onReceivingFirstPacket(PACKET_1.timestamp, PACKET_1.sequenceNumber);
131+
consume(PACKET_1);
132+
consume(PACKET_2);
133+
134+
FakeTrackOutput trackOutput = extractorOutput.trackOutputs.get(0);
135+
assertThat(trackOutput.getSampleCount()).isEqualTo(2);
136+
assertThat(trackOutput.getSampleData(0)).isEqualTo(FRAME_1_PAYLOAD);
137+
assertThat(trackOutput.getSampleTimeUs(0)).isEqualTo(0);
138+
assertThat(trackOutput.getSampleData(1)).isEqualTo(FRAME_2_PAYLOAD);
139+
assertThat(trackOutput.getSampleTimeUs(1)).isEqualTo(96000);
140+
}
141+
142+
@Test
143+
public void consume_twoDualChannelMlawPackets() {
144+
pcmReader =
145+
new RtpPcmReader(
146+
new RtpPayloadFormat(
147+
new Format.Builder()
148+
.setChannelCount(2)
149+
.setSampleMimeType(MimeTypes.AUDIO_MLAW)
150+
.setSampleRate(24_000)
151+
.build(),
152+
/* rtpPayloadType= */ RTP_PAYLOAD_TYPE,
153+
/* clockRate= */ 24_000,
154+
/* fmtpParameters= */ ImmutableMap.of()));
155+
156+
pcmReader.createTracks(extractorOutput, /* trackId= */ 0);
157+
pcmReader.onReceivingFirstPacket(PACKET_1.timestamp, PACKET_1.sequenceNumber);
158+
consume(PACKET_1);
159+
consume(PACKET_2);
160+
161+
FakeTrackOutput trackOutput = extractorOutput.trackOutputs.get(0);
162+
assertThat(trackOutput.getSampleCount()).isEqualTo(2);
163+
assertThat(trackOutput.getSampleData(0)).isEqualTo(FRAME_1_PAYLOAD);
164+
assertThat(trackOutput.getSampleTimeUs(0)).isEqualTo(0);
165+
assertThat(trackOutput.getSampleData(1)).isEqualTo(FRAME_2_PAYLOAD);
166+
assertThat(trackOutput.getSampleTimeUs(1)).isEqualTo(64000);
167+
}
168+
169+
private static RtpPacket createRtpPacket(long timestamp, int sequenceNumber, byte[] payloadData) {
170+
return new RtpPacket.Builder()
171+
.setTimestamp(timestamp)
172+
.setSequenceNumber(sequenceNumber)
173+
// RFC3551 Section 4.1.
174+
.setMarker(false)
175+
.setPayloadData(payloadData)
176+
.build();
177+
}
178+
179+
private void consume(RtpPacket frame) {
180+
packetData.reset(frame.payloadData);
181+
pcmReader.consume(packetData, frame.timestamp, frame.sequenceNumber, frame.marker);
182+
}
183+
}

0 commit comments

Comments
 (0)