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

Commit e62f0d89 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "libstagefright: modify "dataspace" prints ambiguously" am: 8f51caff... 

Merge "libstagefright: modify "dataspace" prints ambiguously" am: 8f51caff am: f39c9de8 am: 4b4da6ff

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2308867



Change-Id: Ie4ebff6cf4a1b84ceef2de27f2e6b0795a68f000
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a05bc448 4b4da6ff

media/libstagefright/MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4762,7 +4762,7 @@ void MediaCodec::handleOutputFormatChangeIfNeeded(const sp<MediaCodecBuffer> &bu 
        // rendering.

        int32_t dataSpace;

        if (mOutputFormat->findInt32("android._dataspace", &dataSpace)) {

            ALOGD("[%s] setting dataspace on output surface to #%x",

            ALOGD("[%s] setting dataspace on output surface to %#x",

                    mComponentName.c_str(), dataSpace);

            int err = native_window_set_buffers_data_space(

                    mSurface.get(), (android_dataspace)dataSpace);

media/libstagefright/colorconversion/SoftwareRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ skip_copying: 
                    ((dataSpace & ~HAL_DATASPACE_RANGE_MASK) | HAL_DATASPACE_RANGE_FULL);

        }



        ALOGD("setting dataspace on output surface to #%x", dataSpace);

        ALOGD("setting dataspace on output surface to %#x", dataSpace);

        if ((err = native_window_set_buffers_data_space(mNativeWindow.get(), dataSpace))) {

            ALOGW("failed to set dataspace on surface (%d)", err);

        }