diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-14 21:00:40 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-14 21:00:40 +0000 |
| commit | f12a2cf29db7938a51d88f7e3fafac46cf91fc99 (patch) | |
| tree | 8ece8d5d9909b620719f9dc8424b6a2d824b4090 | |
| parent | cc8a8ff26759392aa01bc13ed769083b196b2c24 (diff) | |
| parent | 65510a8f031053ff7053838e4404d32528820e89 (diff) | |
| download | goldfish-opengl-f12a2cf29db7938a51d88f7e3fafac46cf91fc99.tar.gz | |
Snap for 8594052 from 65510a8f031053ff7053838e4404d32528820e89 to tm-d1-release
Change-Id: I2d687fa8b3fa6850c1b5469a0a4e3fe9cce16121
| -rw-r--r-- | system/codecs/c2/decoders/hevcdec/GoldfishHevcHelper.cpp | 17 | ||||
| -rw-r--r-- | system/codecs/c2/decoders/hevcdec/GoldfishHevcHelper.h | 1 |
2 files changed, 3 insertions, 15 deletions
diff --git a/system/codecs/c2/decoders/hevcdec/GoldfishHevcHelper.cpp b/system/codecs/c2/decoders/hevcdec/GoldfishHevcHelper.cpp index 5bf2672d..1b93a0d9 100644 --- a/system/codecs/c2/decoders/hevcdec/GoldfishHevcHelper.cpp +++ b/system/codecs/c2/decoders/hevcdec/GoldfishHevcHelper.cpp @@ -64,10 +64,6 @@ GoldfishHevcHelper::GoldfishHevcHelper(int w, int h):mWidth(w),mHeight(h) { crea GoldfishHevcHelper::~GoldfishHevcHelper() { destroyDecoder(); - if (mOutBufferFlush) { - ivd_aligned_free(nullptr, mOutBufferFlush); - mOutBufferFlush = nullptr; - } } void GoldfishHevcHelper::createDecoder() { @@ -304,17 +300,10 @@ bool GoldfishHevcHelper::setDecodeArgs(ivd_video_decode_ip_t *ps_decode_ip, ps_decode_ip->s_out_buffer.u4_min_out_buf_size[0] = lumaSize; ps_decode_ip->s_out_buffer.u4_min_out_buf_size[1] = chromaSize; ps_decode_ip->s_out_buffer.u4_min_out_buf_size[2] = chromaSize; - if (!mOutBufferFlush) { - uint32_t displayStride = mStride; - uint32_t displayHeight = mHeight; - uint32_t bufferSize = displayStride * displayHeight * 3 / 2; - mOutBufferFlush = (uint8_t *)ivd_aligned_malloc(nullptr, 128, bufferSize); - } { - ps_decode_ip->s_out_buffer.pu1_bufs[0] = mOutBufferFlush; - ps_decode_ip->s_out_buffer.pu1_bufs[1] = mOutBufferFlush + lumaSize; - ps_decode_ip->s_out_buffer.pu1_bufs[2] = - mOutBufferFlush + lumaSize + chromaSize; + ps_decode_ip->s_out_buffer.pu1_bufs[0] = nullptr; + ps_decode_ip->s_out_buffer.pu1_bufs[1] = nullptr; + ps_decode_ip->s_out_buffer.pu1_bufs[2] = nullptr; } ps_decode_ip->s_out_buffer.u4_num_bufs = 3; ps_decode_op->u4_size = sizeof(ihevcd_cxa_video_decode_op_t); diff --git a/system/codecs/c2/decoders/hevcdec/GoldfishHevcHelper.h b/system/codecs/c2/decoders/hevcdec/GoldfishHevcHelper.h index 22615433..09de8301 100644 --- a/system/codecs/c2/decoders/hevcdec/GoldfishHevcHelper.h +++ b/system/codecs/c2/decoders/hevcdec/GoldfishHevcHelper.h @@ -59,7 +59,6 @@ class GoldfishHevcHelper { int mNumCores = 1; int mStride = 16; int mOutputDelay = 8; // default - uint8_t* mOutBufferFlush = nullptr; IV_COLOR_FORMAT_T mIvColorformat = IV_YUV_420P; }; |