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

Propagate Metadata from extracted Format to decoded Format.

Browse Source 
MediaCodec does not retain the `Metadata` of its input `Format`, so
add it to the output `Format`.

PiperOrigin-RevId: 542194322
This commit is contained in:
samrobinson 2023-06-21 09:43:05 +00:00 committed by Tofunmi Adigun-Hameed
parent 09fe0d7390
commit d2105204e1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
View File

@ -34,6 +34,7 @@ import androidx.annotation.RequiresApi;
import androidx.annotation.VisibleForTesting;
import androidx.media3.common.C;
import androidx.media3.common.Format;
import androidx.media3.common.Metadata;
import androidx.media3.common.MimeTypes;
import androidx.media3.common.util.Log;
import androidx.media3.common.util.MediaFormatUtil;
@ -344,7 +345,8 @@ public final class DefaultCodec implements Codec {
}
if (outputBufferIndex < 0) {
if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
outputFormat = convertToFormat(mediaCodec.getOutputFormat(), isDecoder);
outputFormat =
convertToFormat(mediaCodec.getOutputFormat(), isDecoder, configurationFormat.metadata);
}
return false;
}
@ -395,9 +397,10 @@ public final class DefaultCodec implements Codec {
return ExportException.createForCodec(cause, errorCode, isVideo, isDecoder, codecDetails);
}
private static Format convertToFormat(MediaFormat mediaFormat, boolean isDecoder) {
private static Format convertToFormat(
MediaFormat mediaFormat, boolean isDecoder, @Nullable Metadata metadata) {
Format.Builder formatBuilder =
MediaFormatUtil.createFormatFromMediaFormat(mediaFormat).buildUpon();
MediaFormatUtil.createFormatFromMediaFormat(mediaFormat).buildUpon().setMetadata(metadata);
if (isDecoder) {
// TODO(b/178685617): Restrict this to only set the PCM encoding for audio/raw once we have
// a way to simulate more realistic codec input/output formats in tests.