commit 2303361b40a981f18701b0dd07bf17fa8668c311
author Wonsik Kim <wonsik@google.com> Wed Jan 27 00:31:23 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 27 00:31:23 2016 +0000
tree f5789b56f2132cd428de3259506a337a2e6b2233
parent 3cdbc806ff52d02bf215a5aa696b670434d9f401
parent 886e562bc5aa51b1bbb3f429a440d1f4e90db1c2

Merge "media: add HEVC support to MediaRecorder"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 9419b1c..bc93852 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -20858,6 +20858,7 @@
     field public static final int DEFAULT = 0; // 0x0
     field public static final int H263 = 1; // 0x1
     field public static final int H264 = 2; // 0x2
+    field public static final int HEVC = 5; // 0x5
     field public static final int MPEG_4_SP = 3; // 0x3
     field public static final int VP8 = 4; // 0x4
   }

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 1ca34ec5..18dcce7 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -22207,6 +22207,7 @@
     field public static final int DEFAULT = 0; // 0x0
     field public static final int H263 = 1; // 0x1
     field public static final int H264 = 2; // 0x2
+    field public static final int HEVC = 5; // 0x5
     field public static final int MPEG_4_SP = 3; // 0x3
     field public static final int VP8 = 4; // 0x4
   }

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 62b049e..d6c4e51 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -20866,6 +20866,7 @@
     field public static final int DEFAULT = 0; // 0x0
     field public static final int H263 = 1; // 0x1
     field public static final int H264 = 2; // 0x2
+    field public static final int HEVC = 5; // 0x5
     field public static final int MPEG_4_SP = 3; // 0x3
     field public static final int VP8 = 4; // 0x4
   }

media/java/android/media/MediaRecorder.java

diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 504c6d0..9517387 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -389,6 +389,7 @@
         public static final int H264 = 2;
         public static final int MPEG_4_SP = 3;
         public static final int VP8 = 4;
+        public static final int HEVC = 5;
     }
 
     /**