Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 992abd7..54e515a 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1244,7 +1244,9 @@
// 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;