am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video recording...

* commit 'd0a254566f5f0be5607b4d64839a575c888c94f6':
  Fix log spamming during time lapse video recording

diff --cc media/libstagefright/CameraSource.cpp
Simple merge

diff --cc media/libstagefright/CameraSourceTimeLapse.cpp
index 23e6e35,eb456f4..4f6c8d1
--- 1/media/libstagefright/CameraSourceTimeLapse.cpp
--- 2/media/libstagefright/CameraSourceTimeLapse.cpp
+++ b/media/libstagefright/CameraSourceTimeLapse.cpp
@@@ -271,14 -271,14 +271,14 @@@ bool CameraSourceTimeLapse::skipFrameAn
      // The first 2 output frames from the encoder are: decoder specific info and
      // the compressed video frame data for the first input video frame.
      if (mNumFramesEncoded >= 1 && *timestampUs <
-         (mLastTimeLapseFrameRealTimestampUs + mTimeBetweenTimeLapseFrameCaptureUs)) {
+         (mLastTimeLapseFrameRealTimestampUs + mTimeBetweenFrameCaptureUs)) {
          // Skip all frames from last encoded frame until
-         // sufficient time (mTimeBetweenTimeLapseFrameCaptureUs) has passed.
+         // sufficient time (mTimeBetweenFrameCaptureUs) has passed.
          // Tell the camera to release its recording frame and return.
 -        LOGV("dataCallbackTimestamp timelapse: skipping intermediate frame");
 +        ALOGV("dataCallbackTimestamp timelapse: skipping intermediate frame");
          return true;
      } else {
-         // Desired frame has arrived after mTimeBetweenTimeLapseFrameCaptureUs time:
+         // Desired frame has arrived after mTimeBetweenFrameCaptureUs time:
          // - Reset mLastTimeLapseFrameRealTimestampUs to current time.
          // - Artificially modify timestampUs to be one frame time (1/framerate) ahead
          // of the last encoded frame's time stamp.