Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c679d41 authored by Colin Cross's avatar Colin Cross
Browse files

resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp 

Change-Id: Ia6d87d56174d1388c1148fb55b6e4bc57d8666db
parents ba139033 3d7c5002

services/camera/libcameraservice/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -59,6 +59,5 @@ LOCAL_C_INCLUDES += \ 
LOCAL_CFLAGS += -Wall -Wextra



LOCAL_MODULE:= libcameraservice

LOCAL_32_BIT_ONLY := true



include $(BUILD_SHARED_LIBRARY)

services/camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ void CameraService::onDeviceStatusChanged(int cameraId, 
             */

        }



        ALOGV("%s: After unplug, disconnected %d clients",

        ALOGV("%s: After unplug, disconnected %zu clients",

              __FUNCTION__, clientsToDisconnect.size());

    }

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

+4 −2
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#define ATRACE_TAG ATRACE_TAG_CAMERA

//#define LOG_NDEBUG 0



#include <inttypes.h>



#include <utils/Log.h>

#include <utils/Trace.h>

#include <utils/Vector.h>
@@ -585,8 +587,8 @@ CaptureSequencer::CaptureState CaptureSequencer::manageStandardCaptureWait( 
            ALOGE("No timestamp field in capture frame!");

        }

        if (entry.data.i64[0] != mCaptureTimestamp) {

            ALOGW("Mismatched capture timestamps: Metadata frame %lld,"

                    " captured buffer %lld",

            ALOGW("Mismatched capture timestamps: Metadata frame %" PRId64 ","

                    " captured buffer %" PRId64,

                    entry.data.i64[0],

                    mCaptureTimestamp);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ status_t FrameProcessor::processFaceDetect(const CameraMetadata &frame, 
                continue;

            }

            if (faceScores[i] > 100) {

                ALOGW("%s: Face index %d with out of range score %d",

                ALOGW("%s: Face index %zu with out of range score %d",

                        __FUNCTION__, i, faceScores[i]);

            }

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

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ void JpegCompressor::jpegErrorHandler(j_common_ptr cinfo) { 
void JpegCompressor::jpegInitDestination(j_compress_ptr cinfo) {

    ALOGV("%s", __FUNCTION__);

    JpegDestination *dest= static_cast<JpegDestination*>(cinfo->dest);

    ALOGV("%s: Setting destination to %p, size %d",

    ALOGV("%s: Setting destination to %p, size %zu",

            __FUNCTION__, dest->parent->mJpegBuffer->data, kMaxJpegSize);

    dest->next_output_byte = (JOCTET*)(dest->parent->mJpegBuffer->data);

    dest->free_in_buffer = kMaxJpegSize;
@@ -213,7 +213,7 @@ boolean JpegCompressor::jpegEmptyOutputBuffer(j_compress_ptr /*cinfo*/) { 
void JpegCompressor::jpegTermDestination(j_compress_ptr cinfo) {

    (void) cinfo; // TODO: clean up

    ALOGV("%s", __FUNCTION__);

    ALOGV("%s: Done writing JPEG data. %d bytes left in buffer",

    ALOGV("%s: Done writing JPEG data. %zu bytes left in buffer",

            __FUNCTION__, cinfo->dest->free_in_buffer);

}