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

Commit 3644001e authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Make a copy of output format in onOutputFormatChanged" into qt-qpr1-dev 

am: 863695e7

Change-Id: I2927d2a6cef66c31c18d0ad942830f59d9556a57
parents 15acd121 863695e7

media/ndk/NdkMediaCodec.cpp

+7 −1
Original line number Diff line number Diff line
@@ -221,7 +221,13 @@ void CodecHandler::onMessageReceived(const sp<AMessage> &msg) { 
                         break;

                     }



                     AMediaFormat *aMediaFormat = AMediaFormat_fromMsg(&format);

                     // Here format is MediaCodec's internal copy of output format.

                     // Make a copy since the client might modify it.

                     sp<AMessage> copy;

                     if (format != nullptr) {

                         copy = format->dup();

                     }

                     AMediaFormat *aMediaFormat = AMediaFormat_fromMsg(&copy);



                     Mutex::Autolock _l(mCodec->mAsyncCallbackLock);

                     if (mCodec->mAsyncCallbackUserData != NULL

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+7 −2
Original line number Diff line number Diff line
@@ -1671,8 +1671,13 @@ void HeicCompositeStream::CodecCallbackHandler::onMessageReceived(const sp<AMess 
                         ALOGE("CB_OUTPUT_FORMAT_CHANGED: format is expected.");

                         break;

                     }



                     parent->onHeicFormatChanged(format);

                     // Here format is MediaCodec's internal copy of output format.

                     // Make a copy since onHeicFormatChanged() might modify it.

                     sp<AMessage> formatCopy;

                     if (format != nullptr) {

                         formatCopy = format->dup();

                     }

                     parent->onHeicFormatChanged(formatCopy);

                     break;

                 }