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

Commit d9c399ef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add @IntRange to MediaMetadataRetriever#getScaledFrameAtTime"

parents b2b9b876 ce8ace7e

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -25781,8 +25781,8 @@ package android.media { 
    method @Nullable public android.graphics.Bitmap getImageAtIndex(int);

    method @Nullable public android.graphics.Bitmap getPrimaryImage(@NonNull android.media.MediaMetadataRetriever.BitmapParams);

    method @Nullable public android.graphics.Bitmap getPrimaryImage();

    method @Nullable public android.graphics.Bitmap getScaledFrameAtTime(long, int, int, int);

    method @Nullable public android.graphics.Bitmap getScaledFrameAtTime(long, int, int, int, @NonNull android.media.MediaMetadataRetriever.BitmapParams);

    method @Nullable public android.graphics.Bitmap getScaledFrameAtTime(long, int, @IntRange(from=1) int, @IntRange(from=1) int);

    method @Nullable public android.graphics.Bitmap getScaledFrameAtTime(long, int, @IntRange(from=1) int, @IntRange(from=1) int, @NonNull android.media.MediaMetadataRetriever.BitmapParams);

    method public void release();

    method public void setDataSource(String) throws java.lang.IllegalArgumentException;

    method public void setDataSource(String, java.util.Map<java.lang.String,java.lang.String>) throws java.lang.IllegalArgumentException;

media/java/android/media/MediaMetadataRetriever.java

+5 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.media;



import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;
@@ -354,8 +355,8 @@ public class MediaMetadataRetriever implements AutoCloseable { 
     *         is less than or equal to 0.

     * @see {@link #getScaledFrameAtTime(long, int, int, int, BitmapParams)}

     */

    public @Nullable Bitmap getScaledFrameAtTime(

            long timeUs, @Option int option, int dstWidth, int dstHeight) {

    public @Nullable Bitmap getScaledFrameAtTime(long timeUs, @Option int option,

            @IntRange(from=1) int dstWidth, @IntRange(from=1) int dstHeight) {

        validate(option, dstWidth, dstHeight);

        return _getFrameAtTime(timeUs, option, dstWidth, dstHeight, null);

    }
@@ -400,7 +401,8 @@ public class MediaMetadataRetriever implements AutoCloseable { 
     * @see {@link #getScaledFrameAtTime(long, int, int, int)}

     */

    public @Nullable Bitmap getScaledFrameAtTime(long timeUs, @Option int option,

            int dstWidth, int dstHeight, @NonNull BitmapParams params) {

            @IntRange(from=1) int dstWidth, @IntRange(from=1) int dstHeight,

            @NonNull BitmapParams params) {

        validate(option, dstWidth, dstHeight);

        return _getFrameAtTime(timeUs, option, dstWidth, dstHeight, params);

    }