Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
e79b764e
authored
Mar 23, 2023
by
sheenachhabra
Committed by
Tianyi Feng
Mar 30, 2023
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Make getMp4LocationData method inline
PiperOrigin-RevId: 518827223
parent
bbd45c8e
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
22 additions
and
31 deletions
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameworkMuxer.java
library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TestMuxer.java
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.concatenated.dump
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.concatenated_with_high_pitch_and_no_video.dump
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.dump
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.noaudio.dump
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.novideo.dump
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.silence_then_audio.dump
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.silence_then_audio_with_effects.dump
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.silentaudio.dump
testdata/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4.dump
testdata/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4.clipped.dump
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameworkMuxer.java
View file @
e79b764e
...
...
@@ -25,7 +25,6 @@ import android.media.MediaCodec;
import
android.media.MediaFormat
;
import
android.media.MediaMuxer
;
import
android.util.SparseLongArray
;
import
androidx.annotation.Nullable
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.Format
;
import
com.google.android.exoplayer2.metadata.Metadata
;
...
...
@@ -190,9 +189,12 @@ import java.nio.ByteBuffer;
@Override
public
void
addMetadata
(
Metadata
metadata
)
{
@Nullable
Mp4LocationData
mp4LocationData
=
getMp4LocationData
(
metadata
);
if
(
mp4LocationData
!=
null
)
{
mediaMuxer
.
setLocation
(
mp4LocationData
.
latitude
,
mp4LocationData
.
longitude
);
for
(
int
i
=
0
;
i
<
metadata
.
length
();
i
++)
{
Metadata
.
Entry
entry
=
metadata
.
get
(
i
);
if
(
entry
instanceof
Mp4LocationData
)
{
mediaMuxer
.
setLocation
(
((
Mp4LocationData
)
entry
).
latitude
,
((
Mp4LocationData
)
entry
).
longitude
);
}
}
}
...
...
@@ -267,15 +269,4 @@ import java.nio.ByteBuffer;
throw
e
;
}
}
@Nullable
private
static
Mp4LocationData
getMp4LocationData
(
Metadata
metadata
)
{
for
(
int
i
=
0
;
i
<
metadata
.
length
();
i
++)
{
Metadata
.
Entry
entry
=
metadata
.
get
(
i
);
if
(
entry
instanceof
Mp4LocationData
)
{
return
(
Mp4LocationData
)
entry
;
}
}
return
null
;
}
}
library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TestMuxer.java
View file @
e79b764e
...
...
@@ -65,7 +65,7 @@ public final class TestMuxer implements Muxer, Dumper.Dumpable {
@Override
public
void
addMetadata
(
Metadata
metadata
)
{
dumpables
.
add
(
dumper
->
dumper
.
add
(
"metadata"
,
metadata
));
dumpables
.
add
(
dumper
->
dumper
.
add
(
"
container
metadata"
,
metadata
));
muxer
.
addMetadata
(
metadata
);
}
...
...
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump
View file @
e79b764e
...
...
@@ -10,14 +10,14 @@ format 0:
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
container
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]
container
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
View file @
e79b764e
...
...
@@ -10,7 +10,7 @@ format 0:
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
container
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
format 1:
peakBitrate = 200000
id = 2
...
...
@@ -23,7 +23,7 @@ format 1:
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]
container
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
View file @
e79b764e
...
...
@@ -4,7 +4,7 @@ format 0:
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]
container
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
View file @
e79b764e
...
...
@@ -10,7 +10,7 @@ format 0:
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
container
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
format 1:
peakBitrate = 200000
id = 2
...
...
@@ -23,7 +23,7 @@ format 1:
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]
container
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
View file @
e79b764e
...
...
@@ -10,7 +10,7 @@ format 0:
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
container
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
sample:
trackIndex = 0
dataHashCode = -770308242
...
...
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.novideo.dump
View file @
e79b764e
...
...
@@ -10,7 +10,7 @@ format 0:
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]
container
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
View file @
e79b764e
...
...
@@ -10,7 +10,7 @@ format 0:
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
container
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
View file @
e79b764e
...
...
@@ -10,7 +10,7 @@ format 0:
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
container
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
View file @
e79b764e
...
...
@@ -10,7 +10,7 @@ format 0:
initializationData:
data = length 29, hash 4746B5D9
data = length 10, hash 7A0D0F2B
metadata = entries=[xyz: latitude=40.68, longitude=-74.5]
container
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
View file @
e79b764e
...
...
@@ -10,14 +10,14 @@ format 0:
initializationData:
data = length 33, hash D3FB879D
data = length 10, hash 7A0D0F2B
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]]
container
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
sampleRate = 12000
pcmEncoding = 2
metadata = entries=[smta: captureFrameRate=240.0, svcTemporalLayerCount=4, SlowMotion: segments=[Segment: startTimeMs=88, endTimeMs=879, speedDivisor=2, Segment: startTimeMs=1255, endTimeMs=1970, speedDivisor=8]]
metadata = entries=[smta: captureFrameRate=240.0, svcTemporalLayerCount=4, SlowMotion: segments=[Segment: startTimeMs=88, endTimeMs=879, speedDivisor=2, Segment: startTimeMs=1255, endTimeMs=1970, speedDivisor=8]]
container
metadata = entries=[smta: captureFrameRate=240.0, svcTemporalLayerCount=4, SlowMotion: segments=[Segment: startTimeMs=88, endTimeMs=879, speedDivisor=2, Segment: startTimeMs=1255, endTimeMs=1970, speedDivisor=8]]
sample:
trackIndex = 1
dataHashCode = -212376212
...
...
testdata/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4.clipped.dump
View file @
e79b764e
...
...
@@ -27,7 +27,7 @@ format 1:
metadata = entries=[TSSE: description=null: values=[Lavf58.76.100]]
initializationData:
data = length 2, hash 560
metadata = entries=[TSSE: description=null: values=[Lavf58.76.100]]
container
metadata = entries=[TSSE: description=null: values=[Lavf58.76.100]]
sample:
trackIndex = 1
dataHashCode = 620415738
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment