summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2013-09-06 11:46:01 -0700
committerZhijun He <zhijunhe@google.com>2013-09-06 16:36:19 -0700
commit84b7fb0c88ddd05ed7c148c82fe1691040a9404d (patch)
tree41dc8df17d0f040c4a021e0a221ac0202aab5ae2
parent3b4529e03c5fc7a44c22f9091ad15a269bfca3a8 (diff)
downloadframeworks_av-84b7fb0c88ddd05ed7c148c82fe1691040a9404d.zip
frameworks_av-84b7fb0c88ddd05ed7c148c82fe1691040a9404d.tar.gz
frameworks_av-84b7fb0c88ddd05ed7c148c82fe1691040a9404d.tar.bz2
Camera: Send VIDEO_SNAPSHOT intent for video snapshot case
Bug: 9924539 Change-Id: Ief39eff79c31f2c2aa5df2fe1a0f04c4afc74690
-rw-r--r--services/camera/libcameraservice/api1/client2/CaptureSequencer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/client2/CaptureSequencer.cpp b/services/camera/libcameraservice/api1/client2/CaptureSequencer.cpp
index ad1590a..e7f753e 100644
--- a/services/camera/libcameraservice/api1/client2/CaptureSequencer.cpp
+++ b/services/camera/libcameraservice/api1/client2/CaptureSequencer.cpp
@@ -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();
}