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

Commit 331fbc04 authored by hkuang's avatar hkuang
Browse files

transcoding: Add HEVC->AVC transcoding test. 

1) This CL verifies hevc to avc transcoding is working.
Still need to verify the transcoding result in the
coming CLs.
2) This CL also fix a bug that the track format
is not set when sending job to transcoding service.

Bug: 145628554
Bug: 154734285
Test: Unit test

Change-Id: Ia740e1e969357c3f719966c114f1e5182f4d7f66
parent 2e63006c

media/java/android/media/MediaTranscodeManager.java

+61 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ public final class MediaTranscodeManager { 
            parcel.transcodingType = mType;

            parcel.sourceFilePath = mSourceUri.toString();

            parcel.destinationFilePath = mDestinationUri.toString();

            parcel.requestedVideoTrackFormat = convertToVideoTrackFormat(mVideoTrackFormat);

            if (mTestConfig != null) {

                parcel.isForTesting = true;

                parcel.testConfig = mTestConfig;
@@ -421,6 +422,66 @@ public final class MediaTranscodeManager { 
            return parcel;

        }



        /* Converts the MediaFormat to TranscodingVideoTrackFormat. */

        private static TranscodingVideoTrackFormat convertToVideoTrackFormat(MediaFormat format) {

            if (format == null) {

                throw new IllegalArgumentException("Invalid MediaFormat");

            }



            TranscodingVideoTrackFormat trackFormat = new TranscodingVideoTrackFormat();



            if (format.containsKey(MediaFormat.KEY_MIME)) {

                String mime = format.getString(MediaFormat.KEY_MIME);

                if (MediaFormat.MIMETYPE_VIDEO_AVC.equals(mime)) {

                    trackFormat.codecType = TranscodingVideoCodecType.kAvc;

                } else if (MediaFormat.MIMETYPE_VIDEO_HEVC.equals(mime)) {

                    trackFormat.codecType = TranscodingVideoCodecType.kHevc;

                } else {

                    throw new UnsupportedOperationException("Only support transcode to avc/hevc");

                }

            }



            if (format.containsKey(MediaFormat.KEY_BIT_RATE)) {

                int bitrateBps = format.getInteger(MediaFormat.KEY_BIT_RATE);

                if (bitrateBps <= 0) {

                    throw new IllegalArgumentException("Bitrate must be larger than 0");

                }

                trackFormat.bitrateBps = bitrateBps;

            }



            if (format.containsKey(MediaFormat.KEY_WIDTH) && format.containsKey(

                    MediaFormat.KEY_HEIGHT)) {

                int width = format.getInteger(MediaFormat.KEY_WIDTH);

                int height = format.getInteger(MediaFormat.KEY_HEIGHT);

                if (width <= 0 || height <= 0) {

                    throw new IllegalArgumentException("Width and height must be larger than 0");

                }

                // TODO(hkuang): Validate the aspect ratio after adding scaling.

                trackFormat.width = width;

                trackFormat.height = height;

            }



            if (format.containsKey(MediaFormat.KEY_PROFILE)) {

                int profile = format.getInteger(MediaFormat.KEY_PROFILE);

                if (profile <= 0) {

                    throw new IllegalArgumentException("Invalid codec profile");

                }

                // TODO(hkuang): Validate the profile according to codec type.

                trackFormat.profile = profile;

            }



            if (format.containsKey(MediaFormat.KEY_LEVEL)) {

                int level = format.getInteger(MediaFormat.KEY_LEVEL);

                if (level <= 0) {

                    throw new IllegalArgumentException("Invalid codec level");

                }

                // TODO(hkuang): Validate the level according to codec type.

                trackFormat.level = level;

            }



            return trackFormat;

        }



        /**

         * Builder class for {@link TranscodingRequest} objects.

         * Use this class to configure and create a <code>TranscodingRequest</code> instance.

media/tests/MediaTranscodingTest/src/com/android/mediatranscodingtest/MediaTranscodeManagerTest.java

+5 −5
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public class MediaTranscodeManagerTest 
    }



    @Test

    public void testTranscodingFromAvcToAvc() throws Exception {

    public void testTranscodingFromHevcToAvc() throws Exception {

        Log.d(TAG, "Starting: testMediaTranscodeManager");



        Semaphore transcodeCompleteSemaphore = new Semaphore(0);
@@ -150,13 +150,11 @@ public class MediaTranscodeManagerTest 
        // The full path of this file is:

        // /data/user/0/com.android.mediatranscodingtest/cache/temp.mp4

        Uri destinationUri = Uri.parse(ContentResolver.SCHEME_FILE + "://"

                + mContext.getCacheDir().getAbsolutePath() + "/temp.mp4");



        Log.d(TAG, "Transcoding to " + destinationUri.getPath());

                + mContext.getCacheDir().getAbsolutePath() + "/HevcTranscode.mp4");



        TranscodingRequest request =

                new TranscodingRequest.Builder()

                        .setSourceUri(mSourceAVCVideoUri)

                        .setSourceUri(mSourceHEVCVideoUri)

                        .setDestinationUri(destinationUri)

                        .setType(MediaTranscodeManager.TRANSCODING_TYPE_VIDEO)

                        .setPriority(MediaTranscodeManager.PRIORITY_REALTIME)
@@ -164,6 +162,8 @@ public class MediaTranscodeManagerTest 
                        .build();

        Executor listenerExecutor = Executors.newSingleThreadExecutor();



        Log.i(TAG, "transcoding to " + createMediaFormat());



        TranscodingJob job = mMediaTranscodeManager.enqueueRequest(request, listenerExecutor,

                transcodingJob -> {

                    Log.d(TAG, "Transcoding completed with result: " + transcodingJob.getResult());