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

Commit 7d47a496 authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge "Add pixel aspect ratio information to MediaFormat"

parents 0f15f727 c294a472

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -25397,6 +25397,8 @@ package android.media { 
    field public static final String KEY_OPERATING_RATE = "operating-rate";

    field public static final String KEY_OUTPUT_REORDER_DEPTH = "output-reorder-depth";

    field public static final String KEY_PCM_ENCODING = "pcm-encoding";

    field public static final String KEY_PIXEL_ASPECT_RATIO_HEIGHT = "sar-height";

    field public static final String KEY_PIXEL_ASPECT_RATIO_WIDTH = "sar-width";

    field public static final String KEY_PREPEND_HEADER_TO_SYNC_FRAMES = "prepend-sps-pps-to-idr-frames";

    field public static final String KEY_PRIORITY = "priority";

    field public static final String KEY_PROFILE = "profile";

media/java/android/media/MediaFormat.java

+14 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ import java.util.stream.Collectors; 
 * <tr><th>Name</th><th>Value Type</th><th>Description</th></tr>

 * <tr><td>{@link #KEY_MIME}</td><td>String</td><td>The type of the format.</td></tr>

 * <tr><td>{@link #KEY_MAX_INPUT_SIZE}</td><td>Integer</td><td>optional, maximum size of a buffer of input data</td></tr>

 * <tr><td>{@link #KEY_PIXEL_ASPECT_RATIO_WIDTH}</td><td>Integer</td><td>optional, the pixel aspect ratio width</td></tr>

 * <tr><td>{@link #KEY_PIXEL_ASPECT_RATIO_HEIGHT}</td><td>Integer</td><td>optional, the pixel aspect ratio height</td></tr>

 * <tr><td>{@link #KEY_BIT_RATE}</td><td>Integer</td><td><b>encoder-only</b>, desired bitrate in bits/second</td></tr>

 * </table>

 *
@@ -271,6 +273,18 @@ public final class MediaFormat { 
     */

    public static final String KEY_MAX_INPUT_SIZE = "max-input-size";



    /**

     * A key describing the pixel aspect ratio width.

     * The associated value is an integer

     */

    public static final String KEY_PIXEL_ASPECT_RATIO_WIDTH = "sar-width";



    /**

     * A key describing the pixel aspect ratio height.

     * The associated value is an integer

     */

    public static final String KEY_PIXEL_ASPECT_RATIO_HEIGHT = "sar-height";



    /**

     * A key describing the average bitrate in bits/sec.

     * The associated value is an integer