Merge "audio: omx encoder isn't expected for raw recording" (db9233bc) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/StagefrightRecorder.cpp

+20 −8

Original line number	Diff line number	Diff line
		@@ -2161,11 +2161,17 @@ status_t StagefrightRecorder::setSourcePause(bool pause) {
		}
		}
		if (mAudioEncoderOMX != NULL) {
		if (mAudioEncoderOMX != mAudioSourceNode) {
		err = mAudioEncoderOMX->pause();
		if (err != OK) {
		ALOGE("OMX AudioEncoder pause failed");
		return err;
		}
		} else {
		// If AudioSource is the same as MediaSource(as in LPCM),
		// bypass omx encoder pause() call.
		ALOGV("OMX AudioEncoder->pause() bypassed");
		}
		}
		if (mVideoSourceNode != NULL) {
		err = mVideoSourceNode->pause();
		@@ -2204,11 +2210,17 @@ status_t StagefrightRecorder::setSourcePause(bool pause) {
		}
		}
		if (mAudioEncoderOMX != NULL) {
		if (mAudioEncoderOMX != mAudioSourceNode) {
		err = mAudioEncoderOMX->start();
		if (err != OK) {
		ALOGE("OMX AudioEncoder start failed");
		return err;
		}
		} else {
		// If AudioSource is the same as MediaSource(as in LPCM),
		// bypass omx encoder start() call.
		ALOGV("OMX AudioEncoder->start() bypassed");
		}
		}
		}
		return err;