Revert "Fix decoder instantiation during playback"
This reverts commit 33327c7f0f04bcce3f8e8ee23953f87efc423037.
Bug: 36479980
Bug: 36209723
Change-Id: I8ff9422086f5ba9ba5df60135d20b9d8bfc0be52
diff --git a/drm/libmediadrm/CryptoHal.cpp b/drm/libmediadrm/CryptoHal.cpp
index 9f41403..1466222 100644
--- a/drm/libmediadrm/CryptoHal.cpp
+++ b/drm/libmediadrm/CryptoHal.cpp
@@ -228,11 +228,11 @@
void CryptoHal::setHeapBase(const sp<IMemoryHeap>& heap) {
native_handle_t* nativeHandle = native_handle_create(1, 0);
if (!nativeHandle) {
- ALOGE("setHeapBase(), failed to create native handle");
+ ALOGE("setSharedBufferBase(), failed to create native handle");
return;
}
if (heap == NULL) {
- ALOGE("setHeapBase(): heap is NULL");
+ ALOGE("setSharedBufferBase(): heap is NULL");
return;
}
int fd = heap->getHeapID();
@@ -244,10 +244,6 @@
ALOGE_IF(!hResult.isOk(), "setSharedBufferBase(): remote call failed");
}
-void CryptoHal::clearHeapBase(const sp<IMemoryHeap>& heap) {
- mHeapBases.removeItem(heap->getBase());
-}
-
status_t CryptoHal::toSharedBuffer(const sp<IMemory>& memory, ::SharedBuffer* buffer) {
ssize_t offset;
size_t size;
@@ -261,8 +257,9 @@
return UNEXPECTED_NULL;
}
- // memory must be in the declared heap
- CHECK(mHeapBases.indexOfKey(heap->getBase()) >= 0);
+ if (mHeapBases.indexOfKey(heap->getBase()) < 0) {
+ setHeapBase(heap);
+ }
buffer->bufferId = mHeapBases.valueFor(heap->getBase());
buffer->offset = offset >= 0 ? offset : 0;
diff --git a/drm/libmediadrm/ICrypto.cpp b/drm/libmediadrm/ICrypto.cpp
index 6b42ff0..49a2d3e 100644
--- a/drm/libmediadrm/ICrypto.cpp
+++ b/drm/libmediadrm/ICrypto.cpp
@@ -36,8 +36,6 @@
DECRYPT,
NOTIFY_RESOLUTION,
SET_MEDIADRM_SESSION,
- SET_HEAP,
- UNSET_HEAP,
};
struct BpCrypto : public BpInterface<ICrypto> {
@@ -179,23 +177,6 @@
return reply.readInt32();
}
- virtual void setHeap(const sp<IMemoryHeap> &heap) {
- Parcel data, reply;
- data.writeInterfaceToken(ICrypto::getInterfaceDescriptor());
- data.writeStrongBinder(IInterface::asBinder(heap));
- remote()->transact(SET_HEAP, data, &reply);
- return;
- }
-
- virtual void unsetHeap(const sp<IMemoryHeap>& heap) {
- Parcel data, reply;
- data.writeInterfaceToken(ICrypto::getInterfaceDescriptor());
- data.writeStrongBinder(IInterface::asBinder(heap));
- remote()->transact(UNSET_HEAP, data, &reply);
- return;
- }
-
-
private:
void readVector(Parcel &reply, Vector<uint8_t> &vector) const {
uint32_t size = reply.readInt32();
@@ -419,24 +400,6 @@
return OK;
}
- case SET_HEAP:
- {
- CHECK_INTERFACE(ICrypto, data, reply);
- sp<IMemoryHeap> heap =
- interface_cast<IMemoryHeap>(data.readStrongBinder());
- setHeap(heap);
- return OK;
- }
-
- case UNSET_HEAP:
- {
- CHECK_INTERFACE(ICrypto, data, reply);
- sp<IMemoryHeap> heap =
- interface_cast<IMemoryHeap>(data.readStrongBinder());
- unsetHeap(heap);
- return OK;
- }
-
default:
return BBinder::onTransact(code, data, reply, flags);
}
diff --git a/media/libmedia/include/Crypto.h b/media/libmedia/include/Crypto.h
index b68413d..ce08f98 100644
--- a/media/libmedia/include/Crypto.h
+++ b/media/libmedia/include/Crypto.h
@@ -55,9 +55,6 @@
const CryptoPlugin::SubSample *subSamples, size_t numSubSamples,
const DestinationBuffer &destination, AString *errorDetailMsg);
- virtual void setHeap(const sp<IMemoryHeap>&) {}
- virtual void unsetHeap(const sp<IMemoryHeap>&) {}
-
private:
mutable Mutex mLock;
diff --git a/media/libmedia/include/CryptoHal.h b/media/libmedia/include/CryptoHal.h
index d6214c2..28ade20 100644
--- a/media/libmedia/include/CryptoHal.h
+++ b/media/libmedia/include/CryptoHal.h
@@ -60,9 +60,6 @@
const ICrypto::DestinationBuffer &destination,
AString *errorDetailMsg);
- virtual void setHeap(const sp<IMemoryHeap>& heap) { setHeapBase(heap); }
- virtual void unsetHeap(const sp<IMemoryHeap>& heap) { clearHeapBase(heap); }
-
private:
mutable Mutex mLock;
@@ -85,7 +82,6 @@
const uint8_t uuid[16], const void *initData, size_t size);
void setHeapBase(const sp<IMemoryHeap>& heap);
- void clearHeapBase(const sp<IMemoryHeap>& heap);
status_t toSharedBuffer(const sp<IMemory>& memory, ::SharedBuffer* buffer);
diff --git a/media/libmedia/include/ICrypto.h b/media/libmedia/include/ICrypto.h
index f83c846..8990f4b 100644
--- a/media/libmedia/include/ICrypto.h
+++ b/media/libmedia/include/ICrypto.h
@@ -27,7 +27,6 @@
struct AString;
class IMemory;
-class IMemoryHeap;
struct ICrypto : public IInterface {
DECLARE_META_INTERFACE(Crypto);
@@ -65,13 +64,6 @@
const CryptoPlugin::SubSample *subSamples, size_t numSubSamples,
const DestinationBuffer &destination, AString *errorDetailMsg) = 0;
- /**
- * Declare the heap that the shared memory source buffers passed
- * to decrypt will be allocated from.
- */
- virtual void setHeap(const sp<IMemoryHeap>& heap) = 0;
- virtual void unsetHeap(const sp<IMemoryHeap>& heap) = 0;
-
private:
DISALLOW_EVIL_CONSTRUCTORS(ICrypto);
};
diff --git a/media/libstagefright/ACodecBufferChannel.cpp b/media/libstagefright/ACodecBufferChannel.cpp
index 9cb0cdc..259e134 100644
--- a/media/libstagefright/ACodecBufferChannel.cpp
+++ b/media/libstagefright/ACodecBufferChannel.cpp
@@ -39,12 +39,6 @@
using BufferInfo = ACodecBufferChannel::BufferInfo;
using BufferInfoIterator = std::vector<const BufferInfo>::const_iterator;
-ACodecBufferChannel::~ACodecBufferChannel() {
- if (mCrypto != nullptr && mDealer != nullptr) {
- mCrypto->unsetHeap(mDealer->getMemoryHeap());
- }
-}
-
static BufferInfoIterator findClientBuffer(
const std::shared_ptr<const std::vector<const BufferInfo>> &array,
const sp<MediaCodecBuffer> &buffer) {
@@ -257,18 +251,6 @@
}
}
-sp<MemoryDealer> ACodecBufferChannel::makeMemoryDealer(size_t heapSize) {
- sp<MemoryDealer> dealer;
- if (mDealer != nullptr && mCrypto != nullptr) {
- mCrypto->unsetHeap(mDealer->getMemoryHeap());
- }
- dealer = new MemoryDealer(heapSize, "ACodecBufferChannel");
- if (mCrypto != nullptr) {
- mCrypto->setHeap(dealer->getMemoryHeap());
- }
- return dealer;
-}
-
void ACodecBufferChannel::setInputBufferArray(const std::vector<BufferAndId> &array) {
if (hasCryptoOrDescrambler()) {
size_t totalSize = std::accumulate(
@@ -283,10 +265,8 @@
(size_t max, const BufferAndId& elem) {
return std::max(max, align(elem.mBuffer->capacity(), alignment));
});
- size_t destinationBufferSize = maxSize;
- size_t heapSize = totalSize + destinationBufferSize;
- mDealer = makeMemoryDealer(heapSize);
- mDecryptDestination = mDealer->allocate(destinationBufferSize);
+ mDealer = new MemoryDealer(totalSize + maxSize, "ACodecBufferChannel");
+ mDecryptDestination = mDealer->allocate(maxSize);
}
std::vector<const BufferInfo> inputBuffers;
for (const BufferAndId &elem : array) {
diff --git a/media/libstagefright/include/ACodecBufferChannel.h b/media/libstagefright/include/ACodecBufferChannel.h
index b731666..02468c1 100644
--- a/media/libstagefright/include/ACodecBufferChannel.h
+++ b/media/libstagefright/include/ACodecBufferChannel.h
@@ -60,7 +60,7 @@
ACodecBufferChannel(
const sp<AMessage> &inputBufferFilled, const sp<AMessage> &outputBufferDrained);
- virtual ~ACodecBufferChannel();
+ virtual ~ACodecBufferChannel() = default;
// BufferChannelBase interface
virtual status_t queueInputBuffer(const sp<MediaCodecBuffer> &buffer) override;
@@ -127,8 +127,6 @@
std::shared_ptr<const std::vector<const BufferInfo>> mInputBuffers;
std::shared_ptr<const std::vector<const BufferInfo>> mOutputBuffers;
- sp<MemoryDealer> makeMemoryDealer(size_t heapSize);
-
bool hasCryptoOrDescrambler() {
return mCrypto != NULL || mDescrambler != NULL;
}