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

Commit a45c300f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "OMX: don't respect binderization toggle."

parents 99c915d3 373580e1

cmds/stagefright/stagefright.cpp

+1 −1
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ int main(int argc, char **argv) { 
        sp<IOMX> omx;

        int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);

        if ((trebleOmx == 1) || ((trebleOmx == -1) &&

                property_get_bool("persist.hal.binderization", 0))) {

                property_get_bool("omx.binderization", 0))) {

            using namespace ::android::hardware::media::omx::V1_0;

            sp<IOmx> tOmx = IOmx::getService();

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ sp<MediaPlayerBase> MediaPlayerService::Client::setDataSource_pre( 


    int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);

    if ((trebleOmx == 1) || ((trebleOmx == -1) &&

            property_get_bool("persist.hal.binderization", 0))) {

            property_get_bool("omx.binderization", 0))) {

        // Treble IOmx

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

        if (omx == nullptr) {

media/libmediaplayerservice/MediaRecorderClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ status_t MediaRecorderClient::setListener(const sp<IMediaRecorderClient>& listen 


    int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);

    if ((trebleOmx == 1) || ((trebleOmx == -1) &&

            property_get_bool("persist.hal.binderization", 0))) {

            property_get_bool("omx.binderization", 0))) {

        // Treble IOmx

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

        if (omx == nullptr) {

media/libstagefright/OMXClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ OMXClient::OMXClient() { 
status_t OMXClient::connect(bool* trebleFlag) {

    int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);

    if ((trebleOmx == 1) || ((trebleOmx == -1) &&

            property_get_bool("persist.hal.binderization", 0))) {

            property_get_bool("omx.binderization", 0))) {

        if (trebleFlag != nullptr) {

            *trebleFlag = true;

        }

media/libstagefright/omx/tests/OMXHarness.cpp

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ status_t Harness::initCheck() const { 
status_t Harness::initOMX() {

    int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);

    if ((trebleOmx == 1) || ((trebleOmx == -1) &&

            property_get_bool("persist.hal.binderization", 0))) {

            property_get_bool("omx.binderization", 0))) {

        using namespace ::android::hardware::media::omx::V1_0;

        sp<IOmx> tOmx = IOmx::getService();

        if (tOmx == nullptr) {