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

Encode emsg duration & ID as int64 instead of uint32

Browse Source 
The serialization scheme used here is custom, it doesn't need
to be compatible with emsg-v0 or emsg-v1 (since
97183ef558).

This means that C.TIME_UNSET will propagate correctly through the
serialization.

#minor-release

Issue: #9123
PiperOrigin-RevId: 382762873
This commit is contained in:
ibaker 2021-07-02 18:07:15 +01:00 committed by kim-vde
parent ef61d81d8d
commit 5e4056eb4c
5 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASENOTES.md
View File

@ -114,6 +114,9 @@
* Fix session description (SDP) parsing to use a HashMap-like behaviour
for duplicated attributes.
([#9014](https://github.com/google/ExoPlayer/issues/9014)).
* Metadata:
* Fix handling of emsg messages with an unset duration
([#9123](https://github.com/google/ExoPlayer/issues/9123)).
* OkHttp extension:
* Switch to OkHttp 4.9.1. This increases the extension's minimum SDK
version requirement from 16 to 21.

4
library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java
View File

@ -35,8 +35,8 @@ public final class EventMessageDecoder extends SimpleMetadataDecoder {
public EventMessage decode(ParsableByteArray emsgData) {
String schemeIdUri = Assertions.checkNotNull(emsgData.readNullTerminatedString());
String value = Assertions.checkNotNull(emsgData.readNullTerminatedString());
long durationMs = emsgData.readUnsignedInt();
long id = emsgData.readUnsignedInt();
long durationMs = emsgData.readLong();
long id = emsgData.readLong();
byte[] messageData =
Arrays.copyOfRange(emsgData.getData(), emsgData.getPosition(), emsgData.limit());
return new EventMessage(schemeIdUri, value, durationMs, id, messageData);

12
library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
View File

@ -45,8 +45,8 @@ public final class EventMessageEncoder {
writeNullTerminatedString(dataOutputStream, eventMessage.schemeIdUri);
String nonNullValue = eventMessage.value != null ? eventMessage.value : "";
writeNullTerminatedString(dataOutputStream, nonNullValue);
writeUnsignedInt(dataOutputStream, eventMessage.durationMs);
writeUnsignedInt(dataOutputStream, eventMessage.id);
dataOutputStream.writeLong(eventMessage.durationMs);
dataOutputStream.writeLong(eventMessage.id);
dataOutputStream.write(eventMessage.messageData);
dataOutputStream.flush();
return byteArrayOutputStream.toByteArray();
@ -61,12 +61,4 @@ public final class EventMessageEncoder {
dataOutputStream.writeBytes(value);
dataOutputStream.writeByte(0);
}
private static void writeUnsignedInt(DataOutputStream outputStream, long value)
throws IOException {
outputStream.writeByte((int) (value >>> 24) & 0xFF);
outputStream.writeByte((int) (value >>> 16) & 0xFF);
outputStream.writeByte((int) (value >>> 8) & 0xFF);
outputStream.writeByte((int) value & 0xFF);
}
}

4
library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
View File

@ -37,8 +37,8 @@ public final class EventMessageDecoderTest {
Bytes.concat(
createByteArray(117, 114, 110, 58, 116, 101, 115, 116, 0), // scheme_id_uri = "urn:test"
createByteArray(49, 50, 51, 0), // value = "123"
createByteArray(0, 0, 11, 184), // event_duration_ms = 3000
createByteArray(0, 15, 67, 211), // id = 1000403
createByteArray(0, 0, 0, 0, 0, 0, 11, 184), // event_duration_ms = 3000
createByteArray(0, 0, 0, 0, 0, 15, 67, 211), // id = 1000403
createByteArray(0, 1, 2, 3, 4)); // message_data = {0, 1, 2, 3, 4}
EventMessageDecoder decoder = new EventMessageDecoder();

22
library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
View File

@ -18,9 +18,11 @@ package com.google.android.exoplayer2.metadata.emsg;
import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.common.primitives.Bytes;
import java.io.IOException;
import java.nio.ByteBuffer;
@ -38,8 +40,8 @@ public final class EventMessageEncoderTest {
Bytes.concat(
createByteArray(117, 114, 110, 58, 116, 101, 115, 116, 0), // scheme_id_uri = "urn:test"
createByteArray(49, 50, 51, 0), // value = "123"
createByteArray(0, 0, 11, 184), // event_duration_ms = 3000
createByteArray(0, 15, 67, 211), // id = 1000403
createByteArray(0, 0, 0, 0, 0, 0, 11, 184), // event_duration_ms = 3000
createByteArray(0, 0, 0, 0, 0, 15, 67, 211), // id = 1000403
createByteArray(0, 1, 2, 3, 4)); // message_data = {0, 1, 2, 3, 4}
@Test
@ -67,8 +69,8 @@ public final class EventMessageEncoderTest {
Bytes.concat(
createByteArray(117, 114, 110, 58, 116, 101, 115, 116, 0), // scheme_id_uri = "urn:test"
createByteArray(49, 50, 51, 0), // value = "123"
createByteArray(0, 0, 11, 184), // event_duration_ms = 3000
createByteArray(0, 15, 67, 210), // id = 1000402
createByteArray(0, 0, 0, 0, 0, 0, 11, 184), // event_duration_ms = 3000
createByteArray(0, 0, 0, 0, 0, 15, 67, 210), // id = 1000402
createByteArray(4, 3, 2, 1, 0)); // message_data = {4, 3, 2, 1, 0}
EventMessageEncoder eventMessageEncoder = new EventMessageEncoder();
@ -78,6 +80,18 @@ public final class EventMessageEncoderTest {
assertThat(encodedByteArray1).isEqualTo(expectedEmsgBody1);
}
// https://github.com/google/ExoPlayer/issues/9123
@Test
public void encodeDecodeEventMessage_durationNotSet() {
EventMessage originalMessage =
new EventMessage("urn:test", "456", C.TIME_UNSET, 99, new byte[] {7, 8, 9});
byte[] encodedMessage = new EventMessageEncoder().encode(originalMessage);
EventMessage decodedMessage =
new EventMessageDecoder().decode(new ParsableByteArray(encodedMessage));
assertThat(decodedMessage).isEqualTo(originalMessage);
}
/** Converts an array of integers in the range [0, 255] into an equivalent byte array. */
// TODO(internal b/161804035): Move to a single file.
private static byte[] createByteArray(int... bytes) {