diff options
author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-03-19 17:27:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-19 17:27:53 +0000 |
commit | ae21e335e392125168601dba4731c85b5c25f33f (patch) | |
tree | 9fc3c0737d1391aa6aa9417b212275688cd3bd00 /services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp | |
parent | 5a23aa949188fafe1d8d35966ff5a73974294dfd (diff) | |
parent | b97babb8c08969b55af3b6456d15f764c8873d3f (diff) | |
download | frameworks_av-ae21e335e392125168601dba4731c85b5c25f33f.zip frameworks_av-ae21e335e392125168601dba4731c85b5c25f33f.tar.gz frameworks_av-ae21e335e392125168601dba4731c85b5c25f33f.tar.bz2 |
Merge "Camera: plumbing rotation field through"
Diffstat (limited to 'services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp')
-rw-r--r-- | services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp b/services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp index a5a2fec..b6071f6 100644 --- a/services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp +++ b/services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp @@ -183,7 +183,7 @@ status_t StreamingProcessor::updatePreviewStream(const Parameters ¶ms) { res = device->createStream(mPreviewWindow, params.previewWidth, params.previewHeight, CAMERA2_HAL_PIXEL_FORMAT_OPAQUE, HAL_DATASPACE_UNKNOWN, - &mPreviewStreamId); + CAMERA3_STREAM_ROTATION_0, &mPreviewStreamId); if (res != OK) { ALOGE("%s: Camera %d: Unable to create preview stream: %s (%d)", __FUNCTION__, mId, strerror(-res), res); @@ -426,8 +426,8 @@ status_t StreamingProcessor::updateRecordingStream(const Parameters ¶ms) { // TODO: Wire this in from encoder side res = device->createStream(mRecordingWindow, params.videoWidth, params.videoHeight, - CAMERA2_HAL_PIXEL_FORMAT_OPAQUE, - HAL_DATASPACE_BT709, &mRecordingStreamId); + CAMERA2_HAL_PIXEL_FORMAT_OPAQUE, HAL_DATASPACE_BT709, + CAMERA3_STREAM_ROTATION_0, &mRecordingStreamId); if (res != OK) { ALOGE("%s: Camera %d: Can't create output stream for recording: " "%s (%d)", __FUNCTION__, mId, |