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

Commit 130eec82 authored by Sungtak Lee's avatar Sungtak Lee Committed by Automerger Merge Worker
Browse files

Merge "CCodec: Do not crash when there is no OMX service" into tm-dev am: 290faa49 am: 890b1e81 

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



Change-Id: I4dab412158f57e1669f2fc64fbbece8a3b7b563e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f778d1d 890b1e81

media/codec2/sfplugin/CCodec.cpp

+3 −0
Original line number Diff line number Diff line
@@ -1526,6 +1526,9 @@ sp<PersistentSurface> CCodec::CreateOmxInputSurface() { 
    using namespace android::hardware::graphics::bufferqueue::V1_0::utils;

    typedef android::hardware::media::omx::V1_0::Status OmxStatus;

    android::sp<IOmx> omx = IOmx::getService();

    if (omx == nullptr) {

        return nullptr;

    }

    typedef android::hardware::graphics::bufferqueue::V1_0::

            IGraphicBufferProducer HGraphicBufferProducer;

    typedef android::hardware::media::omx::V1_0::