From 03299f9c8ef9776fbf0af022018a347c01e1a28f Mon Sep 17 00:00:00 2001
From: Hangyu Kuang <hkuang@google.com>
Date: Mon, 30 Jan 2017 13:15:06 -0800
Subject: [PATCH] media: Add 3gpp output format to MediaMuxer.

Test: CTS test.
Bug: 34281643
Change-Id: I45b65728aa1fbde7cee88ca41d7f1bd692fc866c
---
 api/current.txt                          | 1 +
 api/system-current.txt                   | 1 +
 api/test-current.txt                     | 1 +
 media/java/android/media/MediaMuxer.java | 8 ++++++--
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 6fd7d26c2ab5c..ab86d40ad62f7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -21763,6 +21763,7 @@ package android.media {
   }
 
   public static final class MediaMuxer.OutputFormat {
+    field public static final int MUXER_OUTPUT_3GPP = 2; // 0x2
     field public static final int MUXER_OUTPUT_MPEG_4 = 0; // 0x0
     field public static final int MUXER_OUTPUT_WEBM = 1; // 0x1
   }
diff --git a/api/system-current.txt b/api/system-current.txt
index 5581dd91ca78d..8a3a04cc936e3 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -23320,6 +23320,7 @@ package android.media {
   }
 
   public static final class MediaMuxer.OutputFormat {
+    field public static final int MUXER_OUTPUT_3GPP = 2; // 0x2
     field public static final int MUXER_OUTPUT_MPEG_4 = 0; // 0x0
     field public static final int MUXER_OUTPUT_WEBM = 1; // 0x1
   }
diff --git a/api/test-current.txt b/api/test-current.txt
index 3c5344ad1293e..f283466c84331 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -21853,6 +21853,7 @@ package android.media {
   }
 
   public static final class MediaMuxer.OutputFormat {
+    field public static final int MUXER_OUTPUT_3GPP = 2; // 0x2
     field public static final int MUXER_OUTPUT_MPEG_4 = 0; // 0x0
     field public static final int MUXER_OUTPUT_WEBM = 1; // 0x1
   }
diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java
index a1f816b27df7f..80832f8a29778 100644
--- a/media/java/android/media/MediaMuxer.java
+++ b/media/java/android/media/MediaMuxer.java
@@ -83,13 +83,17 @@ final public class MediaMuxer {
         private OutputFormat() {}
         /** MPEG4 media file format*/
         public static final int MUXER_OUTPUT_MPEG_4 = 0;
+        /** WEBM media file format*/
         public static final int MUXER_OUTPUT_WEBM   = 1;
+        /** 3GPP media file format*/
+        public static final int MUXER_OUTPUT_3GPP   = 2;
     };
 
     /** @hide */
     @IntDef({
         OutputFormat.MUXER_OUTPUT_MPEG_4,
         OutputFormat.MUXER_OUTPUT_WEBM,
+        OutputFormat.MUXER_OUTPUT_3GPP,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface Format {}
@@ -166,8 +170,8 @@ final public class MediaMuxer {
     }
 
     private void setUpMediaMuxer(@NonNull FileDescriptor fd, @Format int format) throws IOException {
-        if (format != OutputFormat.MUXER_OUTPUT_MPEG_4 &&
-                format != OutputFormat.MUXER_OUTPUT_WEBM) {
+        if (format != OutputFormat.MUXER_OUTPUT_MPEG_4 && format != OutputFormat.MUXER_OUTPUT_WEBM
+                && format != OutputFormat.MUXER_OUTPUT_3GPP) {
             throw new IllegalArgumentException("format: " + format + " is invalid");
         }
         mNativeObject = nativeSetup(fd, format);