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

Commit bbf03557 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Add two creation flags to OMXCodec::Create()"

parents deeb9612 d332a72e

include/media/stagefright/OMXCodec.h

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ struct OMXCodec : public MediaSource, 
        // The client wants to access the output buffer's video

        // data for example for thumbnail extraction.

        kClientNeedsFramebuffer  = 4,



        // Request for software or hardware codecs. If request

        // can not be fullfilled, Create() returns NULL.

        kSoftwareCodecsOnly      = 8,

        kHardwareCodecsOnly      = 16,

    };

    static sp<MediaSource> Create(

            const sp<IOMX> &omx,

media/libstagefright/OMXCodec.cpp

+10 −1
Original line number Diff line number Diff line
@@ -450,8 +450,17 @@ void OMXCodec::findMatchingCodecs( 
            continue;

        }



        // When requesting software-only codecs, only push software codecs

        // When requesting hardware-only codecs, only push hardware codecs

        // When there is request neither for software-only nor for

        // hardware-only codecs, push all codecs

        if (((flags & kSoftwareCodecsOnly) &&   IsSoftwareCodec(componentName)) ||

            ((flags & kHardwareCodecsOnly) &&  !IsSoftwareCodec(componentName)) ||

            (!(flags & (kSoftwareCodecsOnly | kHardwareCodecsOnly)))) {



            matchingCodecs->push(String8(componentName));

        }

    }



    if (flags & kPreferSoftwareCodecs) {

        matchingCodecs->sort(CompareSoftwareCodecsFirst);