diff options
author | ChengYou Ho <chengyouho@google.com> | 2018-11-29 05:25:54 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-11-29 05:25:54 -0800 |
commit | 4a30aac19082a5163d9f0f6288cad4a6edb3dc0c (patch) | |
tree | e204a28213fab6c5fe49b8be626d35a0b434c1ac | |
parent | 8fbc647314b9cbe7627a58128e8f30962f9c6d88 (diff) | |
parent | f688a41d2bfa470385763378aa06bce203cff134 (diff) | |
download | media-4a30aac19082a5163d9f0f6288cad4a6edb3dc0c.tar.gz |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.08.00.00.478.122' into pi-dev
am: f688a41d2b
Change-Id: I738d9b7a719392e1653d42dc4365a6dcda537bac
-rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index 3548d082..e3f88929 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -3206,7 +3206,7 @@ bool omx_vdec::execute_output_flush() while (m_ftb_q.m_size) { m_ftb_q.pop_entry(&p1,&p2,&ident); if (ident == m_fill_output_msg ) { - print_omx_buffer("Flush FBD", (OMX_BUFFERHEADERTYPE *)&p2); + print_omx_buffer("Flush FBD", (OMX_BUFFERHEADERTYPE *)p2); m_cb.FillBufferDone(&m_cmp, m_app_data, (OMX_BUFFERHEADERTYPE *)(intptr_t)p2); } else if (ident == OMX_COMPONENT_GENERATE_FBD) { fill_buffer_done(&m_cmp,(OMX_BUFFERHEADERTYPE *)(intptr_t)p1); @@ -3247,15 +3247,15 @@ bool omx_vdec::execute_input_flush() m_etb_q.pop_entry(&p1,&p2,&ident); if (ident == OMX_COMPONENT_GENERATE_ETB_ARBITRARY) { - print_omx_buffer("Flush ETB_ARBITRARY", (OMX_BUFFERHEADERTYPE *)&p2); + print_omx_buffer("Flush ETB_ARBITRARY", (OMX_BUFFERHEADERTYPE *)p2); m_cb.EmptyBufferDone(&m_cmp ,m_app_data, (OMX_BUFFERHEADERTYPE *)p2); } else if (ident == OMX_COMPONENT_GENERATE_ETB) { pending_input_buffers++; VIDC_TRACE_INT_LOW("ETB-pending", pending_input_buffers); - print_omx_buffer("Flush ETB", (OMX_BUFFERHEADERTYPE *)&p2); + print_omx_buffer("Flush ETB", (OMX_BUFFERHEADERTYPE *)p2); empty_buffer_done(&m_cmp,(OMX_BUFFERHEADERTYPE *)p2); } else if (ident == OMX_COMPONENT_GENERATE_EBD) { - print_omx_buffer("Flush EBD", (OMX_BUFFERHEADERTYPE *)&p1); + print_omx_buffer("Flush EBD", (OMX_BUFFERHEADERTYPE *)p1); empty_buffer_done(&m_cmp,(OMX_BUFFERHEADERTYPE *)p1); } } |