Use @2.0::IGraphicBufferProducer in Codec2 modules
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug: 33350696
Bug: 112362730
Change-Id: Ia5ed8da1c1fa3ab9decbafd814783b68e9ac9adb
diff --git a/media/codec2/vndk/include/C2BqBufferPriv.h b/media/codec2/vndk/include/C2BqBufferPriv.h
index 9271a71..e1a8138 100644
--- a/media/codec2/vndk/include/C2BqBufferPriv.h
+++ b/media/codec2/vndk/include/C2BqBufferPriv.h
@@ -17,10 +17,11 @@
#ifndef STAGEFRIGHT_CODEC2_BQ_BUFFER_PRIV_H_
#define STAGEFRIGHT_CODEC2_BQ_BUFFER_PRIV_H_
-#include <functional>
+#include <android/hardware/graphics/bufferqueue/2.0/IGraphicBufferProducer.h>
#include <C2Buffer.h>
-#include <media/stagefright/bqhelper/WGraphicBufferProducer.h>
+
+#include <functional>
class C2BufferQueueBlockPool : public C2BlockPool {
public:
@@ -52,6 +53,8 @@
*/
virtual void setRenderCallback(const OnRenderCallback &renderCallback = OnRenderCallback());
+ typedef ::android::hardware::graphics::bufferqueue::V2_0::
+ IGraphicBufferProducer HGraphicBufferProducer;
/**
* Configures an IGBP in order to create blocks. A newly created block is
* dequeued from the configured IGBP. Unique Id of IGBP and the slot number of
@@ -62,7 +65,7 @@
*
* \param producer the IGBP, which will be used to fetch blocks
*/
- virtual void configureProducer(const android::sp<android::HGraphicBufferProducer> &producer);
+ virtual void configureProducer(const android::sp<HGraphicBufferProducer> &producer);
private:
const std::shared_ptr<C2Allocator> mAllocator;