Skip to content

Commit

Permalink
Merge 0002b86 on remote branch
Browse files Browse the repository at this point in the history
Change-Id: I71ba2324f08759c4c449b4ab545143ddc0020a37
  • Loading branch information
Linux Build Service Account committed Nov 12, 2018
2 parents 7c1405b + 0002b86 commit d9cde72
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3281,7 +3281,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);
Expand Down Expand Up @@ -3326,15 +3326,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);
}
}
Expand Down

0 comments on commit d9cde72

Please sign in to comment.