loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement audioNeedsEncoding based on requested settings

Browse Source 
Do not use ForceEncodeFactory in tests

PiperOrigin-RevId: 705835243
This commit is contained in:
dancho 2024-12-13 04:20:45 -08:00 committed by Copybara-Service
parent 07b658a6da
commit 72672b7f87
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java
View File

@ -2356,11 +2356,10 @@ public class TransformerEndToEndTest {
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setEncoderFactory( .setEncoderFactory(
new AndroidTestUtil.ForceEncodeEncoderFactory(
new DefaultEncoderFactory.Builder(context) new DefaultEncoderFactory.Builder(context)
.setRequestedAudioEncoderSettings( .setRequestedAudioEncoderSettings(
new AudioEncoderSettings.Builder().setProfile(AACObjectHE).build()) new AudioEncoderSettings.Builder().setProfile(AACObjectHE).build())
.build())) .build())
.build(); .build();
MediaItem mediaItem = new MediaItem.Builder().setUri(MP4_ASSET.uri).build(); MediaItem mediaItem = new MediaItem.Builder().setUri(MP4_ASSET.uri).build();
EditedMediaItem editedMediaItem = EditedMediaItem editedMediaItem =
@ -2392,11 +2391,10 @@ public class TransformerEndToEndTest {
new Transformer.Builder(context) new Transformer.Builder(context)
.setMuxerFactory(new InAppMuxer.Factory.Builder().build()) .setMuxerFactory(new InAppMuxer.Factory.Builder().build())
.setEncoderFactory( .setEncoderFactory(
new AndroidTestUtil.ForceEncodeEncoderFactory(
new DefaultEncoderFactory.Builder(context) new DefaultEncoderFactory.Builder(context)
.setRequestedAudioEncoderSettings( .setRequestedAudioEncoderSettings(
new AudioEncoderSettings.Builder().setBitrate(requestedBitrate).build()) new AudioEncoderSettings.Builder().setBitrate(requestedBitrate).build())
.build())) .build())
.build(); .build();
MediaItem mediaItem = new MediaItem.Builder().setUri(MP4_ASSET.uri).build(); MediaItem mediaItem = new MediaItem.Builder().setUri(MP4_ASSET.uri).build();
EditedMediaItem editedMediaItem = EditedMediaItem editedMediaItem =

5
libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java
View File

@ -391,6 +391,11 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory {
/* outputSurface= */ null); /* outputSurface= */ null);
} }
@Override
public boolean audioNeedsEncoding() {
return !requestedAudioEncoderSettings.equals(AudioEncoderSettings.DEFAULT);
}
@Override @Override
public boolean videoNeedsEncoding() { public boolean videoNeedsEncoding() {
return !requestedVideoEncoderSettings.equals(VideoEncoderSettings.DEFAULT); return !requestedVideoEncoderSettings.equals(VideoEncoderSettings.DEFAULT);