diff options
| author | Bill Yi <byi@google.com> | 2018-11-28 18:33:36 -0800 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2018-11-28 18:33:36 -0800 |
| commit | a3408c502312181dbe653a29ceb16819d5b51926 (patch) | |
| tree | 37eeb836eebb0518b17582b65225338d4a74da32 /camera/fake-pipeline2/JpegCompressor.cpp | |
| parent | d0425ec805c34752e30f94e5875577d56761709c (diff) | |
| parent | 225639a44dc0a02893f8cbd4ff02b58cd9454a35 (diff) | |
| download | android_device_generic_goldfish-a3408c502312181dbe653a29ceb16819d5b51926.tar.gz android_device_generic_goldfish-a3408c502312181dbe653a29ceb16819d5b51926.tar.bz2 android_device_generic_goldfish-a3408c502312181dbe653a29ceb16819d5b51926.zip | |
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Change-Id: Ie9db533b7a07e1085b177a1694799d6772f519ef
Diffstat (limited to 'camera/fake-pipeline2/JpegCompressor.cpp')
| -rw-r--r-- | camera/fake-pipeline2/JpegCompressor.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/camera/fake-pipeline2/JpegCompressor.cpp b/camera/fake-pipeline2/JpegCompressor.cpp index f4952b2..51de0c0 100644 --- a/camera/fake-pipeline2/JpegCompressor.cpp +++ b/camera/fake-pipeline2/JpegCompressor.cpp @@ -17,7 +17,7 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "EmulatedCamera2_JpegCompressor" -#include <utils/Log.h> +#include <log/log.h> #include "gralloc_cb.h" #include "JpegCompressor.h" @@ -131,7 +131,7 @@ bool JpegCompressor::threadLoop() { status_t JpegCompressor::compress() { // Find source and target buffers. Assumes only one buffer matches // each condition! - bool foundJpeg = false, mFoundAux = false; + bool mFoundAux = false; int thumbWidth = 0, thumbHeight = 0; unsigned char thumbJpegQuality = 90; unsigned char jpegQuality = 90; @@ -223,7 +223,6 @@ bool JpegCompressor::waitForDone(nsecs_t timeout) { } void JpegCompressor::cleanUp() { - status_t res; Mutex::Autolock lock(mBusyMutex); if (mFoundAux) { |