summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Santiago Seifert <aquilescanta@google.com> 2019-12-10 19:13:58 +0000
committer Santiago Seifert <aquilescanta@google.com> 2019-12-11 11:27:46 +0000
commitc294a4720cce996bb1143c97a0ffef8d3cf6c481 (patch)
tree161c65e0b6f9cca50df613ff9f0642d422cf40c1
parent3e59f30c2deac6930f8f4c5deed7c9deb00503c2 (diff)
Add pixel aspect ratio information to MediaFormat
Bug: 132153067 Bug: 134057371 Test: Not applicable. Change-Id: I6369640e2b49350ef368c25820197281f3c30ae5
-rw-r--r--api/current.txt2
-rw-r--r--media/java/android/media/MediaFormat.java14
2 files changed, 16 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 472c516e2d68..c23b176422ab 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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";
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java
index 94a6f134a1b6..dead066dcdd0 100644
--- a/media/java/android/media/MediaFormat.java
+++ b/media/java/android/media/MediaFormat.java
@@ -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>
*
@@ -272,6 +274,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
*/