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
2d22604e
authored
Mar 07, 2023
by
samrobinson
Committed by
Rohit Singh
Mar 07, 2023
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Pass Metadata to Muxer when adding a track.
PiperOrigin-RevId: 514575400
parent
e12de4cc
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
1 deletions
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioSamplePipeline.java
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SamplePipeline.java
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.concatenated_with_high_pitch_and_no_video.dump
testdata/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4.dump
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioSamplePipeline.java
View file @
2d22604e
...
@@ -70,7 +70,7 @@ import org.checkerframework.dataflow.qual.Pure;
...
@@ -70,7 +70,7 @@ import org.checkerframework.dataflow.qual.Pure;
MuxerWrapper
muxerWrapper
,
MuxerWrapper
muxerWrapper
,
FallbackListener
fallbackListener
)
FallbackListener
fallbackListener
)
throws
ExportException
{
throws
ExportException
{
super
(
first
Pipeline
InputFormat
,
/* streamStartPositionUs= */
streamOffsetUs
,
muxerWrapper
);
super
(
first
AssetLoader
InputFormat
,
/* streamStartPositionUs= */
streamOffsetUs
,
muxerWrapper
);
silentAudioGenerator
=
new
SilentAudioGenerator
(
firstPipelineInputFormat
);
silentAudioGenerator
=
new
SilentAudioGenerator
(
firstPipelineInputFormat
);
availableInputBuffers
=
new
ConcurrentLinkedDeque
<>();
availableInputBuffers
=
new
ConcurrentLinkedDeque
<>();
...
...
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SamplePipeline.java
View file @
2d22604e
...
@@ -27,6 +27,7 @@ import androidx.annotation.Nullable;
...
@@ -27,6 +27,7 @@ import androidx.annotation.Nullable;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.Format
;
import
com.google.android.exoplayer2.Format
;
import
com.google.android.exoplayer2.decoder.DecoderInputBuffer
;
import
com.google.android.exoplayer2.decoder.DecoderInputBuffer
;
import
com.google.android.exoplayer2.metadata.Metadata
;
import
com.google.android.exoplayer2.util.MimeTypes
;
import
com.google.android.exoplayer2.util.MimeTypes
;
import
com.google.android.exoplayer2.video.ColorInfo
;
import
com.google.android.exoplayer2.video.ColorInfo
;
import
com.google.common.collect.ImmutableList
;
import
com.google.common.collect.ImmutableList
;
...
@@ -49,6 +50,7 @@ import java.util.List;
...
@@ -49,6 +50,7 @@ import java.util.List;
private
final
long
streamStartPositionUs
;
private
final
long
streamStartPositionUs
;
private
final
MuxerWrapper
muxerWrapper
;
private
final
MuxerWrapper
muxerWrapper
;
private
final
@C
.
TrackType
int
outputTrackType
;
private
final
@C
.
TrackType
int
outputTrackType
;
@Nullable
private
final
Metadata
metadata
;
private
boolean
muxerWrapperTrackAdded
;
private
boolean
muxerWrapperTrackAdded
;
...
@@ -56,6 +58,7 @@ import java.util.List;
...
@@ -56,6 +58,7 @@ import java.util.List;
Format
firstInputFormat
,
long
streamStartPositionUs
,
MuxerWrapper
muxerWrapper
)
{
Format
firstInputFormat
,
long
streamStartPositionUs
,
MuxerWrapper
muxerWrapper
)
{
this
.
streamStartPositionUs
=
streamStartPositionUs
;
this
.
streamStartPositionUs
=
streamStartPositionUs
;
this
.
muxerWrapper
=
muxerWrapper
;
this
.
muxerWrapper
=
muxerWrapper
;
this
.
metadata
=
firstInputFormat
.
metadata
;
outputTrackType
=
getProcessedTrackType
(
firstInputFormat
.
sampleMimeType
);
outputTrackType
=
getProcessedTrackType
(
firstInputFormat
.
sampleMimeType
);
}
}
...
@@ -94,6 +97,9 @@ import java.util.List;
...
@@ -94,6 +97,9 @@ import java.util.List;
if
(
inputFormat
==
null
)
{
if
(
inputFormat
==
null
)
{
return
false
;
return
false
;
}
}
if
(
metadata
!=
null
)
{
inputFormat
=
inputFormat
.
buildUpon
().
setMetadata
(
metadata
).
build
();
}
try
{
try
{
muxerWrapper
.
addTrackFormat
(
inputFormat
);
muxerWrapper
.
addTrackFormat
(
inputFormat
);
}
catch
(
Muxer
.
MuxerException
e
)
{
}
catch
(
Muxer
.
MuxerException
e
)
{
...
...
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump
View file @
2d22604e
...
@@ -14,6 +14,7 @@ format 1:
...
@@ -14,6 +14,7 @@ format 1:
channelCount = 1
channelCount = 1
sampleRate = 48000
sampleRate = 48000
pcmEncoding = 2
pcmEncoding = 2
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0]]
sample:
sample:
trackIndex = 1
trackIndex = 1
dataHashCode = 1868041800
dataHashCode = 1868041800
...
...
testdata/src/test/assets/transformerdumps/mp4/sample.mp4.concatenated_with_high_pitch_and_no_video.dump
View file @
2d22604e
...
@@ -3,6 +3,7 @@ format 0:
...
@@ -3,6 +3,7 @@ format 0:
channelCount = 1
channelCount = 1
sampleRate = 44100
sampleRate = 44100
pcmEncoding = 2
pcmEncoding = 2
metadata = entries=[TSSE: description=null: values=[Lavf56.1.0]]
sample:
sample:
trackIndex = 0
trackIndex = 0
dataHashCode = 915609509
dataHashCode = 915609509
...
...
testdata/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4.dump
View file @
2d22604e
...
@@ -15,6 +15,7 @@ format 1:
...
@@ -15,6 +15,7 @@ format 1:
channelCount = 2
channelCount = 2
sampleRate = 12000
sampleRate = 12000
pcmEncoding = 2
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]]
sample:
sample:
trackIndex = 1
trackIndex = 1
dataHashCode = -212376212
dataHashCode = -212376212
...
...
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