Merge "transcoding: Address API council comments." into sc-dev (039e9a41) · Commits · e / os / android_frameworks_base

apex/media/framework/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,6 @@ filegroup {
		"java/android/media/ApplicationMediaCapabilities.java",
		"java/android/media/MediaFeature.java",
		"java/android/media/MediaTranscodeManager.java",
		"java/android/media/MediaTranscodingException.java",
		],
		path: "java",
		}

apex/media/framework/api/current.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -210,12 +210,6 @@ package android.media {
		method public int getNotificationId();
		}

		public class MediaTranscodingException extends java.lang.Exception {
		}

		public static final class MediaTranscodingException.ServiceNotAvailableException extends android.media.MediaTranscodingException {
		}

		public final class Session2Command implements android.os.Parcelable {
		ctor public Session2Command(int);
		ctor public Session2Command(@NonNull String, @Nullable android.os.Bundle);

apex/media/framework/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		package android.media {

		public final class MediaTranscodeManager {
		method @NonNull public android.media.MediaTranscodeManager.TranscodingSession enqueueRequest(@NonNull android.media.MediaTranscodeManager.TranscodingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.media.MediaTranscodeManager.OnTranscodingFinishedListener) throws java.io.FileNotFoundException, android.media.MediaTranscodingException.ServiceNotAvailableException;
		method @Nullable public android.media.MediaTranscodeManager.TranscodingSession enqueueRequest(@NonNull android.media.MediaTranscodeManager.TranscodingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.media.MediaTranscodeManager.OnTranscodingFinishedListener);
		field public static final int PRIORITY_REALTIME = 1; // 0x1
		field public static final int TRANSCODING_TYPE_VIDEO = 1; // 0x1
		}

apex/media/framework/java/android/media/MediaTranscodeManager.java

+21 −25

Original line number	Diff line number	Diff line
		@@ -1338,19 +1338,16 @@ public final class MediaTranscodeManager {
		* could be retried only once. After that, Client need to enqueue a new request if they want
		* to try again.
		*
		* @throws MediaTranscodingException.ServiceNotAvailableException if the service
		* is temporarily unavailable due to internal service rebooting. Client could retry
		* again after receiving this exception.
		* @return true if successfully resubmit the job to service. False otherwise.
		* @throws UnsupportedOperationException if the retry could not be fulfilled.
		* @hide
		*/
		public void retry() throws MediaTranscodingException.ServiceNotAvailableException {
		retryInternal(true /setHasRetried/);
		public boolean retry() {
		return retryInternal(true /setHasRetried/);
		}

		// TODO(hkuang): Add more test for it.
		private void retryInternal(boolean setHasRetried)
		throws MediaTranscodingException.ServiceNotAvailableException {
		private boolean retryInternal(boolean setHasRetried) {
		synchronized (mLock) {
		if (mStatus == STATUS_PENDING \|\| mStatus == STATUS_RUNNING) {
		throw new UnsupportedOperationException(
		@@ -1364,8 +1361,8 @@ public final class MediaTranscodeManager {
		// Get the client interface.
		ITranscodingClient client = mManager.getTranscodingClient();
		if (client == null) {
		throw new MediaTranscodingException.ServiceNotAvailableException(
		"Service rebooting. Try again later");
		Log.e(TAG, "Service rebooting. Try again later");
		return false;
		}

		synchronized (mManager.mPendingTranscodingSessions) {
		@@ -1383,13 +1380,13 @@ public final class MediaTranscodeManager {
		// Adds the new session back into pending sessions.
		mManager.mPendingTranscodingSessions.put(mSessionId, this);
		} catch (RemoteException re) {
		throw new MediaTranscodingException.ServiceNotAvailableException(
		"Failed to resubmit request to Transcoding service");
		return false;
		}
		mStatus = STATUS_PENDING;
		mHasRetried = setHasRetried ? true : false;
		}
		}
		return true;
		}

		/**
		@@ -1529,24 +1526,20 @@ public final class MediaTranscodeManager {
		* <p> Upon successfully accepting the request, MediaTranscodeManager will return a
		* {@link TranscodingSession} to the client. Client should use {@link TranscodingSession} to
		* track the progress and get the result.
		* <p> MediaTranscodeManager will return null if fails to accept the request due to service
		* rebooting. Client could retry again after receiving null.
		*
		* @param transcodingRequest The TranscodingRequest to enqueue.
		* @param listenerExecutor Executor on which the listener is notified.
		* @param listener Listener to get notified when the transcoding session is finished.
		* @return A TranscodingSession for this operation.
		* @throws FileNotFoundException if the source Uri or destination Uri could not be opened.
		* @throws UnsupportedOperationException if the request could not be fulfilled.
		* @throws MediaTranscodingException.ServiceNotAvailableException if the service
		* is temporarily unavailable due to internal service rebooting. Client could retry
		* again after receiving this exception.
		*/
		@NonNull
		@Nullable
		public TranscodingSession enqueueRequest(
		@NonNull TranscodingRequest transcodingRequest,
		@NonNull @CallbackExecutor Executor listenerExecutor,
		@NonNull OnTranscodingFinishedListener listener)
		throws FileNotFoundException,
		MediaTranscodingException.ServiceNotAvailableException {
		@NonNull OnTranscodingFinishedListener listener) {
		Log.i(TAG, "enqueueRequest called.");
		Objects.requireNonNull(transcodingRequest, "transcodingRequest must not be null");
		Objects.requireNonNull(listenerExecutor, "listenerExecutor must not be null");
		@@ -1568,14 +1561,14 @@ public final class MediaTranscodeManager {
		// Try to register with the service again.
		IMediaTranscodingService service = getService(false /retry/);
		if (service == null) {
		throw new MediaTranscodingException.ServiceNotAvailableException(
		"Service rebooting. Try again later");
		Log.w(TAG, "Service rebooting. Try again later");
		return null;
		}
		mTranscodingClient = registerClient(service);
		// If still fails, throws an exception to tell client to try later.
		if (mTranscodingClient == null) {
		throw new MediaTranscodingException.ServiceNotAvailableException(
		"Service rebooting. Try again later");
		Log.w(TAG, "Service rebooting. Try again later");
		return null;
		}
		}

		@@ -1595,9 +1588,12 @@ public final class MediaTranscodeManager {
		mPendingTranscodingSessions.put(session.getSessionId(), session);
		return session;
		}
		} catch (RemoteException \| ServiceSpecificException ex) {
		} catch (RemoteException ex) {
		Log.w(TAG, "Service rebooting. Try again later");
		return null;
		} catch (ServiceSpecificException ex) {
		throw new UnsupportedOperationException(
		"Failed to submit request to Transcoding service");
		"Failed to submit request to Transcoding service. Error: " + ex);
		}
		}
		}

apex/media/framework/java/android/media/MediaTranscodingException.java

deleted100644 → 0

+0 −38

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media;

		/**
		* Base class for MediaTranscoding exceptions
		*/
		public class MediaTranscodingException extends Exception {
		private MediaTranscodingException(String detailMessage) {
		super(detailMessage);
		}

		/**
		* Exception thrown when the service is rebooting and MediaTranscodeManager is temporarily
		* unavailable for accepting new request. It's likely that retrying will be successful.
		*/
		public static final class ServiceNotAvailableException extends
		MediaTranscodingException {
		/** @hide */
		public ServiceNotAvailableException(String detailMessage) {
		super(detailMessage);
		}
		}
		}