Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "transcoding: Default framerate to be 30fps if framerate not available."

Browse Source
This commit is contained in:
Hangyu Kuang
2021-01-21 19:38:55 +00:00
committed by Android (Google) Code Review
parent bf23a1ecf5 e86784a2ca
commit 911f16dde5
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apex/media/framework/java/android/media/MediaTranscodeManager.java
View File

@@ -1023,10 +1023,13 @@ public final class MediaTranscodeManager {
"Source Width and height must be larger than 0");
}
float frameRate = mSrcVideoFormatHint.getFloat(MediaFormat.KEY_FRAME_RATE);
if (frameRate <= 0) {
throw new IllegalArgumentException(
"frameRate must be larger than 0");
float frameRate = 30.0f; // default to 30fps.
if (mSrcVideoFormatHint.containsKey(MediaFormat.KEY_FRAME_RATE)) {
frameRate = mSrcVideoFormatHint.getFloat(MediaFormat.KEY_FRAME_RATE);
if (frameRate <= 0) {
throw new IllegalArgumentException(
"frameRate must be larger than 0");
}
}
int bitrate = getAVCBitrate(width, height, frameRate);