Merge "When using still camera for time lapse capture, don't set preview." (f9263dd0) · Commits · e / os / android_frameworks_base

media/libmediaplayerservice/StagefrightRecorder.cpp

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -38,8 +38,8 @@
	#include <surfaceflinger/ISurface.h>		#include <surfaceflinger/ISurface.h>
	#include <utils/Errors.h>		#include <utils/Errors.h>
	#include <sys/types.h>		#include <sys/types.h>
	#include <unistd.h>
	#include <ctype.h>		#include <ctype.h>
			#include <unistd.h>

	#include "ARTPWriter.h"		#include "ARTPWriter.h"

	@@ -929,9 +929,10 @@ status_t StagefrightRecorder::setupCameraSource() {
	// Set the actual video recording frame size		// Set the actual video recording frame size
	CameraParameters params(mCamera->getParameters());		CameraParameters params(mCamera->getParameters());

	// dont change the preview size for time lapse as mVideoWidth, mVideoHeight		// dont change the preview size when using still camera for time lapse
	// may correspond to HD resolution not supported by video camera.		// as mVideoWidth, mVideoHeight may correspond to HD resolution not
	if (!mCaptureTimeLapse) {		// supported by the video camera.
			if (!(mCaptureTimeLapse && mUseStillCameraForTimeLapse)) {
	params.setPreviewSize(mVideoWidth, mVideoHeight);		params.setPreviewSize(mVideoWidth, mVideoHeight);
	}		}

	@@ -947,7 +948,7 @@ status_t StagefrightRecorder::setupCameraSource() {
	// Check on video frame size		// Check on video frame size
	int frameWidth = 0, frameHeight = 0;		int frameWidth = 0, frameHeight = 0;
	newCameraParams.getPreviewSize(&frameWidth, &frameHeight);		newCameraParams.getPreviewSize(&frameWidth, &frameHeight);
	if (!mCaptureTimeLapse &&		if (!(mCaptureTimeLapse && mUseStillCameraForTimeLapse) &&
	(frameWidth < 0 \|\| frameWidth != mVideoWidth \|\|		(frameWidth < 0 \|\| frameWidth != mVideoWidth \|\|
	frameHeight < 0 \|\| frameHeight != mVideoHeight)) {		frameHeight < 0 \|\| frameHeight != mVideoHeight)) {
	LOGE("Failed to set the video frame size to %dx%d",		LOGE("Failed to set the video frame size to %dx%d",