Skip to content

V
vlc
Commit 92ebd3b1 authored by Thomas Guillem's avatar Thomas Guillem Committed by Martin Storsjö
Browse files
Options

omxil: more error check 

Signed-off-by: default avatarMartin Storsjö <martin@martin.st>
parent aeadfdbe
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 0 deletions
modules/codec/omxil/omxil.c
View file @ 92ebd3b1
...@@ -1247,6 +1247,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) ...@@ -1247,6 +1247,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
{ {
omx_error = GetPortDefinition(p_dec, &p_sys->out, p_sys->out.p_fmt); omx_error = GetPortDefinition(p_dec, &p_sys->out, p_sys->out.p_fmt);
p_sys->out.b_update_def = 0; p_sys->out.b_update_def = 0;
CHECK_ERROR(omx_error, "GetPortDefinition failed");
} }
if(p_header->nFilledLen) if(p_header->nFilledLen)
...@@ -1368,15 +1369,20 @@ reconfig: ...@@ -1368,15 +1369,20 @@ reconfig:
{ {
omx_error = PortReconfigure(p_dec, p_port); omx_error = PortReconfigure(p_dec, p_port);
p_port->b_reconfigure = 0; p_port->b_reconfigure = 0;
CHECK_ERROR(omx_error, "PortReconfigure failed");
} }
if(p_port->b_update_def) if(p_port->b_update_def)
{ {
omx_error = GetPortDefinition(p_dec, p_port, p_port->p_fmt); omx_error = GetPortDefinition(p_dec, p_port, p_port->p_fmt);
p_port->b_update_def = 0; p_port->b_update_def = 0;
CHECK_ERROR(omx_error, "GetPortDefinition failed");
} }
} }
return p_pic; return p_pic;
error:
p_sys->b_error = true;
return NULL;
} }
/***************************************************************************** /*****************************************************************************
...@@ -1516,9 +1522,13 @@ reconfig: ...@@ -1516,9 +1522,13 @@ reconfig:
if(!p_port->b_reconfigure) continue; if(!p_port->b_reconfigure) continue;
p_port->b_reconfigure = 0; p_port->b_reconfigure = 0;
omx_error = PortReconfigure(p_dec, p_port); omx_error = PortReconfigure(p_dec, p_port);
CHECK_ERROR(omx_error, "PortReconfigure failed");
} }
return p_buffer; return p_buffer;
error:
p_sys->b_error = true;
return NULL;
} }
/***************************************************************************** /*****************************************************************************
...@@ -1578,6 +1588,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pic ) ...@@ -1578,6 +1588,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pic )
if(!p_port->b_reconfigure) continue; if(!p_port->b_reconfigure) continue;
p_port->b_reconfigure = 0; p_port->b_reconfigure = 0;
omx_error = PortReconfigure(p_dec, p_port); omx_error = PortReconfigure(p_dec, p_port);
CHECK_ERROR(omx_error, "PortReconfigure failed");
} }
/* Wait for the decoded frame */ /* Wait for the decoded frame */
...@@ -1616,6 +1627,9 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pic ) ...@@ -1616,6 +1627,9 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pic )
msg_Dbg(p_dec, "done"); msg_Dbg(p_dec, "done");
return p_block; return p_block;
error:
p_sys->b_error = true;
return NULL;
} }
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment