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

Set default video parameters in Tx VideoFormatResolver

Browse Source 
Set default value for getting width, height and
framerate video parameters in transcoding
VideoFormatResolver.

Bug: 198164635

Test: cts-tradefed run singleCommand cts
-m CtsMediaTranscodingTestCases
-t android.media.mediatranscoding.cts.
MediaTranscodingManagerTest#testVideoFormatResolver

Change-Id: I00258bc158b932a831df644e641ff226af1d02c7
This commit is contained in:
Giridhar Tippabathuni
2021-09-16 11:17:27 +05:30
committed by Kevin Rocard
parent 9344483fe5
commit 933fd0ce30
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

@@ -946,6 +946,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() {
@@ -956,20 +958,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);