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

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

Merge "Move WGraphicBufferProducer from omx to bqhelper"

parents 798b6244 82832ceb

media/libstagefright/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -130,10 +130,10 @@ cc_library_shared { 
        "libui",

        "libutils",

        "libmedia_helper",

        "libstagefright_bufferqueue_helper",

        "libstagefright_codec2",

        "libstagefright_codec2_vndk",

        "libstagefright_foundation",

        "libstagefright_gbs",

        "libstagefright_omx",

        "libstagefright_omx_utils",

        "libstagefright_xmlparser",

media/libstagefright/gbs/Android.bp→media/libstagefright/bqhelper/Android.bp

+12 −5
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libstagefright_gbs",

    name: "libstagefright_bufferqueue_helper",

    vendor_available: true,

    vndk: {

        enabled: true,
@@ -8,6 +8,7 @@ cc_library_shared { 
    srcs: [

        "FrameDropper.cpp",

        "GraphicBufferSource.cpp",

        "WProducerListener.cpp",

    ],



    export_include_dirs: [
@@ -25,12 +26,18 @@ cc_library_shared { 
    shared_libs: [

        "libbase",

        "libbinder",

        "libutils",

        "liblog",

        "libui",

        "libgui",

        "libcutils",

        "libgui",

        "libhidlbase",

        "libhidlmemory",

        "libhidltransport",

        "liblog",

        "libstagefright_foundation",

        "libui",

        "libutils",



        "android.hardware.graphics.bufferqueue@1.0",



        "libnativewindow", // TODO(b/62923479): use header library

    ],

media/libstagefright/gbs/FrameDropper.cpp→media/libstagefright/bqhelper/FrameDropper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define LOG_TAG "FrameDropper"

#include <utils/Log.h>



#include <media/stagefright/gbs/FrameDropper.h>

#include <media/stagefright/bqhelper/FrameDropper.h>

#include <media/stagefright/foundation/ADebug.h>



namespace android {

media/libstagefright/gbs/GraphicBufferSource.cpp→media/libstagefright/bqhelper/GraphicBufferSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 


#define STRINGIFY_ENUMS // for asString in HardwareAPI.h/VideoAPI.h



#include <media/stagefright/gbs/GraphicBufferSource.h>

#include <media/stagefright/gbs/FrameDropper.h>

#include <media/stagefright/bqhelper/GraphicBufferSource.h>

#include <media/stagefright/bqhelper/FrameDropper.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/AMessage.h>

#include <media/stagefright/foundation/ColorUtils.h>

media/libstagefright/omx/1.0/WProducerListener.cpp→media/libstagefright/bqhelper/WProducerListener.cpp

+1 −11
Original line number Diff line number Diff line
@@ -14,14 +14,9 @@ 
 * limitations under the License.

 */



#include <media/stagefright/omx/1.0/WProducerListener.h>

#include <media/stagefright/bqhelper/WProducerListener.h>



namespace android {

namespace hardware {

namespace media {

namespace omx {

namespace V1_0 {

namespace implementation {



// TWProducerListener

TWProducerListener::TWProducerListener(
@@ -52,9 +47,4 @@ bool LWProducerListener::needsReleaseNotify() { 
    return static_cast<bool>(mBase->needsReleaseNotify());

}



}  // namespace implementation

}  // namespace V1_0

}  // namespace omx

}  // namespace media

}  // namespace hardware

}  // namespace android