diff --git a/media/bufferpool/2.0/AccessorImpl.cpp b/media/bufferpool/2.0/AccessorImpl.cpp index 01653145f3..2c734ac565 100644 --- a/media/bufferpool/2.0/AccessorImpl.cpp +++ b/media/bufferpool/2.0/AccessorImpl.cpp @@ -282,7 +282,7 @@ std::atomic Accessor::Impl::BufferPool::Invalidation::sInvSeqId(0 Accessor::Impl::Impl::BufferPool::~BufferPool() { std::lock_guard lock(mMutex); - ALOGD("Destruction - bufferpool %p " + ALOGD("Destruction - bufferpool2 %p " "cached: %zu/%zuM, %zu/%d%% in use; " "allocs: %zu, %d%% recycled; " "transfers: %zu, %d%% unfetced", @@ -353,12 +353,12 @@ void Accessor::Impl::BufferPool::Invalidation::onInvalidationRequest( msgId = ++mInvalidationId; } } - ALOGV("bufferpool invalidation requested and queued"); + ALOGV("bufferpool2 invalidation requested and queued"); if (left == 0) { channel.postInvalidation(msgId, from, to); } else { // TODO: sending hint message? - ALOGV("bufferpool invalidation requested and pending"); + ALOGV("bufferpoo2 invalidation requested and pending"); Pending pending(needsAck, from, to, left, impl); mPendings.push_back(pending); } @@ -380,7 +380,7 @@ void Accessor::Impl::BufferPool::Invalidation::onHandleAck() { // lost. it->second = mInvalidationId; } else { - ALOGV("bufferpool observer died %lld", (long long)it->first); + ALOGV("bufferpool2 observer died %lld", (long long)it->first); deads.insert(it->first); } } @@ -682,7 +682,7 @@ void Accessor::Impl::BufferPool::cleanUp(bool clearCache) { mLastCleanUpUs = mTimestampUs; if (mTimestampUs > mLastLogUs + kLogDurationUs) { mLastLogUs = mTimestampUs; - ALOGD("bufferpool %p : %zu(%zu size) total buffers - " + ALOGD("bufferpool2 %p : %zu(%zu size) total buffers - " "%zu(%zu size) used buffers - %zu/%zu (recycle/alloc) - " "%zu/%zu (fetch/transfer)", this, mStats.mBuffersCached, mStats.mSizeCached, @@ -703,7 +703,7 @@ void Accessor::Impl::BufferPool::cleanUp(bool clearCache) { freeIt = mFreeBuffers.erase(freeIt); } else { ++freeIt; - ALOGW("bufferpool inconsistent!"); + ALOGW("bufferpool2 inconsistent!"); } } } @@ -722,7 +722,7 @@ void Accessor::Impl::BufferPool::invalidate( freeIt = mFreeBuffers.erase(freeIt); continue; } else { - ALOGW("bufferpool inconsistent!"); + ALOGW("bufferpool2 inconsistent!"); } } ++freeIt; diff --git a/media/bufferpool/2.0/BufferPoolClient.cpp b/media/bufferpool/2.0/BufferPoolClient.cpp index 5564a1354c..f907de5306 100644 --- a/media/bufferpool/2.0/BufferPoolClient.cpp +++ b/media/bufferpool/2.0/BufferPoolClient.cpp @@ -811,7 +811,7 @@ ResultStatus BufferPoolClient::getAccessor(sp *accessor) { } void BufferPoolClient::receiveInvalidation(uint32_t msgId) { - ALOGV("bufferpool client recv inv %u", msgId); + ALOGV("bufferpool2 client recv inv %u", msgId); if (isValid()) { mImpl->receiveInvalidation(msgId); } diff --git a/media/codec2/hidl/1.0/utils/Android.bp b/media/codec2/hidl/1.0/utils/Android.bp index 455de50e79..c5ad6a01c8 100644 --- a/media/codec2/hidl/1.0/utils/Android.bp +++ b/media/codec2/hidl/1.0/utils/Android.bp @@ -24,7 +24,7 @@ cc_library { "android.hardware.graphics.bufferqueue@1.0", "android.hardware.graphics.common@1.0", "android.hardware.media@1.0", - "android.hardware.media.bufferpool@1.0", + "android.hardware.media.bufferpool@2.0", "android.hardware.media.c2@1.0", "android.hardware.media.omx@1.0", "libbase", @@ -35,7 +35,7 @@ cc_library { "libhidltransport", "libhwbinder", "liblog", - "libstagefright_bufferpool@1.0", + "libstagefright_bufferpool@2.0", "libstagefright_bufferqueue_helper", "libui", "libutils", @@ -49,7 +49,7 @@ cc_library { "android.hardware.media.c2@1.0", "libcodec2", "libhidlbase", - "libstagefright_bufferpool@1.0", + "libstagefright_bufferpool@2.0", "libstagefright_bufferqueue_helper", "libui", ], diff --git a/media/codec2/hidl/1.0/utils/Component.cpp b/media/codec2/hidl/1.0/utils/Component.cpp index aa4c6b22de..5ae1972a28 100644 --- a/media/codec2/hidl/1.0/utils/Component.cpp +++ b/media/codec2/hidl/1.0/utils/Component.cpp @@ -410,7 +410,7 @@ Component::Component( const std::shared_ptr& component, const sp& listener, const sp& store, - const sp<::android::hardware::media::bufferpool::V1_0:: + const sp<::android::hardware::media::bufferpool::V2_0:: IClientManager>& clientPoolManager) : Configurable(new CachedConfigurable( std::make_unique(component->intf()))), diff --git a/media/codec2/hidl/1.0/utils/ComponentStore.cpp b/media/codec2/hidl/1.0/utils/ComponentStore.cpp index 1d1bbe081c..9c05014f00 100644 --- a/media/codec2/hidl/1.0/utils/ComponentStore.cpp +++ b/media/codec2/hidl/1.0/utils/ComponentStore.cpp @@ -57,7 +57,7 @@ namespace utils { using namespace ::android; using ::android::GraphicBufferSource; -using namespace ::android::hardware::media::bufferpool::V1_0::implementation; +using namespace ::android::hardware::media::bufferpool::V2_0::implementation; namespace /* unnamed */ { diff --git a/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/Component.h b/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/Component.h index 36dec1c8f2..0908226b87 100644 --- a/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/Component.h +++ b/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/Component.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -71,7 +71,7 @@ struct Component : public Configurable { const std::shared_ptr&, const sp& listener, const sp& store, - const sp<::android::hardware::media::bufferpool::V1_0:: + const sp<::android::hardware::media::bufferpool::V2_0:: IClientManager>& clientPoolManager); c2_status_t status() const; diff --git a/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/ComponentStore.h b/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/ComponentStore.h index 5821e8a239..41e14160f1 100644 --- a/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/ComponentStore.h +++ b/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/ComponentStore.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include @@ -40,7 +40,7 @@ namespace c2 { namespace V1_0 { namespace utils { -using ::android::hardware::media::bufferpool::V1_0::IClientManager; +using ::android::hardware::media::bufferpool::V2_0::IClientManager; using ::android::hardware::hidl_array; using ::android::hardware::hidl_handle; diff --git a/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/types.h b/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/types.h index 58f5c96a11..d8a50b609a 100644 --- a/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/types.h +++ b/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/types.h @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -46,7 +46,7 @@ using ::android::hardware::hidl_string; using ::android::hardware::hidl_vec; using ::android::status_t; using ::android::sp; -using ::android::hardware::media::bufferpool::V1_0::implementation:: +using ::android::hardware::media::bufferpool::V2_0::implementation:: ConnectionId; using ::android::IGraphicBufferProducer; @@ -131,9 +131,9 @@ c2_status_t objcpy( // Abstract class to be used in // objcpy(std::list> -> WorkBundle). struct BufferPoolSender { - typedef ::android::hardware::media::bufferpool::V1_0:: + typedef ::android::hardware::media::bufferpool::V2_0:: ResultStatus ResultStatus; - typedef ::android::hardware::media::bufferpool::V1_0:: + typedef ::android::hardware::media::bufferpool::V2_0:: BufferStatusMessage BufferStatusMessage; typedef ::android::hardware::media::bufferpool:: BufferPoolData BufferPoolData; @@ -151,7 +151,7 @@ struct BufferPoolSender { * other means so it can call receive() properly. * \return ResultStatus value that determines the success of the operation. * (See the possible values of ResultStatus in - * hardware/interfaces/media/bufferpool/1.0/types.hal.) + * hardware/interfaces/media/bufferpool/2.0/types.hal.) */ virtual ResultStatus send( const std::shared_ptr& bpData, @@ -168,9 +168,9 @@ struct BufferPoolSender { // IClientManager::registerSender() to establish the bufferpool connection when // send() is called. struct DefaultBufferPoolSender : BufferPoolSender { - typedef ::android::hardware::media::bufferpool::V1_0::implementation:: + typedef ::android::hardware::media::bufferpool::V2_0::implementation:: ClientManager ClientManager; - typedef ::android::hardware::media::bufferpool::V1_0:: + typedef ::android::hardware::media::bufferpool::V2_0:: IClientManager IClientManager; // Set the IClientManager instance of the receiving process and the refresh @@ -278,7 +278,7 @@ c2_status_t updateParamsFromBlob( * \param BufferPool status * \return Corresponding c2_status_t */ -c2_status_t toC2Status(::android::hardware::media::bufferpool::V1_0:: +c2_status_t toC2Status(::android::hardware::media::bufferpool::V2_0:: ResultStatus rs); // BufferQueue-Based Block Operations diff --git a/media/codec2/hidl/1.0/utils/types.cpp b/media/codec2/hidl/1.0/utils/types.cpp index 5827504155..c053bc1257 100644 --- a/media/codec2/hidl/1.0/utils/types.cpp +++ b/media/codec2/hidl/1.0/utils/types.cpp @@ -49,11 +49,11 @@ namespace utils { using namespace ::android; using ::android::hardware::Return; using ::android::hardware::media::bufferpool::BufferPoolData; -using ::android::hardware::media::bufferpool::V1_0::BufferStatusMessage; -using ::android::hardware::media::bufferpool::V1_0::ResultStatus; -using ::android::hardware::media::bufferpool::V1_0::implementation:: +using ::android::hardware::media::bufferpool::V2_0::BufferStatusMessage; +using ::android::hardware::media::bufferpool::V2_0::ResultStatus; +using ::android::hardware::media::bufferpool::V2_0::implementation:: ClientManager; -using ::android::hardware::media::bufferpool::V1_0::implementation:: +using ::android::hardware::media::bufferpool::V2_0::implementation:: TransactionId; using ::android::TWGraphicBufferProducer; diff --git a/media/codec2/hidl/client/Android.bp b/media/codec2/hidl/client/Android.bp index bdc02d21ed..a2a498d2b7 100644 --- a/media/codec2/hidl/client/Android.bp +++ b/media/codec2/hidl/client/Android.bp @@ -7,7 +7,7 @@ cc_library { shared_libs: [ "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.media.bufferpool@1.0", + "android.hardware.media.bufferpool@2.0", "android.hardware.media.c2@1.0", "libbase", "libbinder", @@ -19,7 +19,7 @@ cc_library { "libhidlbase", "libhidltransport", "liblog", - "libstagefright_bufferpool@1.0", + "libstagefright_bufferpool@2.0", "libstagefright_bufferqueue_helper", "libui", "libutils", diff --git a/media/codec2/hidl/client/client.cpp b/media/codec2/hidl/client/client.cpp index 26bd96c23f..ff3e5340f9 100644 --- a/media/codec2/hidl/client/client.cpp +++ b/media/codec2/hidl/client/client.cpp @@ -34,7 +34,7 @@ #include #undef LOG -#include +#include #include #include #include @@ -55,8 +55,8 @@ using ::android::TWGraphicBufferProducer; using namespace ::android::hardware::media::c2::V1_0; using namespace ::android::hardware::media::c2::V1_0::utils; -using namespace ::android::hardware::media::bufferpool::V1_0; -using namespace ::android::hardware::media::bufferpool::V1_0::implementation; +using namespace ::android::hardware::media::bufferpool::V2_0; +using namespace ::android::hardware::media::bufferpool::V2_0::implementation; namespace /* unnamed */ { diff --git a/media/codec2/hidl/client/include/codec2/hidl/client.h b/media/codec2/hidl/client/include/codec2/hidl/client.h index 3ab3967445..c48bf0cd51 100644 --- a/media/codec2/hidl/client/include/codec2/hidl/client.h +++ b/media/codec2/hidl/client/include/codec2/hidl/client.h @@ -85,9 +85,9 @@ namespace android { namespace hardware { namespace media { namespace bufferpool { -namespace V1_0 { +namespace V2_0 { struct IClientManager; -} // namespace V1_0 +} // namespace V2_0 } // namespace bufferpool } // namespace media } // namespace hardware @@ -237,7 +237,7 @@ protected: mutable std::vector>> mAliasesBuffer; - sp<::android::hardware::media::bufferpool::V1_0::IClientManager> + sp<::android::hardware::media::bufferpool::V2_0::IClientManager> mHostPoolManager; }; diff --git a/media/codec2/vndk/Android.bp b/media/codec2/vndk/Android.bp index 0eb90be638..e0b1355da4 100644 --- a/media/codec2/vndk/Android.bp +++ b/media/codec2/vndk/Android.bp @@ -35,7 +35,7 @@ cc_library_shared { export_shared_lib_headers: [ "libbase", - "android.hardware.media.bufferpool@1.0", + "android.hardware.media.bufferpool@2.0", ], local_include_dirs: [ @@ -51,7 +51,7 @@ cc_library_shared { "android.hardware.graphics.allocator@2.0", "android.hardware.graphics.bufferqueue@1.0", "android.hardware.graphics.mapper@2.0", - "android.hardware.media.bufferpool@1.0", + "android.hardware.media.bufferpool@2.0", "libbase", "libbinder", "libcutils", @@ -63,7 +63,7 @@ cc_library_shared { "liblog", "libstagefright_bufferqueue_helper", "libstagefright_foundation", - "libstagefright_bufferpool@1.0", + "libstagefright_bufferpool@2.0", "libui", "libutils", ], diff --git a/media/codec2/vndk/C2Buffer.cpp b/media/codec2/vndk/C2Buffer.cpp index 47366ca52a..710b536ef7 100644 --- a/media/codec2/vndk/C2Buffer.cpp +++ b/media/codec2/vndk/C2Buffer.cpp @@ -33,12 +33,12 @@ namespace { using android::C2AllocatorGralloc; using android::C2AllocatorIon; using android::hardware::media::bufferpool::BufferPoolData; -using android::hardware::media::bufferpool::V1_0::ResultStatus; -using android::hardware::media::bufferpool::V1_0::implementation::BufferPoolAllocation; -using android::hardware::media::bufferpool::V1_0::implementation::BufferPoolAllocator; -using android::hardware::media::bufferpool::V1_0::implementation::ClientManager; -using android::hardware::media::bufferpool::V1_0::implementation::ConnectionId; -using android::hardware::media::bufferpool::V1_0::implementation::INVALID_CONNECTIONID; +using android::hardware::media::bufferpool::V2_0::ResultStatus; +using android::hardware::media::bufferpool::V2_0::implementation::BufferPoolAllocation; +using android::hardware::media::bufferpool::V2_0::implementation::BufferPoolAllocator; +using android::hardware::media::bufferpool::V2_0::implementation::ClientManager; +using android::hardware::media::bufferpool::V2_0::implementation::ConnectionId; +using android::hardware::media::bufferpool::V2_0::implementation::INVALID_CONNECTIONID; // This anonymous namespace contains the helper classes that allow our implementation to create // block/buffer objects. diff --git a/media/codec2/vndk/include/C2BufferPriv.h b/media/codec2/vndk/include/C2BufferPriv.h index d0b9152c1b..be5f69cdb8 100644 --- a/media/codec2/vndk/include/C2BufferPriv.h +++ b/media/codec2/vndk/include/C2BufferPriv.h @@ -20,7 +20,7 @@ #include #include -#include +#include class C2BasicLinearBlockPool : public C2BlockPool { public: @@ -112,7 +112,7 @@ public: * \return true IAcessor is writen successfully. * \return false IAccessor is not written. */ - bool getAccessor(android::sp *accessor); + bool getAccessor(android::sp *accessor); private: const std::shared_ptr mAllocator;