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

Fix error in frame rate handling.

Browse Source 
The old getString() will throw because FRAME_RATE can only be float or int.

PiperOrigin-RevId: 458481251
(cherry picked from commit deea5c927a61da5a84c534b485ad8a249d10cbd6)
This commit is contained in:
claincly 2022-07-01 16:05:39 +00:00 committed by microkatz
parent e0752a3a7a
commit 379ecd198f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java
View File

@ -239,9 +239,14 @@ public final class EncoderUtil {
MediaCodecList mediaCodecList = new MediaCodecList(MediaCodecList.REGULAR_CODECS); MediaCodecList mediaCodecList = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
// Format must not include KEY_FRAME_RATE on API21. // Format must not include KEY_FRAME_RATE on API21.
// https://developer.android.com/reference/android/media/MediaCodecList#findDecoderForFormat(android.media.MediaFormat) // https://developer.android.com/reference/android/media/MediaCodecList#findDecoderForFormat(android.media.MediaFormat)
@Nullable String frameRate = null; float frameRate = Format.NO_VALUE;
if (Util.SDK_INT == 21 && format.containsKey(MediaFormat.KEY_FRAME_RATE)) { if (Util.SDK_INT == 21 && format.containsKey(MediaFormat.KEY_FRAME_RATE)) {
frameRate = format.getString(MediaFormat.KEY_FRAME_RATE); try {
frameRate = format.getFloat(MediaFormat.KEY_FRAME_RATE);
} catch (ClassCastException e) {
frameRate = format.getInteger(MediaFormat.KEY_FRAME_RATE);
}
// Clears the frame rate field.
format.setString(MediaFormat.KEY_FRAME_RATE, null); format.setString(MediaFormat.KEY_FRAME_RATE, null);
} }
@ -251,7 +256,7 @@ public final class EncoderUtil {
: mediaCodecList.findEncoderForFormat(format); : mediaCodecList.findEncoderForFormat(format);
if (Util.SDK_INT == 21) { if (Util.SDK_INT == 21) {
MediaFormatUtil.maybeSetString(format, MediaFormat.KEY_FRAME_RATE, frameRate); MediaFormatUtil.maybeSetInteger(format, MediaFormat.KEY_FRAME_RATE, round(frameRate));
} }
return mediaCodecName; return mediaCodecName;
} }