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

Commit 146122cf authored by Divya Sharma's avatar Divya Sharma
Browse files

Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002' into HEAD 

"AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002"

Conflicts:
	media/libmediaplayerservice/nuplayer/GenericSource.cpp
	media/libmediaplayerservice/nuplayer/NuPlayer.cpp
	media/libstagefright/include/ExtendedUtils.hi

Change-Id: If6fb7f0a571cd4bdce0a436632e695d86b0018b7
parents bc913d94 27dba52d

camera/CameraParameters.cpp

+5 −0
Original line number Diff line number Diff line
@@ -490,6 +490,11 @@ void CameraParameters::getSupportedPreviewFormats(Vector<int>& formats) const { 
    const char* supportedPreviewFormats =

          get(CameraParameters::KEY_SUPPORTED_PREVIEW_FORMATS);



    if (supportedPreviewFormats == NULL) {

        ALOGW("%s: No supported preview formats.", __FUNCTION__);

        return;

    }



    String8 fmtStr(supportedPreviewFormats);

    char* prevFmts = fmtStr.lockBuffer(fmtStr.size());

camera/camera2/CaptureRequest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -63,9 +63,9 @@ status_t CaptureRequest::readFromParcel(Parcel* parcel) { 
        }



        // Surface.writeToParcel

        String16 name = parcel->readString16();

        ALOGV("%s: Read surface name = %s",

              __FUNCTION__, String8(name).string());

        const char16_t* name = parcel->readString16Inplace(&len);

        ALOGV("%s: Read surface name = %s", __FUNCTION__,

            name != NULL ? String8(name).string() : "<null>");

        sp<IBinder> binder(parcel->readStrongBinder());

        ALOGV("%s: Read surface binder = %p",

              __FUNCTION__, binder.get());

cmds/screenrecord/FrameOutput.cpp

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ void FrameOutput::reduceRgbaToRgb(uint8_t* buf, unsigned int pixelCount) { 
}



// Callback; executes on arbitrary thread.

void FrameOutput::onFrameAvailable() {

void FrameOutput::onFrameAvailable(const BufferItem& /* item */) {

    Mutex::Autolock _l(mMutex);

    mFrameAvailable = true;

    mEventCond.signal();

cmds/screenrecord/FrameOutput.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ private: 
    }



    // (overrides GLConsumer::FrameAvailableListener method)

    virtual void onFrameAvailable();

    virtual void onFrameAvailable(const BufferItem& item);



    // Reduces RGBA to RGB, in place.

    static void reduceRgbaToRgb(uint8_t* buf, unsigned int pixelCount);

cmds/screenrecord/Overlay.cpp

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ void Overlay::getTimeString_l(nsecs_t monotonicNsec, char* buf, size_t bufLen) { 
}



// Callback; executes on arbitrary thread.

void Overlay::onFrameAvailable() {

void Overlay::onFrameAvailable(const BufferItem& /* item */) {

    ALOGV("Overlay::onFrameAvailable");

    Mutex::Autolock _l(mMutex);

    mFrameAvailable = true;