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

Commit 7453bda3 authored by hkuang's avatar hkuang
Browse files

transcoding: Address API council comments Part1 

1. Create a base class TranscodingRequest for VideoTranscodingRequest
and upcoming ImageTranscodingRequest in Androd T. Also have builder in each type
with VideoTranscodingRequest.builder inherit TranscodingRequest.builder.
2. Hiding the PRIORITY_REALTIME and setPrority api for Android S.
3. Hiding TRANSCODING_TYPE_VIDEO as it is only for internal bookkeeping
4. Move TRANSCODING_TYPE_* and PRIORITY_* to inside TranscodingRequest.
5. Remove the setSrcUri, setDstUri, setVideoTrackFormat and set them in constructor.

Bug: 181551684
Test: atest  CtsMediaTranscodingTestCases:MediaTranscodeManagerTest
Change-Id: Ib6fead5e9fcb48bfd1db35f9f35402d6fa1ed73d
parent d2ae678d

apex/media/framework/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -135,6 +135,10 @@ java_sdk_library { 
        ":updatable-media-srcs",

    ],



    api_lint: {

        enabled: false,

    },



    libs: [

        "framework_media_annotation",

    ],

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

+14 −20
Original line number Diff line number Diff line
@@ -3,38 +3,19 @@ package android.media { 


  public final class MediaTranscodeManager {

    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

  }



  @java.lang.FunctionalInterface public static interface MediaTranscodeManager.OnTranscodingFinishedListener {

    method public void onTranscodingFinished(@NonNull android.media.MediaTranscodeManager.TranscodingSession);

  }



  public static final class MediaTranscodeManager.TranscodingRequest {

  public abstract static class MediaTranscodeManager.TranscodingRequest {

    method public int getClientPid();

    method public int getClientUid();

    method @Nullable public android.os.ParcelFileDescriptor getDestinationFileDescriptor();

    method @NonNull public android.net.Uri getDestinationUri();

    method public int getPriority();

    method @Nullable public android.os.ParcelFileDescriptor getSourceFileDescriptor();

    method @NonNull public android.net.Uri getSourceUri();

    method public int getType();

    method @Nullable public android.media.MediaFormat getVideoTrackFormat();

  }



  public static final class MediaTranscodeManager.TranscodingRequest.Builder {

    ctor public MediaTranscodeManager.TranscodingRequest.Builder();

    method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest build();

    method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setClientPid(int);

    method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setClientUid(int);

    method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setDestinationFileDescriptor(@NonNull android.os.ParcelFileDescriptor);

    method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setDestinationUri(@NonNull android.net.Uri);

    method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setPriority(int);

    method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setSourceFileDescriptor(@NonNull android.os.ParcelFileDescriptor);

    method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setSourceUri(@NonNull android.net.Uri);

    method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setType(int);

    method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setVideoTrackFormat(@NonNull android.media.MediaFormat);

  }



  public static class MediaTranscodeManager.TranscodingRequest.MediaFormatResolver {
@@ -71,5 +52,18 @@ package android.media { 
    method public void onProgressUpdate(@NonNull android.media.MediaTranscodeManager.TranscodingSession, @IntRange(from=0, to=100) int);

  }



  public static final class MediaTranscodeManager.VideoTranscodingRequest extends android.media.MediaTranscodeManager.TranscodingRequest {

    method @NonNull public android.media.MediaFormat getVideoTrackFormat();

  }



  public static final class MediaTranscodeManager.VideoTranscodingRequest.Builder {

    ctor public MediaTranscodeManager.VideoTranscodingRequest.Builder(@NonNull android.net.Uri, @NonNull android.net.Uri, @NonNull android.media.MediaFormat);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest build();

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setClientPid(int);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setClientUid(int);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setDestinationFileDescriptor(android.os.ParcelFileDescriptor);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setSourceFileDescriptor(android.os.ParcelFileDescriptor);

  }



}

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

+352 −321

File changed.

Preview size limit exceeded, changes collapsed.