loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-12 10:09:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply video scaling mode correctly.

Browse Source 
Issue: #1428
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=119952373
This commit is contained in:
olly 2016-04-15 07:08:30 -07:00 committed by Oliver Woodman
parent c99250d9c5
commit ed188d1bc8
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
View File

@ -254,7 +254,7 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer implem
} }
@Override @Override
protected void onOutputFormatChanged(MediaFormat outputFormat) { protected void onOutputFormatChanged(MediaCodec codec, MediaFormat outputFormat) {
boolean passthrough = passthroughMediaFormat != null; boolean passthrough = passthroughMediaFormat != null;
audioTrack.configure(passthrough ? passthroughMediaFormat : outputFormat, passthrough); audioTrack.configure(passthrough ? passthroughMediaFormat : outputFormat, passthrough);
} }

7
library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
View File

@ -28,7 +28,6 @@ import android.media.MediaCodec;
import android.media.MediaCodec.CodecException; import android.media.MediaCodec.CodecException;
import android.media.MediaCodec.CryptoException; import android.media.MediaCodec.CryptoException;
import android.media.MediaCrypto; import android.media.MediaCrypto;
import android.media.MediaFormat;
import android.os.Handler; import android.os.Handler;
import android.os.SystemClock; import android.os.SystemClock;
@ -705,10 +704,10 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
* <p> * <p>
* The default implementation is a no-op. * The default implementation is a no-op.
* *
* @param codec The {@link MediaCodec} instance.
* @param outputFormat The new output format. * @param outputFormat The new output format.
* @throws ExoPlaybackException If an error occurs on output format change.
*/ */
protected void onOutputFormatChanged(MediaFormat outputFormat) throws ExoPlaybackException { protected void onOutputFormatChanged(MediaCodec codec, android.media.MediaFormat outputFormat) {
// Do nothing. // Do nothing.
} }
@ -849,7 +848,7 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
if (codecNeedsMonoChannelCountWorkaround) { if (codecNeedsMonoChannelCountWorkaround) {
format.setInteger(android.media.MediaFormat.KEY_CHANNEL_COUNT, 1); format.setInteger(android.media.MediaFormat.KEY_CHANNEL_COUNT, 1);
} }
onOutputFormatChanged(format); onOutputFormatChanged(codec, format);
codecCounters.outputFormatChangedCount++; codecCounters.outputFormatChangedCount++;
} }

4
library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
View File

@ -391,7 +391,7 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer {
} }
@Override @Override
protected void onOutputFormatChanged(MediaFormat outputFormat) { protected void onOutputFormatChanged(MediaCodec codec, android.media.MediaFormat outputFormat) {
boolean hasCrop = outputFormat.containsKey(KEY_CROP_RIGHT) boolean hasCrop = outputFormat.containsKey(KEY_CROP_RIGHT)
&& outputFormat.containsKey(KEY_CROP_LEFT) && outputFormat.containsKey(KEY_CROP_BOTTOM) && outputFormat.containsKey(KEY_CROP_LEFT) && outputFormat.containsKey(KEY_CROP_BOTTOM)
&& outputFormat.containsKey(KEY_CROP_TOP); && outputFormat.containsKey(KEY_CROP_TOP);
@ -416,6 +416,8 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer {
// On API level 20 and below the decoder does not apply the rotation. // On API level 20 and below the decoder does not apply the rotation.
currentUnappliedRotationDegrees = pendingRotationDegrees; currentUnappliedRotationDegrees = pendingRotationDegrees;
} }
// Must be applied each time the output format changes.
codec.setVideoScalingMode(videoScalingMode);
} }
@Override @Override