gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Camera: skip unnecessary reconfig" am: b9e732b490 am: f694dc1b4a

Browse Source 
am: e1655e5469

Change-Id: I396254dd546aaa7fb2147d60b95cbe8075059f23
gugelfrei
Yin-Chia Yeh 6 years ago committed by android-build-merger
parent 4531c707c4 e1655e5469
commit 398fd50891
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File

48
services/camera/libcameraservice/api1/Camera2Client.cpp
Unescape View File

@ -780,33 +780,35 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) {
int lastJpegStreamId = mJpegProcessor->getStreamId(); int lastJpegStreamId = mJpegProcessor->getStreamId();
// If jpeg stream will slow down preview, make sure we remove it before starting preview // If jpeg stream will slow down preview, make sure we remove it before starting preview
if (params.slowJpegMode) { if (params.slowJpegMode) {
// Pause preview if we are streaming if (lastJpegStreamId != NO_STREAM) {
int32_t activeRequestId = mStreamingProcessor->getActiveRequestId(); // Pause preview if we are streaming
if (activeRequestId != 0) { int32_t activeRequestId = mStreamingProcessor->getActiveRequestId();
res = mStreamingProcessor->togglePauseStream(/*pause*/true); if (activeRequestId != 0) {
if (res != OK) { res = mStreamingProcessor->togglePauseStream(/*pause*/true);
ALOGE("%s: Camera %d: Can't pause streaming: %s (%d)", if (res != OK) {
__FUNCTION__, mCameraId, strerror(-res), res); ALOGE("%s: Camera %d: Can't pause streaming: %s (%d)",
} __FUNCTION__, mCameraId, strerror(-res), res);
res = mDevice->waitUntilDrained(); }
if (res != OK) { res = mDevice->waitUntilDrained();
ALOGE("%s: Camera %d: Waiting to stop streaming failed: %s (%d)", if (res != OK) {
__FUNCTION__, mCameraId, strerror(-res), res); ALOGE("%s: Camera %d: Waiting to stop streaming failed: %s (%d)",
__FUNCTION__, mCameraId, strerror(-res), res);
}
} }
}
res = mJpegProcessor->deleteStream();
if (res != OK) { res = mJpegProcessor->deleteStream();
ALOGE("%s: Camera %d: delete Jpeg stream failed: %s (%d)",
__FUNCTION__, mCameraId, strerror(-res), res);
}
if (activeRequestId != 0) {
res = mStreamingProcessor->togglePauseStream(/*pause*/false);
if (res != OK) { if (res != OK) {
ALOGE("%s: Camera %d: Can't unpause streaming: %s (%d)", ALOGE("%s: Camera %d: delete Jpeg stream failed: %s (%d)",
__FUNCTION__, mCameraId, strerror(-res), res); __FUNCTION__, mCameraId, strerror(-res), res);
}
if (activeRequestId != 0) {
res = mStreamingProcessor->togglePauseStream(/*pause*/false);
if (res != OK) {
ALOGE("%s: Camera %d: Can't unpause streaming: %s (%d)",
__FUNCTION__, mCameraId, strerror(-res), res);
}
} }
} }
} else { } else {

Write Preview
Loading…
Cancel
Save