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

Assert that Formats passed to ASP represent valid decoded audio.

Browse Source 
Ensure SequenceAssetLoader knows downstream is decoding audio if
silence is generated.

PiperOrigin-RevId: 542293633
This commit is contained in:
samrobinson 2023-06-21 17:20:00 +00:00 committed by Tofunmi Adigun-Hameed
parent 7a819bc275
commit 64f93a895e
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java
View File

@ -26,6 +26,7 @@ import static java.lang.Math.min;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.Format; import androidx.media3.common.Format;
import androidx.media3.common.MimeTypes;
import androidx.media3.common.audio.AudioProcessingPipeline; import androidx.media3.common.audio.AudioProcessingPipeline;
import androidx.media3.common.audio.AudioProcessor; import androidx.media3.common.audio.AudioProcessor;
import androidx.media3.common.audio.AudioProcessor.AudioFormat; import androidx.media3.common.audio.AudioProcessor.AudioFormat;
@ -151,7 +152,10 @@ import org.checkerframework.dataflow.qual.Pure;
if (isLast) { if (isLast) {
queueEndOfStreamAfterSilence = true; queueEndOfStreamAfterSilence = true;
} }
return;
} }
checkState(MimeTypes.isAudio(trackFormat.sampleMimeType));
checkState(trackFormat.pcmEncoding != Format.NO_VALUE);
} }
@Override @Override

1
libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java
View File

@ -231,6 +231,7 @@ import java.util.concurrent.atomic.AtomicInteger;
if (addForcedAudioTrack) { if (addForcedAudioTrack) {
sequenceAssetLoaderListener.onTrackAdded( sequenceAssetLoaderListener.onTrackAdded(
FORCE_AUDIO_TRACK_FORMAT, SUPPORTED_OUTPUT_TYPE_DECODED); FORCE_AUDIO_TRACK_FORMAT, SUPPORTED_OUTPUT_TYPE_DECODED);
decodeAudio = true;
} }
return decodeOutput; return decodeOutput;