diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-03-25 00:01:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-03-25 00:01:08 -0700 |
| commit | 3c680572643ca2a0e661de1362b742438e7596c5 (patch) | |
| tree | 91671550355947f998f527b33d68e14ba032b9d2 | |
| parent | db837211216bc83d9ec89c92deb47f1433cba1d6 (diff) | |
| parent | 903d579aa8fcb6776a2fbbfbe0fa10d994655551 (diff) | |
| download | android_hardware_qcom_media-3c680572643ca2a0e661de1362b742438e7596c5.tar.gz android_hardware_qcom_media-3c680572643ca2a0e661de1362b742438e7596c5.tar.bz2 android_hardware_qcom_media-3c680572643ca2a0e661de1362b742438e7596c5.zip | |
Merge "Revert "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 c9501cc0..68af4f39 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-2014, The Linux Foundation. All rights reserved. +Copyright (c) 2010-2013, 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 && client_extradata) + if(drv_ctx.enable_sec_metadata) { 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 && client_extradata) + if(eRet == OMX_ErrorNone && drv_ctx.enable_sec_metadata) { eRet = vdec_alloc_meta_buffers(); if (eRet) { |