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

Commit 4f8a8783 authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Android (Google) Code Review
Browse files

Merge "transcoding: renaming to TranscodingJob to TranscodingSession to avoid confusion"

parents 611d2794 6d6402a7

api/system-current.txt

+24 −24
Original line number Diff line number Diff line
@@ -4429,35 +4429,13 @@ package android.media { 
  }















  public final class MediaTranscodeManager {













    method @NonNull public android.media.MediaTranscodeManager.TranscodingJob 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 @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;















    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.TranscodingJob);













  }

























  public static final class MediaTranscodeManager.TranscodingJob {













    method public void cancel();













    method public int getJobId();













    method @IntRange(from=0, to=100) public int getProgress();













    method public int getResult();













    method public int getStatus();













    method public void setOnProgressUpdateListener(@NonNull java.util.concurrent.Executor, @Nullable android.media.MediaTranscodeManager.TranscodingJob.OnProgressUpdateListener);













    method public void setOnProgressUpdateListener(int, @NonNull java.util.concurrent.Executor, @Nullable android.media.MediaTranscodeManager.TranscodingJob.OnProgressUpdateListener);













    field public static final int RESULT_CANCELED = 4; // 0x4













    field public static final int RESULT_ERROR = 3; // 0x3













    field public static final int RESULT_NONE = 1; // 0x1













    field public static final int RESULT_SUCCESS = 2; // 0x2













    field public static final int STATUS_FINISHED = 3; // 0x3













    field public static final int STATUS_PAUSED = 4; // 0x4













    field public static final int STATUS_PENDING = 1; // 0x1













    field public static final int STATUS_RUNNING = 2; // 0x2













  }

























  @java.lang.FunctionalInterface public static interface MediaTranscodeManager.TranscodingJob.OnProgressUpdateListener {













    method public void onProgressUpdate(@NonNull android.media.MediaTranscodeManager.TranscodingJob, @IntRange(from=0, to=100) int);













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















  }





























  public static final class MediaTranscodeManager.TranscodingRequest {










@@ -4490,6 +4468,28 @@ package android.media {













    field public static final String CAPS_SUPPORTS_HEVC = "support-hevc";















  }



























  public static final class MediaTranscodeManager.TranscodingSession {













    method public void cancel();













    method @IntRange(from=0, to=100) public int getProgress();













    method public int getResult();













    method public int getSessionId();













    method public int getStatus();













    method public void setOnProgressUpdateListener(@NonNull java.util.concurrent.Executor, @Nullable android.media.MediaTranscodeManager.TranscodingSession.OnProgressUpdateListener);













    method public void setOnProgressUpdateListener(int, @NonNull java.util.concurrent.Executor, @Nullable android.media.MediaTranscodeManager.TranscodingSession.OnProgressUpdateListener);













    field public static final int RESULT_CANCELED = 4; // 0x4













    field public static final int RESULT_ERROR = 3; // 0x3













    field public static final int RESULT_NONE = 1; // 0x1













    field public static final int RESULT_SUCCESS = 2; // 0x2













    field public static final int STATUS_FINISHED = 3; // 0x3













    field public static final int STATUS_PAUSED = 4; // 0x4













    field public static final int STATUS_PENDING = 1; // 0x1













    field public static final int STATUS_RUNNING = 2; // 0x2













  }

























  @java.lang.FunctionalInterface public static interface MediaTranscodeManager.TranscodingSession.OnProgressUpdateListener {













    method public void onProgressUpdate(@NonNull android.media.MediaTranscodeManager.TranscodingSession, @IntRange(from=0, to=100) int);













  }



























  public class PlayerProxy {















    method public void pause();















    method public void setPan(float);

































media/java/android/media/MediaTranscodeManager.java



+171
−163


























File changed.
Preview size limit exceeded, changes collapsed.
























non-updatable-api/system-current.txt



+24
−24




























Original line number
Diff line number
Diff line








@@ -4369,35 +4369,13 @@ package android.media {













  }





























  public final class MediaTranscodeManager {













    method @NonNull public android.media.MediaTranscodeManager.TranscodingJob 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 @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;















    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.TranscodingJob);













  }

























  public static final class MediaTranscodeManager.TranscodingJob {













    method public void cancel();













    method public int getJobId();













    method @IntRange(from=0, to=100) public int getProgress();













    method public int getResult();













    method public int getStatus();













    method public void setOnProgressUpdateListener(@NonNull java.util.concurrent.Executor, @Nullable android.media.MediaTranscodeManager.TranscodingJob.OnProgressUpdateListener);













    method public void setOnProgressUpdateListener(int, @NonNull java.util.concurrent.Executor, @Nullable android.media.MediaTranscodeManager.TranscodingJob.OnProgressUpdateListener);













    field public static final int RESULT_CANCELED = 4; // 0x4













    field public static final int RESULT_ERROR = 3; // 0x3













    field public static final int RESULT_NONE = 1; // 0x1













    field public static final int RESULT_SUCCESS = 2; // 0x2













    field public static final int STATUS_FINISHED = 3; // 0x3













    field public static final int STATUS_PAUSED = 4; // 0x4













    field public static final int STATUS_PENDING = 1; // 0x1













    field public static final int STATUS_RUNNING = 2; // 0x2













  }

























  @java.lang.FunctionalInterface public static interface MediaTranscodeManager.TranscodingJob.OnProgressUpdateListener {













    method public void onProgressUpdate(@NonNull android.media.MediaTranscodeManager.TranscodingJob, @IntRange(from=0, to=100) int);













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















  }





























  public static final class MediaTranscodeManager.TranscodingRequest {










@@ -4430,6 +4408,28 @@ package android.media {













    field public static final String CAPS_SUPPORTS_HEVC = "support-hevc";















  }



























  public static final class MediaTranscodeManager.TranscodingSession {













    method public void cancel();













    method @IntRange(from=0, to=100) public int getProgress();













    method public int getResult();













    method public int getSessionId();













    method public int getStatus();













    method public void setOnProgressUpdateListener(@NonNull java.util.concurrent.Executor, @Nullable android.media.MediaTranscodeManager.TranscodingSession.OnProgressUpdateListener);













    method public void setOnProgressUpdateListener(int, @NonNull java.util.concurrent.Executor, @Nullable android.media.MediaTranscodeManager.TranscodingSession.OnProgressUpdateListener);













    field public static final int RESULT_CANCELED = 4; // 0x4













    field public static final int RESULT_ERROR = 3; // 0x3













    field public static final int RESULT_NONE = 1; // 0x1













    field public static final int RESULT_SUCCESS = 2; // 0x2













    field public static final int STATUS_FINISHED = 3; // 0x3













    field public static final int STATUS_PAUSED = 4; // 0x4













    field public static final int STATUS_PENDING = 1; // 0x1













    field public static final int STATUS_RUNNING = 2; // 0x2













  }

























  @java.lang.FunctionalInterface public static interface MediaTranscodeManager.TranscodingSession.OnProgressUpdateListener {













    method public void onProgressUpdate(@NonNull android.media.MediaTranscodeManager.TranscodingSession, @IntRange(from=0, to=100) int);













  }



























  public class PlayerProxy {















    method public void pause();















    method public void setPan(float);