diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2014-02-26 13:33:01 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-02-26 13:33:01 -0800 |
commit | db837211216bc83d9ec89c92deb47f1433cba1d6 (patch) | |
tree | 82a75c18b29b81aaac765da88adeee58df6149d7 | |
parent | 87975df10f6f82f1fbd13fd1fac949ed4071f853 (diff) | |
parent | f025625050acae22b3087b0141369d8f3fc35c38 (diff) | |
download | android_hardware_qcom_media-db837211216bc83d9ec89c92deb47f1433cba1d6.tar.gz android_hardware_qcom_media-db837211216bc83d9ec89c92deb47f1433cba1d6.tar.bz2 android_hardware_qcom_media-db837211216bc83d9ec89c92deb47f1433cba1d6.zip |
Merge "mm-video: vdec: No need to allocate metadata by default"
-rw-r--r-- | mm-video/vidc/vdec/src/omx_vdec.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm-video/vidc/vdec/src/omx_vdec.cpp b/mm-video/vidc/vdec/src/omx_vdec.cpp index 68af4f39..c9501cc0 100644 --- a/mm-video/vidc/vdec/src/omx_vdec.cpp +++ b/mm-video/vidc/vdec/src/omx_vdec.cpp @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2010-2013, The Linux Foundation. All rights reserved. +Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -4956,7 +4956,7 @@ OMX_ERRORTYPE omx_vdec::free_output_buffer(OMX_BUFFERHEADERTYPE *bufferHdr) #endif } #ifdef MAX_RES_1080P - if(drv_ctx.enable_sec_metadata) + if(drv_ctx.enable_sec_metadata && client_extradata) { vdec_dealloc_meta_buffers(); } @@ -5405,7 +5405,7 @@ OMX_ERRORTYPE omx_vdec::allocate_output_buffer( pPlatformList++; } #ifdef MAX_RES_1080P - if(eRet == OMX_ErrorNone && drv_ctx.enable_sec_metadata) + if(eRet == OMX_ErrorNone && drv_ctx.enable_sec_metadata && client_extradata) { eRet = vdec_alloc_meta_buffers(); if (eRet) { |