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

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

[conflict] Merge changes from topic "reland-64bit-omx" into main am:... 

[conflict] Merge changes from topic "reland-64bit-omx" into main am: f67a94c5 am: df50b6d3 am: bd6c62b7 am: c468e5ad

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



Change-Id: I9f97fc2a016883841966cd282ebeda52745ee426
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9821bba c468e5ad

media/libstagefright/omx/OmxGraphicBufferSource.cpp

+12 −0
Original line number Diff line number Diff line
@@ -79,6 +79,18 @@ Status OmxGraphicBufferSource::onOmxLoaded(){ 
    return (OK == err) ? Status::ok() : Status::fromServiceSpecificError(err);

}



status_t OmxGraphicBufferSource::configure(

        const sp<IOmxNodeWrapper>& omxNode,

        int32_t dataSpace,

        int32_t bufferCount,

        uint32_t frameWidth,

        uint32_t frameHeight,

        uint32_t consumerUsage) {

    uint64_t consumerUsage64 = static_cast<uint64_t>(consumerUsage);

    return configure(omxNode, dataSpace, bufferCount,

                     frameWidth, frameHeight, consumerUsage64);

}



status_t OmxGraphicBufferSource::configure(

        const sp<IOmxNodeWrapper>& omxNode,

        int32_t dataSpace,

media/libstagefright/omx/include/media/stagefright/omx/OmxGraphicBufferSource.h

+13 −1
Original line number Diff line number Diff line
@@ -63,7 +63,19 @@ public: 
    // ------------------------------



    // Configure the buffer source to be used with an OMX node with the default

    // data space.

    // data space.(32-bit consumerUsage flag, for vendor partition

    // compatibility)

    [[deprecated("use configure() with a 64-bit consumerUsage flag instead")]]

    status_t configure(

        const sp<IOmxNodeWrapper> &omxNode,

        int32_t dataSpace,

        int32_t bufferCount,

        uint32_t frameWidth,

        uint32_t frameHeight,

        uint32_t consumerUsage);



    // Configure the buffer source to be used with an OMX node with the default

    // data space. (64-bit consumerUsage flag)

    status_t configure(

        const sp<IOmxNodeWrapper> &omxNode,

        int32_t dataSpace,

media/module/bqhelper/GraphicBufferSource.cpp

+12 −0
Original line number Diff line number Diff line
@@ -1144,6 +1144,18 @@ void GraphicBufferSource::onSidebandStreamChanged() { 
    ALOG_ASSERT(false, "GraphicBufferSource can't consume sideband streams");

}



status_t GraphicBufferSource::configure(

        const sp<ComponentWrapper>& component,

        int32_t dataSpace,

        int32_t bufferCount,

        uint32_t frameWidth,

        uint32_t frameHeight,

        uint32_t consumerUsage) {

    uint64_t consumerUsage64 = static_cast<uint64_t>(consumerUsage);

    return configure(component, dataSpace, bufferCount,

                     frameWidth, frameHeight, consumerUsage64);

}



status_t GraphicBufferSource::configure(

        const sp<ComponentWrapper>& component,

        int32_t dataSpace,

media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h

+13 −1
Original line number Diff line number Diff line
@@ -122,7 +122,19 @@ public: 
    // ------------------------------



    // Configure the buffer source to be used with a component with the default

    // data space.

    // data space. (32-bit consumerUsage flag, for vendor partition

    // compatibility)

    [[deprecated("use configure() with a 64-bit consumerUsage flag instead")]]

    status_t configure(

        const sp<ComponentWrapper> &component,

        int32_t dataSpace,

        int32_t bufferCount,

        uint32_t frameWidth,

        uint32_t frameHeight,

        uint32_t consumerUsage);



    // Configure the buffer source to be used with a component with the default

    // data space. (64-bit consumerUsage flag)

    status_t configure(

        const sp<ComponentWrapper> &component,

        int32_t dataSpace,