Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 911f16dd authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Android (Google) Code Review
Browse files

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

parents bf23a1ec e86784a2
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -1023,11 +1023,14 @@ public final class MediaTranscodeManager {
                            "Source Width and height must be larger than 0");
                }

                float frameRate = mSrcVideoFormatHint.getFloat(MediaFormat.KEY_FRAME_RATE);
                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);
                videoTrackFormat.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);