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

Commit 931e13d0 authored by hkuang's avatar hkuang Committed by Hangyu Kuang
Browse files

transcodng: Replace fd with Uri string. 

Bug: 145628554
Test: MediaTranscodeManagerTest.
Change-Id: I8e81111943e20cb31cd4349406b633d3f6c092d1
parent c54ffee6

media/java/android/media/MediaTranscodeManager.java

+31 −11
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.content.ContentResolver;

import android.content.Context;

import android.content.res.AssetFileDescriptor;

import android.net.Uri;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.system.Os;
@@ -234,6 +234,32 @@ public final class MediaTranscodeManager { 
    // Just forwards all the events to the event handler.

    private ITranscodingClientCallback mTranscodingClientCallback =

            new ITranscodingClientCallback.Stub() {

                // TODO(hkuang): Add more unit test to test difference file open mode.

                @Override

                public ParcelFileDescriptor openFileDescriptor(String fileUri, String mode)

                        throws RemoteException {

                    if (!mode.equals("r") && !mode.equals("w") && !mode.equals("rw")) {

                        Log.e(TAG, "Unsupport mode: " + mode);

                        return null;

                    }



                    Uri uri = Uri.parse(fileUri);

                    try {

                        ParcelFileDescriptor pfd = mContentResolver.openFileDescriptor(uri,

                                mode);

                        if (pfd != null) {

                            return pfd;

                        }

                    } catch (FileNotFoundException e) {

                        Log.w(TAG, "Cannot find content uri: " + uri, e);

                    } catch (SecurityException e) {

                        Log.w(TAG, "Cannot open content uri: " + uri, e);

                    } catch (Exception e) {

                        Log.w(TAG, "Unknown content uri: " + uri, e);

                    }

                    return null;

                }



                @Override

                public void onTranscodingFinished(int jobId, TranscodingResultParcel result)

                        throws RemoteException {
@@ -369,6 +395,8 @@ public final class MediaTranscodeManager { 
            // TODO(hkuang): Implement all the fields here to pass to service.

            parcel.priority = mPriority;

            parcel.transcodingType = mType;

            parcel.sourceFilePath = mSourceUri.getPath();

            parcel.destinationFilePath = mDestinationUri.getPath();

            if (mProcessingDelayMs != 0) {

                parcel.isForTesting = true;

                parcel.testConfig = new TranscodingTestConfig();
@@ -783,20 +811,12 @@ public final class MediaTranscodeManager { 
        Objects.requireNonNull(listenerExecutor, "listenerExecutor must not be null");

        Objects.requireNonNull(listener, "listener must not be null");



        // Converts the request to TranscodingRequestParcel.

        TranscodingRequestParcel requestParcel = transcodingRequest.writeToParcel();



        // TODO(hkuang): move to use Uri string instead of FileDescriptor.

        // Open the source file descriptor.

        AssetFileDescriptor sourceFd = mContentResolver.openAssetFileDescriptor(

                transcodingRequest.getSourceUri(), "r");



        // Open the destination file descriptor.

        AssetFileDescriptor destinationFd = mContentResolver.openAssetFileDescriptor(

                transcodingRequest.getDestinationUri(), "w");



        // Submits the request to MediaTranscoding service.

        TranscodingJobParcel jobParcel = new TranscodingJobParcel();

        try {

            TranscodingJobParcel jobParcel = new TranscodingJobParcel();

            // Synchronizes the access to mPendingTranscodingJobs to make sure the job Id is

            // inserted in the mPendingTranscodingJobs in the callback handler.

            synchronized (mPendingTranscodingJobs) {

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

+3 −1
Original line number Diff line number Diff line
@@ -135,7 +135,9 @@ public class MediaTranscodeManagerWithMockServiceTest 
                    try {

                        outjob.request = inRequest;

                        outjob.jobId = mJobId.getAndIncrement();

                        Log.d(TAG, "Generate new job " + outjob.jobId);

                        Log.i(TAG, "Generate new job " + outjob.jobId);

                        Log.i(TAG, "Source Uri " + inRequest.sourceFilePath);

                        Log.i(TAG, "Destination Uri " + inRequest.destinationFilePath);



                        // Schedules the job to run after inRequest.processingDelayMs.

                        ScheduledFuture<?> transcodingFuture = mJobScheduler.schedule(