am d2225a06: am 1418de7e: Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb

* commit 'd2225a06a315db9988236dcf5c5bca743f6d457d':
  Fix the sluggish preview during timelapse video recording because software encoder is used.
This commit is contained in:
James Dong
2011-01-18 21:54:39 -08:00
committed by Android Git Automerger

View File

@@ -1244,7 +1244,9 @@ status_t StagefrightRecorder::setupVideoEncoder(
// Use software codec for time lapse
uint32_t encoder_flags = 0;
if (mCaptureTimeLapse) {
encoder_flags |= OMXCodec::kPreferSoftwareCodecs;
// Do not use software encoder for timelapse for now
// It is _very_ slow and the preview appears sluggish
//encoder_flags |= OMXCodec::kPreferSoftwareCodecs;
} else if (mIsMetaDataStoredInVideoBuffers) {
encoder_flags |= OMXCodec::kHardwareCodecsOnly;
encoder_flags |= OMXCodec::kStoreMetaDataInVideoBuffers;