Skip to content

V
vlc-gpu
Commit eb14ae7d authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

avcodec/video.c: cleanup (deindent ffmpeg_GetFormat)

parent 71bd25d9
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 33 deletions
modules/codec/avcodec/video.c
View file @ eb14ae7d
...@@ -1196,46 +1196,47 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, ...@@ -1196,46 +1196,47 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
p_dec->fmt_in.i_level = p_context->level; p_dec->fmt_in.i_level = p_context->level;
p_va = vlc_va_New( VLC_OBJECT(p_dec), p_sys->i_codec_id, &p_dec->fmt_in ); p_va = vlc_va_New( VLC_OBJECT(p_dec), p_sys->i_codec_id, &p_dec->fmt_in );
if( p_va != NULL ) if( p_va == NULL )
{ goto end;
/* Try too look for a supported hw acceleration */
for( size_t i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ )
{
const char *name = av_get_pix_fmt_name(pi_fmt[i]);
msg_Dbg( p_dec, "Available decoder output format %d (%s)",
pi_fmt[i], name ? name : "unknown" );
if( p_va->pix_fmt != pi_fmt[i] )
continue;
/* We try to call vlc_va_Setup when possible to detect errors when
* possible (later is too late) */
if( p_context->width > 0 && p_context->height > 0
&& vlc_va_Setup( p_va, &p_context->hwaccel_context,
&p_dec->fmt_out.video.i_chroma,
p_context->width, p_context->height ) )
{
msg_Err( p_dec, "acceleration setup failure" );
break;
}
if( p_va->description ) /* Try too look for a supported hw acceleration */
msg_Info( p_dec, "Using %s for hardware decoding.", for( size_t i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ )
p_va->description ); {
const char *name = av_get_pix_fmt_name(pi_fmt[i]);
msg_Dbg( p_dec, "Available decoder output format %d (%s)",
pi_fmt[i], name ? name : "unknown" );
if( p_va->pix_fmt != pi_fmt[i] )
continue;
p_sys->b_direct_rendering = p_va->direct_rendering; /* We try to call vlc_va_Setup when possible to detect errors when
msg_Info( p_dec, "VAAPI uses direct rendering: %s", * possible (later is too late) */
p_sys->b_direct_rendering ? "yes" : "no" ); if( p_context->width > 0 && p_context->height > 0
p_sys->p_va = p_va; && vlc_va_Setup( p_va, &p_context->hwaccel_context,
p_context->draw_horiz_band = NULL; &p_dec->fmt_out.video.i_chroma,
return pi_fmt[i]; p_context->width, p_context->height ) )
{
msg_Err( p_dec, "acceleration setup failure" );
break;
} }
msg_Err( p_dec, "acceleration not available" ); if( p_va->description )
vlc_va_Delete( p_va ); msg_Info( p_dec, "Using %s for hardware decoding.",
p_va->description );
p_sys->b_direct_rendering = p_va->direct_rendering;
msg_Info( p_dec, "hw acceleration %s direct rendering",
p_sys->b_direct_rendering ? "use" : "does not use" );
p_sys->p_va = p_va;
p_context->draw_horiz_band = NULL;
return pi_fmt[i];
} }
msg_Err( p_dec, "acceleration not available" );
vlc_va_Delete( p_va );
p_sys->p_va = NULL; p_sys->p_va = NULL;
end:
/* Fallback to default behaviour */ /* Fallback to default behaviour */
return avcodec_default_get_format( p_context, pi_fmt ); return avcodec_default_get_format( p_context, pi_fmt );
} }
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