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

Merge "Set default video parameters in Tx VideoFormatResolver" am: 014af4028e am: 1796c893e7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1887497

Change-Id: Ia37f3d88965b00e122f04773ad5e2b441034bb01
This commit is contained in:
Treehugger Robot
2021-11-29 22:50:12 +00:00
committed by Automerger Merge Worker
parent 1886498d3a 1796c893e7
commit 2380d5388b
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apex/media/framework/java/android/media/MediaTranscodingManager.java
View File

@@ -952,6 +952,8 @@ public final class MediaTranscodingManager {
* *
* @return the video track format to be used if transcoding should be performed, * @return the video track format to be used if transcoding should be performed,
* and null otherwise. * and null otherwise.
* @throws IllegalArgumentException if the hinted source video format contains invalid
* parameters.
*/ */
@Nullable @Nullable
public MediaFormat resolveVideoFormat() { public MediaFormat resolveVideoFormat() {
@@ -962,20 +964,19 @@ public final class MediaTranscodingManager {
MediaFormat videoTrackFormat = new MediaFormat(mSrcVideoFormatHint); MediaFormat videoTrackFormat = new MediaFormat(mSrcVideoFormatHint);
videoTrackFormat.setString(MediaFormat.KEY_MIME, MediaFormat.MIMETYPE_VIDEO_AVC); videoTrackFormat.setString(MediaFormat.KEY_MIME, MediaFormat.MIMETYPE_VIDEO_AVC);
int width = mSrcVideoFormatHint.getInteger(MediaFormat.KEY_WIDTH); int width = mSrcVideoFormatHint.getInteger(MediaFormat.KEY_WIDTH, -1);
int height = mSrcVideoFormatHint.getInteger(MediaFormat.KEY_HEIGHT); int height = mSrcVideoFormatHint.getInteger(MediaFormat.KEY_HEIGHT, -1);
if (width <= 0 || height <= 0) { if (width <= 0 || height <= 0) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Source Width and height must be larger than 0"); "Source Width and height must be larger than 0");
} }
float frameRate = 30.0f; // default to 30fps. float frameRate =
if (mSrcVideoFormatHint.containsKey(MediaFormat.KEY_FRAME_RATE)) { mSrcVideoFormatHint.getNumber(MediaFormat.KEY_FRAME_RATE, 30.0)
frameRate = mSrcVideoFormatHint.getFloat(MediaFormat.KEY_FRAME_RATE); .floatValue();
if (frameRate <= 0) { if (frameRate <= 0) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"frameRate must be larger than 0"); "frameRate must be larger than 0");
}
} }
int bitrate = getAVCBitrate(width, height, frameRate); int bitrate = getAVCBitrate(width, height, frameRate);