Skip to content

SDK / exoplayer

Go to a project
Commit 3fa31bb1 by sheenachhabra Committed by microkatz
Options

Use FakeExtractorOutput in Mp4MuxerMetadataTest 

The FakeExtractorOutput dumps data in more readable format
so using that where ever possible.

The MdtaMetadataEntry which contains key and value dumped only "key".
Added fix to dump "value" as well.

PiperOrigin-RevId: 517968996
parent 4a6ba35f
Inline Side-by-side
Showing with 123 additions and 151 deletions
library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntry.java
......@@ -82,7 +82,7 @@ public final class MdtaMetadataEntry implements Metadata.Entry {
@Override
public String toString() {
return "mdta: key=" + key;
return "mdta: key=" + key + ", value=" + Util.toHexString(value);
}
// Parcelable implementation.
......
library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/Mp4LocationData.java
......@@ -59,7 +59,7 @@ public final class Mp4LocationData implements Metadata.Entry {
@Override
public String toString() {
return "xyz: latitude=" + latitude + " longitude=" + longitude;
return "xyz: latitude=" + latitude + ", longitude=" + longitude;
}
// Parcelable implementation.
......
testdata/src/test/assets/extractordumps/mp4/sample.mp4.0.dump
......@@ -17,7 +17,7 @@ track 0:
width = 1080
height = 720
frameRate = 29.970028
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
......@@ -153,7 +153,7 @@ track 1:
channelCount = 1
sampleRate = 44100
language = und
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 2, hash 5F7
sample 0:
......
testdata/src/test/assets/extractordumps/mp4/sample.mp4.1.dump
......@@ -17,7 +17,7 @@ track 0:
width = 1080
height = 720
frameRate = 29.970028
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
......@@ -153,7 +153,7 @@ track 1:
channelCount = 1
sampleRate = 44100
language = und
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 2, hash 5F7
sample 0:
......
testdata/src/test/assets/extractordumps/mp4/sample.mp4.2.dump
......@@ -17,7 +17,7 @@ track 0:
width = 1080
height = 720
frameRate = 29.970028
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
......@@ -153,7 +153,7 @@ track 1:
channelCount = 1
sampleRate = 44100
language = und
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 2, hash 5F7
sample 0:
......
testdata/src/test/assets/extractordumps/mp4/sample.mp4.3.dump
......@@ -17,7 +17,7 @@ track 0:
width = 1080
height = 720
frameRate = 29.970028
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
......@@ -153,7 +153,7 @@ track 1:
channelCount = 1
sampleRate = 44100
language = und
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 2, hash 5F7
sample 0:
......
testdata/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump
......@@ -17,7 +17,7 @@ track 0:
width = 1080
height = 720
frameRate = 29.970028
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
......@@ -153,7 +153,7 @@ track 1:
channelCount = 1
sampleRate = 44100
language = und
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 2, hash 5F7
sample 0:
......
testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump
......@@ -17,7 +17,7 @@ track 0:
width = 1280
height = 720
frameRate = 13.307984
metadata = entries=[mdta: key=com.android.capture.fps]
metadata = entries=[mdta: key=com.android.capture.fps, value=43700000]
initializationData:
data = length 22, hash 4CF81805
data = length 9, hash FBAFBA1C
......
testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump
......@@ -17,7 +17,7 @@ track 0:
width = 1280
height = 720
frameRate = 13.307984
metadata = entries=[mdta: key=com.android.capture.fps]
metadata = entries=[mdta: key=com.android.capture.fps, value=43700000]
initializationData:
data = length 22, hash 4CF81805
data = length 9, hash FBAFBA1C
......
testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump
......@@ -17,7 +17,7 @@ track 0:
width = 1280
height = 720
frameRate = 13.307984
metadata = entries=[mdta: key=com.android.capture.fps]
metadata = entries=[mdta: key=com.android.capture.fps, value=43700000]
initializationData:
data = length 22, hash 4CF81805
data = length 9, hash FBAFBA1C
......
testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump
......@@ -17,7 +17,7 @@ track 0:
width = 1280
height = 720
frameRate = 13.307984
metadata = entries=[mdta: key=com.android.capture.fps]
metadata = entries=[mdta: key=com.android.capture.fps, value=43700000]
initializationData:
data = length 22, hash 4CF81805
data = length 9, hash FBAFBA1C
......
testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump
......@@ -17,7 +17,7 @@ track 0:
width = 1280
height = 720
frameRate = 13.307984
metadata = entries=[mdta: key=com.android.capture.fps]
metadata = entries=[mdta: key=com.android.capture.fps, value=43700000]
initializationData:
data = length 22, hash 4CF81805
data = length 9, hash FBAFBA1C
......
testdata/src/test/assets/muxerdumps/mp4_with_frame_rate.mp4.dump
ftyp (28 bytes):
Data = length 20, hash EF896440
mdat (71 bytes):
Data = length 55, hash 6B19F4A7
moov (774 bytes):
mvhd (108 bytes):
Data = length 100, hash A5ADE288
meta (124 bytes):
hdlr (33 bytes):
Data = length 25, hash C39D0F5B
keys (47 bytes):
Data = length 39, hash 1747DBD0
ilst (36 bytes):
Data = length 28, hash 2BFD1C61
trak (534 bytes):
tkhd (92 bytes):
Data = length 84, hash C25E979A
mdia (434 bytes):
mdhd (32 bytes):
Data = length 24, hash 50217AD
hdlr (44 bytes):
Data = length 36, hash A0852FF2
minf (350 bytes):
vmhd (20 bytes):
Data = length 12, hash EE830681
dinf (36 bytes):
Data = length 28, hash D535436B
stbl (286 bytes):
stsd (158 bytes):
Data = length 150, hash 2AD095C5
stts (24 bytes):
Data = length 16, hash E4FC6483
stsz (24 bytes):
Data = length 16, hash 50B7F5B9
stsc (28 bytes):
Data = length 20, hash 8F6E8285
co64 (24 bytes):
Data = length 16, hash E4EE4D2E
stss (20 bytes):
Data = length 12, hash EE911E03
seekMap:
isSeekable = true
duration = 0
getPosition(0) = [[timeUs=0, position=44]]
getPosition(1) = [[timeUs=0, position=44]]
getPosition(0) = [[timeUs=0, position=44]]
getPosition(0) = [[timeUs=0, position=44]]
numberOfTracks = 1
track 0:
total output bytes = 55
sample count = 1
format 0:
id = 1
sampleMimeType = video/avc
codecs = avc1.9B2BF3
maxInputSize = 85
width = 12
height = 10
metadata = entries=[mdta: key=com.android.capture.fps, value=42f00000]
initializationData:
data = length 24, hash 7F12E259
data = length 5, hash 1B4D906
sample 0:
time = 0
flags = 536870913
data = length 55, hash A481CEF4
tracksEnded = true
testdata/src/test/assets/muxerdumps/mp4_with_location.mp4.dump
ftyp (28 bytes):
Data = length 20, hash EF896440
mdat (71 bytes):
Data = length 55, hash 6B19F4A7
moov (688 bytes):
mvhd (108 bytes):
Data = length 100, hash A5ADE288
udta (38 bytes):
Data = length 30, hash 25372BB9
trak (534 bytes):
tkhd (92 bytes):
Data = length 84, hash C25E979A
mdia (434 bytes):
mdhd (32 bytes):
Data = length 24, hash 50217AD
hdlr (44 bytes):
Data = length 36, hash A0852FF2
minf (350 bytes):
vmhd (20 bytes):
Data = length 12, hash EE830681
dinf (36 bytes):
Data = length 28, hash D535436B
stbl (286 bytes):
stsd (158 bytes):
Data = length 150, hash 2AD095C5
stts (24 bytes):
Data = length 16, hash E4FC6483
stsz (24 bytes):
Data = length 16, hash 50B7F5B9
stsc (28 bytes):
Data = length 20, hash 8F6E8285
co64 (24 bytes):
Data = length 16, hash E4EE4D2E
stss (20 bytes):
Data = length 12, hash EE911E03
seekMap:
isSeekable = true
duration = 0
getPosition(0) = [[timeUs=0, position=44]]
getPosition(1) = [[timeUs=0, position=44]]
getPosition(0) = [[timeUs=0, position=44]]
getPosition(0) = [[timeUs=0, position=44]]
numberOfTracks = 1
track 0:
total output bytes = 55
sample count = 1
format 0:
id = 1
sampleMimeType = video/avc
codecs = avc1.9B2BF3
maxInputSize = 85
width = 12
height = 10
metadata = entries=[xyz: latitude=33.0, longitude=-120.0]
initializationData:
data = length 24, hash 7F12E259
data = length 5, hash 1B4D906
sample 0:
time = 0
flags = 536870913
data = length 55, hash A481CEF4
tracksEnded = true
testdata/src/test/assets/muxerdumps/mp4_with_null_location.mp4.dump
ftyp (28 bytes):
Data = length 20, hash EF896440
mdat (71 bytes):
Data = length 55, hash 6B19F4A7
moov (650 bytes):
mvhd (108 bytes):
Data = length 100, hash A5ADE288
trak (534 bytes):
tkhd (92 bytes):
Data = length 84, hash C25E979A
mdia (434 bytes):
mdhd (32 bytes):
Data = length 24, hash 50217AD
hdlr (44 bytes):
Data = length 36, hash A0852FF2
minf (350 bytes):
vmhd (20 bytes):
Data = length 12, hash EE830681
dinf (36 bytes):
Data = length 28, hash D535436B
stbl (286 bytes):
stsd (158 bytes):
Data = length 150, hash 2AD095C5
stts (24 bytes):
Data = length 16, hash E4FC6483
stsz (24 bytes):
Data = length 16, hash 50B7F5B9
stsc (28 bytes):
Data = length 20, hash 8F6E8285
co64 (24 bytes):
Data = length 16, hash E4EE4D2E
stss (20 bytes):
Data = length 12, hash EE911E03
seekMap:
isSeekable = true
duration = 0
getPosition(0) = [[timeUs=0, position=44]]
getPosition(1) = [[timeUs=0, position=44]]
getPosition(0) = [[timeUs=0, position=44]]
getPosition(0) = [[timeUs=0, position=44]]
numberOfTracks = 1
track 0:
total output bytes = 55
sample count = 1
format 0:
id = 1
sampleMimeType = video/avc
codecs = avc1.9B2BF3
maxInputSize = 85
width = 12
height = 10
initializationData:
data = length 24, hash 7F12E259
data = length 5, hash 1B4D906
sample 0:
time = 0
flags = 536870913
data = length 55, hash A481CEF4
tracksEnded = true
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump
......@@ -6,18 +6,18 @@ format 0:
width = 1080
height = 720
frameRate = 29.970028
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
format 1:
sampleMimeType = audio/mp4a-latm
channelCount = 1
sampleRate = 48000
pcmEncoding = 2
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
sample:
trackIndex = 1
dataHashCode = 1868041800
......
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.concatenated.dump
......@@ -6,11 +6,11 @@ format 0:
width = 1080
height = 720
frameRate = 29.970028
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
format 1:
peakBitrate = 200000
id = 2
......@@ -20,10 +20,10 @@ format 1:
channelCount = 1
sampleRate = 44100
language = und
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 2, hash 5F7
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
sample:
trackIndex = 1
dataHashCode = 1205768497
......
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.concatenated_with_high_pitch_and_no_video.dump
......@@ -3,8 +3,8 @@ format 0:
channelCount = 1
sampleRate = 44100
pcmEncoding = 2
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
sample:
trackIndex = 0
dataHashCode = 915609509
......
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.dump
......@@ -6,11 +6,11 @@ format 0:
width = 1080
height = 720
frameRate = 29.970028
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
format 1:
peakBitrate = 200000
id = 2
......@@ -20,10 +20,10 @@ format 1:
channelCount = 1
sampleRate = 44100
language = und
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 2, hash 5F7
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
sample:
trackIndex = 1
dataHashCode = 1205768497
......
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.noaudio.dump
......@@ -6,11 +6,11 @@ format 0:
width = 1080
height = 720
frameRate = 29.970028
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
sample:
trackIndex = 0
dataHashCode = -770308242
......
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.novideo.dump
......@@ -7,10 +7,10 @@ format 0:
channelCount = 1
sampleRate = 44100
language = und
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 2, hash 5F7
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5]
sample:
trackIndex = 0
dataHashCode = 1205768497
......
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.silence_then_audio.dump
......@@ -6,11 +6,11 @@ format 0:
width = 1080
height = 720
frameRate = 29.970028
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
format 1:
sampleMimeType = audio/mp4a-latm
channelCount = 2
......
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.silence_then_audio_with_effects.dump
......@@ -6,11 +6,11 @@ format 0:
width = 1080
height = 720
frameRate = 29.970028
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
format 1:
sampleMimeType = audio/mp4a-latm
channelCount = 2
......
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.silentaudio.dump
......@@ -6,11 +6,11 @@ format 0:
width = 1080
height = 720
frameRate = 29.970028
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68 longitude=-74.5]
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
format 1:
sampleMimeType = audio/mp4a-latm
channelCount = 2
......
testdata/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4.dump
......@@ -6,11 +6,11 @@ format 0:
width = 320
height = 240
frameRate = 29.523811
metadata = entries=[mdta: key=com.android.capture.fps, smta: captureFrameRate=240.0, svcTemporalLayerCount=4, SlowMotion: segments=[Segment: startTimeMs=88, endTimeMs=879, speedDivisor=2, Segment: startTimeMs=1255, endTimeMs=1970, speedDivisor=8]]
metadata = entries=[mdta: key=com.android.capture.fps, value=43700000, smta: captureFrameRate=240.0, svcTemporalLayerCount=4, SlowMotion: segments=[Segment: startTimeMs=88, endTimeMs=879, speedDivisor=2, Segment: startTimeMs=1255, endTimeMs=1970, speedDivisor=8]]
initializationData:
data = length 33, hash D3FB879D
data = length 10, hash 7A0D0F2B
metadata = entries=[mdta: key=com.android.capture.fps, smta: captureFrameRate=240.0, svcTemporalLayerCount=4, SlowMotion: segments=[Segment: startTimeMs=88, endTimeMs=879, speedDivisor=2, Segment: startTimeMs=1255, endTimeMs=1970, speedDivisor=8]]
metadata = entries=[mdta: key=com.android.capture.fps, value=43700000, smta: captureFrameRate=240.0, svcTemporalLayerCount=4, SlowMotion: segments=[Segment: startTimeMs=88, endTimeMs=879, speedDivisor=2, Segment: startTimeMs=1255, endTimeMs=1970, speedDivisor=8]]
format 1:
sampleMimeType = audio/mp4a-latm
channelCount = 2
......
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