commit dc042ce074ea2cb6063f3e154da26f42b7f3b233
author Lajos Molnar <lajos@google.com> Wed Jul 23 02:23:51 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 22 20:44:55 2014 +0000
tree ebba29bd35b6ef2d8eed47b26dc77ba6c8bb55bf
parent 4c9a0e3e30e97a31fcd7e41cb77d15427cb9c50b
parent 92b583ad786edcbe0ae0925e2b7cc043e0849b86

Merge "MediaRecorder: constants for webm recordering" into lmp-dev

include/media/mediarecorder.h

diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h
index 2aa8a72..b0a62a7 100644
--- a/include/media/mediarecorder.h
+++ b/include/media/mediarecorder.h
@@ -70,6 +70,9 @@
     /* H.264/AAC data encapsulated in MPEG2/TS */
     OUTPUT_FORMAT_MPEG2TS = 8,
 
+    /* VP8/VORBIS data in a WEBM container */
+    OUTPUT_FORMAT_WEBM = 9,
+
     OUTPUT_FORMAT_LIST_END // must be last - used to validate format type
 };
 
@@ -80,6 +83,7 @@
     AUDIO_ENCODER_AAC = 3,
     AUDIO_ENCODER_HE_AAC = 4,
     AUDIO_ENCODER_AAC_ELD = 5,
+    AUDIO_ENCODER_VORBIS = 6,
 
     AUDIO_ENCODER_LIST_END // must be the last - used to validate the audio encoder type
 };
@@ -89,6 +93,7 @@
     VIDEO_ENCODER_H263 = 1,
     VIDEO_ENCODER_H264 = 2,
     VIDEO_ENCODER_MPEG_4_SP = 3,
+    VIDEO_ENCODER_VP8 = 4,
 
     VIDEO_ENCODER_LIST_END // must be the last - used to validate the video encoder type
 };