summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraveen Chavan <pchavan@codeaurora.org>2013-09-13 15:51:03 -0700
committerThe Android Automerger <android-build@android.com>2013-09-17 15:34:26 -0700
commit7f118f5eb5d8dfd69600a8bb3c613056a234f85c (patch)
treeff5237759f8e95f0cda1007af21f0cf3f2139a32
parenta785de0806c0d67cf7f7c6307a7194aaaac88b75 (diff)
downloadandroid_hardware_qcom_media-7f118f5eb5d8dfd69600a8bb3c613056a234f85c.tar.gz
android_hardware_qcom_media-7f118f5eb5d8dfd69600a8bb3c613056a234f85c.tar.bz2
android_hardware_qcom_media-7f118f5eb5d8dfd69600a8bb3c613056a234f85c.zip
mm-video: Free frame_parser in component de-init
frame_parser is alloc'ed in component init, it should be accordingly freed in de-init rather than when input buffers are freed. author: Leena Winterrowd <lenhardw@codeaurora.org> Bug: 10668205 Change-Id: I2a8dd90b4831f9d9e7d50f5a1093d1a0055d3aad
-rwxr-xr-xmm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
index bb2e6df9..2bc8b595 100755
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
@@ -5664,6 +5664,12 @@ OMX_ERRORTYPE omx_vdec::component_deinit(OMX_IN OMX_HANDLETYPE hComp)
h264_parser = NULL;
}
+ if (m_frame_parser.mutils) {
+ DEBUG_PRINT_LOW("\n Free utils parser");
+ delete (m_frame_parser.mutils);
+ m_frame_parser.mutils = NULL;
+ }
+
if (m_platform_list) {
free(m_platform_list);
m_platform_list = NULL;
@@ -7187,12 +7193,6 @@ void omx_vdec::free_input_buffer_header()
{
input_use_buffer = false;
if (arbitrary_bytes) {
- if (m_frame_parser.mutils) {
- DEBUG_PRINT_LOW("\n Free utils parser");
- delete (m_frame_parser.mutils);
- m_frame_parser.mutils = NULL;
- }
-
if (m_inp_heap_ptr) {
DEBUG_PRINT_LOW("\n Free input Heap Pointer");
free (m_inp_heap_ptr);