sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use default asset loader factory for remuxing video step

Browse source 
PiperOrigin-RevId: 608308406
This commit is contained in:
sheenachhabra 2024-02-19 05:18:07 -08:00 committed by Copybara-Service
parent 5a3f18f837
commit 2cd0cb30cd
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
View file

@ -1006,7 +1006,8 @@ public final class Transformer {
MuxerWrapper.MUXER_MODE_DEFAULT, MuxerWrapper.MUXER_MODE_DEFAULT,
/* dropSamplesBeforeFirstVideoSample= */ fileStartsOnVideoFrameEnabled), /* dropSamplesBeforeFirstVideoSample= */ fileStartsOnVideoFrameEnabled),
componentListener, componentListener,
/* initialTimestampOffsetUs= */ 0); /* initialTimestampOffsetUs= */ 0,
/* useDefaultAssetLoaderFactory= */ false);
} else { } else {
processMediaBeforeFirstSyncSampleAfterTrimStartTime(); processMediaBeforeFirstSyncSampleAfterTrimStartTime();
} }
@ -1249,7 +1250,8 @@ public final class Transformer {
MuxerWrapper.MUXER_MODE_DEFAULT, MuxerWrapper.MUXER_MODE_DEFAULT,
/* dropSamplesBeforeFirstVideoSample= */ false), /* dropSamplesBeforeFirstVideoSample= */ false),
componentListener, componentListener,
/* initialTimestampOffsetUs= */ 0); /* initialTimestampOffsetUs= */ 0,
/* useDefaultAssetLoaderFactory= */ false);
} }
private void remuxProcessedVideo() { private void remuxProcessedVideo() {
@ -1286,7 +1288,8 @@ public final class Transformer {
/* clippingEndPositionUs= */ resumeMetadata.lastSyncSampleTimestampUs), /* clippingEndPositionUs= */ resumeMetadata.lastSyncSampleTimestampUs),
checkNotNull(remuxingMuxerWrapper), checkNotNull(remuxingMuxerWrapper),
componentListener, componentListener,
/* initialTimestampOffsetUs= */ 0); /* initialTimestampOffsetUs= */ 0,
/* useDefaultAssetLoaderFactory= */ true);
} }
@Override @Override
@ -1314,7 +1317,8 @@ public final class Transformer {
videoOnlyComposition, videoOnlyComposition,
remuxingMuxerWrapper, remuxingMuxerWrapper,
componentListener, componentListener,
/* initialTimestampOffsetUs= */ checkNotNull(resumeMetadata).lastSyncSampleTimestampUs); /* initialTimestampOffsetUs= */ checkNotNull(resumeMetadata).lastSyncSampleTimestampUs,
/* useDefaultAssetLoaderFactory= */ false);
} }
private void processAudio() { private void processAudio() {
@ -1330,7 +1334,8 @@ public final class Transformer {
MuxerWrapper.MUXER_MODE_DEFAULT, MuxerWrapper.MUXER_MODE_DEFAULT,
/* dropSamplesBeforeFirstVideoSample= */ false), /* dropSamplesBeforeFirstVideoSample= */ false),
componentListener, componentListener,
/* initialTimestampOffsetUs= */ 0); /* initialTimestampOffsetUs= */ 0,
/* useDefaultAssetLoaderFactory= */ false);
} }
// TODO: b/308253384 - Move copy output logic into MuxerWrapper. // TODO: b/308253384 - Move copy output logic into MuxerWrapper.
@ -1455,7 +1460,8 @@ public final class Transformer {
trancodeComposition, trancodeComposition,
checkNotNull(remuxingMuxerWrapper), checkNotNull(remuxingMuxerWrapper),
componentListener, componentListener,
/* initialTimestampOffsetUs= */ 0); /* initialTimestampOffsetUs= */ 0,
/* useDefaultAssetLoaderFactory= */ false);
} }
@Override @Override
@ -1497,7 +1503,8 @@ public final class Transformer {
remuxingMuxerWrapper, remuxingMuxerWrapper,
componentListener, componentListener,
/* initialTimestampOffsetUs= */ mediaItemInfo.firstSyncSampleTimestampUsAfterTimeUs /* initialTimestampOffsetUs= */ mediaItemInfo.firstSyncSampleTimestampUsAfterTimeUs
- trimStartTimeUs); - trimStartTimeUs,
/* useDefaultAssetLoaderFactory= */ false);
} }
private boolean doesFormatsMatch(Mp4Info mediaItemInfo, EditedMediaItem firstMediaItem) { private boolean doesFormatsMatch(Mp4Info mediaItemInfo, EditedMediaItem firstMediaItem) {
@ -1528,7 +1535,8 @@ public final class Transformer {
Composition composition, Composition composition,
MuxerWrapper muxerWrapper, MuxerWrapper muxerWrapper,
ComponentListener componentListener, ComponentListener componentListener,
long initialTimestampOffsetUs) { long initialTimestampOffsetUs,
boolean useDefaultAssetLoaderFactory) {
checkArgument(composition.effects.audioProcessors.isEmpty()); checkArgument(composition.effects.audioProcessors.isEmpty());
checkState(transformerInternal == null, "There is already an export in progress."); checkState(transformerInternal == null, "There is already an export in progress.");
TransformationRequest transformationRequest = this.transformationRequest; TransformationRequest transformationRequest = this.transformationRequest;
@ -1539,7 +1547,7 @@ public final class Transformer {
FallbackListener fallbackListener = FallbackListener fallbackListener =
new FallbackListener(composition, listeners, applicationHandler, transformationRequest); new FallbackListener(composition, listeners, applicationHandler, transformationRequest);
AssetLoader.Factory assetLoaderFactory = this.assetLoaderFactory; AssetLoader.Factory assetLoaderFactory = this.assetLoaderFactory;
if (assetLoaderFactory == null) { if (useDefaultAssetLoaderFactory || assetLoaderFactory == null) {
assetLoaderFactory = assetLoaderFactory =
new DefaultAssetLoaderFactory( new DefaultAssetLoaderFactory(
context, new DefaultDecoderFactory(context), transformationRequest.hdrMode, clock); context, new DefaultDecoderFactory(context), transformationRequest.hdrMode, clock);