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

Commit 5b991c8d authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "MediaCodecInfo: keep capabilities from XML when updating them from codec" into nyc-dev

parents 818382ee 69bebe8d

include/media/MediaCodecInfo.h

+3 −2
Original line number Diff line number Diff line
@@ -126,8 +126,9 @@ private: 
    void addQuirk(const char *name);

    status_t addMime(const char *mime);

    status_t updateMime(const char *mime);

    // after this call Capabilities will be owned by MediaCodecInfo

    status_t setCapabilities(const sp<Capabilities> &caps);

  

    // after this call |caps| will be owned by MediaCodecInfo, which may modify it

    status_t setCapabilitiesFromCodec(const sp<Capabilities> &caps);

    void addDetail(const AString &key, const AString &value);

    void addFeature(const AString &key, int32_t value);

    void addFeature(const AString &key, const char *value);

media/libmedia/MediaCodecInfo.cpp

+5 −1
Original line number Diff line number Diff line
@@ -238,7 +238,11 @@ void MediaCodecInfo::removeMime(const char *mime) { 
    }

}



status_t MediaCodecInfo::setCapabilities(const sp<Capabilities> &caps) {

status_t MediaCodecInfo::setCapabilitiesFromCodec(const sp<Capabilities> &caps) {

    if (mCurrentCaps != NULL) {

        // keep current capabilities map

        caps->mDetails = mCurrentCaps->mDetails;

    }

    mCurrentCaps = caps;

    return OK;

}

media/libstagefright/MediaCodecList.cpp

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ status_t MediaCodecList::initializeCapabilities(const char *type) { 
        return UNKNOWN_ERROR;

    }



    return mCurrentInfo->setCapabilities(caps);

    return mCurrentInfo->setCapabilitiesFromCodec(caps);

}



status_t MediaCodecList::addQuirk(const char **attrs) {