Merge "MediaRecorder: constants for webm recordering" into lmp-dev (dc042ce0) · Commits · e / os / android_frameworks_av

include/media/mediarecorder.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,9 @@ enum output_format {
		/* 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 @@ enum audio_encoder {
		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 @@ enum video_encoder {
		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
		};