OSDN Git Service

Camera: Send VIDEO_SNAPSHOT intent for video snapshot case
authorZhijun He <zhijunhe@google.com>
Fri, 6 Sep 2013 18:46:01 +0000 (11:46 -0700)
committerZhijun He <zhijunhe@google.com>
Fri, 6 Sep 2013 23:36:19 +0000 (16:36 -0700)
Bug: 9924539
Change-Id: Ief39eff79c31f2c2aa5df2fe1a0f04c4afc74690

services/camera/libcameraservice/api1/client2/CaptureSequencer.cpp

index ad1590a..e7f753e 100644 (file)
@@ -438,6 +438,7 @@ CaptureSequencer::CaptureState CaptureSequencer::manageStandardCapture(
     ATRACE_CALL();
     SharedParameters::Lock l(client->getParameters());
     Vector<uint8_t> outputStreams;
+    uint8_t captureIntent = static_cast<uint8_t>(ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE);
 
     /**
      * Set up output streams in the request
@@ -456,6 +457,7 @@ CaptureSequencer::CaptureState CaptureSequencer::manageStandardCapture(
 
     if (l.mParameters.state == Parameters::VIDEO_SNAPSHOT) {
         outputStreams.push(client->getRecordingStreamId());
+        captureIntent = static_cast<uint8_t>(ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT);
     }
 
     res = mCaptureRequest.update(ANDROID_REQUEST_OUTPUT_STREAMS,
@@ -465,6 +467,10 @@ CaptureSequencer::CaptureState CaptureSequencer::manageStandardCapture(
                 &mCaptureId, 1);
     }
     if (res == OK) {
+        res = mCaptureRequest.update(ANDROID_CONTROL_CAPTURE_INTENT,
+                &captureIntent, 1);
+    }
+    if (res == OK) {
         res = mCaptureRequest.sort();
     }