summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2014-07-24 14:00:09 -0700
committerThe Android Automerger <android-build@google.com>2014-07-25 12:36:43 -0700
commit3d454b9b5f8c462143447f7189e3206d28cf950d (patch)
treeb7719184b2db316f3302d507a8efb629c8b00ea8
parentb9f7b21508fc619e46a5b11490ac7add806f7632 (diff)
downloadframeworks_av-3d454b9b5f8c462143447f7189e3206d28cf950d.zip
frameworks_av-3d454b9b5f8c462143447f7189e3206d28cf950d.tar.gz
frameworks_av-3d454b9b5f8c462143447f7189e3206d28cf950d.tar.bz2
StagefrightRecorder: check for WEBM format instead of MP4
Bug: 16544665 Change-Id: Idc45bd4cafc65a11132d10fdf21f8439e186f35f
-rw-r--r--media/libmediaplayerservice/StagefrightRecorder.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 217b248..8774117 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1551,10 +1551,10 @@ status_t StagefrightRecorder::setupMPEG4orWEBMRecording() {
status_t err = OK;
sp<MediaWriter> writer;
- if (mOutputFormat == OUTPUT_FORMAT_MPEG_4) {
- writer = new MPEG4Writer(mOutputFd);
- } else {
+ if (mOutputFormat == OUTPUT_FORMAT_WEBM) {
writer = new WebmWriter(mOutputFd);
+ } else {
+ writer = new MPEG4Writer(mOutputFd);
}
if (mVideoSource < VIDEO_SOURCE_LIST_END) {
@@ -1575,7 +1575,7 @@ status_t StagefrightRecorder::setupMPEG4orWEBMRecording() {
mTotalBitRate += mVideoBitRate;
}
- if (mOutputFormat == OUTPUT_FORMAT_MPEG_4) {
+ if (mOutputFormat != OUTPUT_FORMAT_WEBM) {
// Audio source is added at the end if it exists.
// This help make sure that the "recoding" sound is suppressed for
// camcorder applications in the recorded files.
@@ -1625,7 +1625,7 @@ void StagefrightRecorder::setupMPEG4orWEBMMetaData(sp<MetaData> *meta) {
if (mMovieTimeScale > 0) {
(*meta)->setInt32(kKeyTimeScale, mMovieTimeScale);
}
- if (mOutputFormat == OUTPUT_FORMAT_MPEG_4) {
+ if (mOutputFormat != OUTPUT_FORMAT_WEBM) {
(*meta)->setInt32(kKey64BitFileOffset, mUse64BitFileOffset);
if (mTrackEveryTimeDurationUs > 0) {
(*meta)->setInt64(kKeyTrackTimeStatus, mTrackEveryTimeDurationUs);