Merge "StagefrightRecorder: check for WEBM format instead of MP4" into lmp-dev (f591b865) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/StagefrightRecorder.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -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);