/* for frame skipping algo */
bool b_hurry_up;
enum AVDiscard i_skip_frame;
- enum AVDiscard i_skip_idct;
/* how many decoded frames are late */
int i_late_frames;
/* */
-#if LIBAVCODEC_VERSION_MAJOR < 54
- AVPaletteControl palette;
-#else
bool palette_sent;
-#endif
/* */
bool b_flush;
#endif
static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
const enum PixelFormat * );
+static picture_t *DecodeVideo( decoder_t *, block_t ** );
static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
{
avcodec_align_dimensions2(p_context, &width, &height, aligns);
}
- if( width == 0 || height == 0)
- return NULL; /* invalid display size */
+ if( width == 0 || height == 0 || width > 8192 || height > 8192 )
+ {
+ msg_Err( p_dec, "Invalid frame size %dx%d.", width, height );
+ return NULL; /* invalid display size */
+ }
p_dec->fmt_out.video.i_width = width;
p_dec->fmt_out.video.i_height = height;
p_dec->fmt_out.video.i_visible_width = p_context->width;
p_dec->fmt_out.video.i_visible_height = p_context->height;
}
+ else
+ {
+ p_dec->fmt_out.video.i_visible_width = width;
+ p_dec->fmt_out.video.i_visible_height = height;
+ }
if( !p_sys->p_va && GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) )
{
return decoder_NewPicture( p_dec );
}
+static int OpenVideoCodec( decoder_t *p_dec )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ if( p_sys->p_context->extradata_size <= 0 )
+ {
+ if( p_sys->p_codec->id == AV_CODEC_ID_VC1 ||
+ p_sys->p_codec->id == AV_CODEC_ID_THEORA )
+ {
+ msg_Warn( p_dec, "waiting for extra data for codec %s",
+ p_sys->p_codec->name );
+ return 1;
+ }
+ }
+
+ p_sys->p_context->width = p_dec->fmt_in.video.i_visible_width;
+ p_sys->p_context->height = p_dec->fmt_in.video.i_visible_height;
+ if (p_sys->p_context->width == 0)
+ p_sys->p_context->width = p_dec->fmt_in.video.i_width;
+ else if (p_sys->p_context->width != p_dec->fmt_in.video.i_width)
+ p_sys->p_context->coded_width = p_dec->fmt_in.video.i_width;
+ if (p_sys->p_context->height == 0)
+ p_sys->p_context->height = p_dec->fmt_in.video.i_height;
+ else if (p_sys->p_context->height != p_dec->fmt_in.video.i_height)
+ p_sys->p_context->coded_height = p_dec->fmt_in.video.i_height;
+ p_sys->p_context->bits_per_coded_sample = p_dec->fmt_in.video.i_bits_per_pixel;
+
+ int ret = ffmpeg_OpenCodec( p_dec );
+ if( ret < 0 )
+ return ret;
+
+#ifdef HAVE_AVCODEC_MT
+ switch( p_sys->p_context->active_thread_type )
+ {
+ case FF_THREAD_FRAME:
+ msg_Dbg( p_dec, "using frame thread mode with %d threads",
+ p_sys->p_context->thread_count );
+ break;
+ case FF_THREAD_SLICE:
+ msg_Dbg( p_dec, "using slice thread mode with %d threads",
+ p_sys->p_context->thread_count );
+ break;
+ case 0:
+ if( p_sys->p_context->thread_count > 1 )
+ msg_Warn( p_dec, "failed to enable threaded decoding" );
+ break;
+ default:
+ msg_Warn( p_dec, "using unknown thread mode with %d threads",
+ p_sys->p_context->thread_count );
+ break;
+ }
+#endif
+ return VLC_SUCCESS;
+}
+
/*****************************************************************************
* InitVideo: initialize the video decoder
*****************************************************************************
* opened (done after the first decoded frame).
*****************************************************************************/
int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
- AVCodec *p_codec, int i_codec_id, const char *psz_namecodec )
+ const AVCodec *p_codec )
{
decoder_sys_t *p_sys;
int i_val;
if( ( p_dec->p_sys = p_sys = calloc( 1, sizeof(decoder_sys_t) ) ) == NULL )
return VLC_ENOMEM;
- p_codec->type = AVMEDIA_TYPE_VIDEO;
- p_context->codec_type = AVMEDIA_TYPE_VIDEO;
- p_context->codec_id = i_codec_id;
p_sys->p_context = p_context;
p_sys->p_codec = p_codec;
- p_sys->i_codec_id = i_codec_id;
- p_sys->psz_namecodec = psz_namecodec;
p_sys->p_ff_pic = avcodec_alloc_frame();
p_sys->b_delayed_open = true;
p_sys->p_va = NULL;
vlc_sem_init( &p_sys->sem_mt, 0 );
/* ***** Fill p_context with init values ***** */
- p_sys->p_context->codec_tag = ffmpeg_CodecTag( p_dec->fmt_in.i_original_fourcc ?: p_dec->fmt_in.i_codec );
+ p_context->codec_tag = ffmpeg_CodecTag( p_dec->fmt_in.i_original_fourcc ?
+ p_dec->fmt_in.i_original_fourcc : p_dec->fmt_in.i_codec );
/* ***** Get configuration of ffmpeg plugin ***** */
- p_sys->p_context->workaround_bugs =
+ p_context->workaround_bugs =
var_InheritInteger( p_dec, "avcodec-workaround-bugs" );
- p_sys->p_context->err_recognition =
+ p_context->err_recognition =
var_InheritInteger( p_dec, "avcodec-error-resilience" );
if( var_CreateGetBool( p_dec, "grayscale" ) )
- p_sys->p_context->flags |= CODEC_FLAG_GRAY;
+ p_context->flags |= CODEC_FLAG_GRAY;
- i_val = var_CreateGetInteger( p_dec, "avcodec-vismv" );
- if( i_val ) p_sys->p_context->debug_mv = i_val;
+ /* ***** Output always the frames ***** */
+#if LIBAVCODEC_VERSION_CHECK(55, 23, 1, 40, 101)
+ p_context->flags |= CODEC_FLAG_OUTPUT_CORRUPT;
+#endif
i_val = var_CreateGetInteger( p_dec, "avcodec-skiploopfilter" );
- if( i_val >= 4 ) p_sys->p_context->skip_loop_filter = AVDISCARD_ALL;
- else if( i_val == 3 ) p_sys->p_context->skip_loop_filter = AVDISCARD_NONKEY;
- else if( i_val == 2 ) p_sys->p_context->skip_loop_filter = AVDISCARD_BIDIR;
- else if( i_val == 1 ) p_sys->p_context->skip_loop_filter = AVDISCARD_NONREF;
+ if( i_val >= 4 ) p_context->skip_loop_filter = AVDISCARD_ALL;
+ else if( i_val == 3 ) p_context->skip_loop_filter = AVDISCARD_NONKEY;
+ else if( i_val == 2 ) p_context->skip_loop_filter = AVDISCARD_BIDIR;
+ else if( i_val == 1 ) p_context->skip_loop_filter = AVDISCARD_NONREF;
if( var_CreateGetBool( p_dec, "avcodec-fast" ) )
- p_sys->p_context->flags2 |= CODEC_FLAG2_FAST;
+ p_context->flags2 |= CODEC_FLAG2_FAST;
/* ***** libavcodec frame skipping ***** */
p_sys->b_hurry_up = var_CreateGetBool( p_dec, "avcodec-hurry-up" );
i_val = var_CreateGetInteger( p_dec, "avcodec-skip-frame" );
- if( i_val >= 4 ) p_sys->p_context->skip_frame = AVDISCARD_ALL;
- else if( i_val == 3 ) p_sys->p_context->skip_frame = AVDISCARD_NONKEY;
- else if( i_val == 2 ) p_sys->p_context->skip_frame = AVDISCARD_BIDIR;
- else if( i_val == 1 ) p_sys->p_context->skip_frame = AVDISCARD_NONREF;
- else if( i_val == -1 ) p_sys->p_context->skip_frame = AVDISCARD_NONE;
- else p_sys->p_context->skip_frame = AVDISCARD_DEFAULT;
- p_sys->i_skip_frame = p_sys->p_context->skip_frame;
+ if( i_val >= 4 ) p_context->skip_frame = AVDISCARD_ALL;
+ else if( i_val == 3 ) p_context->skip_frame = AVDISCARD_NONKEY;
+ else if( i_val == 2 ) p_context->skip_frame = AVDISCARD_BIDIR;
+ else if( i_val == 1 ) p_context->skip_frame = AVDISCARD_NONREF;
+ else if( i_val == -1 ) p_context->skip_frame = AVDISCARD_NONE;
+ else p_context->skip_frame = AVDISCARD_DEFAULT;
+ p_sys->i_skip_frame = p_context->skip_frame;
i_val = var_CreateGetInteger( p_dec, "avcodec-skip-idct" );
- if( i_val >= 4 ) p_sys->p_context->skip_idct = AVDISCARD_ALL;
- else if( i_val == 3 ) p_sys->p_context->skip_idct = AVDISCARD_NONKEY;
- else if( i_val == 2 ) p_sys->p_context->skip_idct = AVDISCARD_BIDIR;
- else if( i_val == 1 ) p_sys->p_context->skip_idct = AVDISCARD_NONREF;
- else if( i_val == -1 ) p_sys->p_context->skip_idct = AVDISCARD_NONE;
- else p_sys->p_context->skip_idct = AVDISCARD_DEFAULT;
- p_sys->i_skip_idct = p_sys->p_context->skip_idct;
+ if( i_val >= 4 ) p_context->skip_idct = AVDISCARD_ALL;
+ else if( i_val == 3 ) p_context->skip_idct = AVDISCARD_NONKEY;
+ else if( i_val == 2 ) p_context->skip_idct = AVDISCARD_BIDIR;
+ else if( i_val == 1 ) p_context->skip_idct = AVDISCARD_NONREF;
+ else if( i_val == -1 ) p_context->skip_idct = AVDISCARD_NONE;
+ else p_context->skip_idct = AVDISCARD_DEFAULT;
/* ***** libavcodec direct rendering ***** */
p_sys->b_direct_rendering = false;
p_sys->i_direct_rendering_used = -1;
if( var_CreateGetBool( p_dec, "avcodec-dr" ) &&
- (p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
+ (p_codec->capabilities & CODEC_CAP_DR1) &&
/* No idea why ... but this fixes flickering on some TSCC streams */
- p_sys->i_codec_id != AV_CODEC_ID_TSCC && p_sys->i_codec_id != AV_CODEC_ID_CSCD &&
- p_sys->i_codec_id != AV_CODEC_ID_CINEPAK &&
- !p_sys->p_context->debug_mv )
+ p_sys->p_codec->id != AV_CODEC_ID_TSCC &&
+ p_sys->p_codec->id != AV_CODEC_ID_CSCD &&
+ p_sys->p_codec->id != AV_CODEC_ID_CINEPAK )
{
/* Some codecs set pix_fmt only after the 1st frame has been decoded,
* so we need to do another check in ffmpeg_GetFrameBuf() */
if( p_sys->b_direct_rendering )
{
msg_Dbg( p_dec, "trying to use direct rendering" );
- p_sys->p_context->flags |= CODEC_FLAG_EMU_EDGE;
+ p_context->flags |= CODEC_FLAG_EMU_EDGE;
}
else
{
msg_Dbg( p_dec, "direct rendering is disabled" );
}
- p_sys->p_context->get_format = ffmpeg_GetFormat;
+ p_context->get_format = ffmpeg_GetFormat;
/* Always use our get_buffer wrapper so we can calculate the
* PTS correctly */
#if LIBAVCODEC_VERSION_MAJOR >= 55
- p_sys->p_context->get_buffer2 = lavc_GetFrame;
+ p_context->get_buffer2 = lavc_GetFrame;
#else
- p_sys->p_context->get_buffer = ffmpeg_GetFrameBuf;
- p_sys->p_context->reget_buffer = avcodec_default_reget_buffer;
- p_sys->p_context->release_buffer = ffmpeg_ReleaseFrameBuf;
+ p_context->get_buffer = ffmpeg_GetFrameBuf;
+ p_context->reget_buffer = avcodec_default_reget_buffer;
+ p_context->release_buffer = ffmpeg_ReleaseFrameBuf;
#endif
- p_sys->p_context->opaque = p_dec;
+ p_context->opaque = p_dec;
#ifdef HAVE_AVCODEC_MT
int i_thread_count = var_InheritInteger( p_dec, "avcodec-threads" );
}
i_thread_count = __MIN( i_thread_count, 16 );
msg_Dbg( p_dec, "allowing %d thread(s) for decoding", i_thread_count );
- p_sys->p_context->thread_count = i_thread_count;
- p_sys->p_context->thread_safe_callbacks = true;
+ p_context->thread_count = i_thread_count;
+ p_context->thread_safe_callbacks = true;
- switch( i_codec_id )
+ switch( p_codec->id )
{
case AV_CODEC_ID_MPEG4:
case AV_CODEC_ID_H263:
- p_sys->p_context->thread_type = 0;
+ p_context->thread_type = 0;
break;
case AV_CODEC_ID_MPEG1VIDEO:
case AV_CODEC_ID_MPEG2VIDEO:
- p_sys->p_context->thread_type &= ~FF_THREAD_SLICE;
+ p_context->thread_type &= ~FF_THREAD_SLICE;
/* fall through */
# if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 1, 0))
case AV_CODEC_ID_H264:
case AV_CODEC_ID_VC1:
case AV_CODEC_ID_WMV3:
- p_sys->p_context->thread_type &= ~FF_THREAD_FRAME;
+ p_context->thread_type &= ~FF_THREAD_FRAME;
# endif
+ default:
+ break;
}
- if( p_sys->p_context->thread_type & FF_THREAD_FRAME )
- p_dec->i_extra_picture_buffers = 2 * p_sys->p_context->thread_count;
+ /* Workaround: frame multithreading is not compatible with
+ * DXVA2. When a frame is being copied to host memory, the frame
+ * is locked and cannot be used as a reference frame
+ * simultaneously and thus decoding fails for some frames. This
+ * causes major image corruption. */
+# if defined(_WIN32)
+ char *avcodec_hw = var_InheritString( p_dec, "avcodec-hw" );
+ if( avcodec_hw == NULL || strcasecmp( avcodec_hw, "none" ) )
+ {
+ msg_Warn( p_dec, "threaded frame decoding is not compatible with DXVA2, disabled" );
+ p_context->thread_type &= ~FF_THREAD_FRAME;
+ }
+ free( avcodec_hw );
+# endif
+
+ if( p_context->thread_type & FF_THREAD_FRAME )
+ p_dec->i_extra_picture_buffers = 2 * p_context->thread_count;
#endif
/* ***** misc init ***** */
}
p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma;
-#if LIBAVCODEC_VERSION_MAJOR < 54
- /* Setup palette */
- memset( &p_sys->palette, 0, sizeof(p_sys->palette) );
- if( p_dec->fmt_in.video.p_palette )
- {
- p_sys->palette.palette_changed = 1;
-
- for( int i = 0; i < __MIN( AVPALETTE_COUNT, p_dec->fmt_in.video.p_palette->i_entries ); i++ )
- {
- union {
- uint32_t u;
- uint8_t a[4];
- } c;
- c.a[0] = p_dec->fmt_in.video.p_palette->palette[i][0];
- c.a[1] = p_dec->fmt_in.video.p_palette->palette[i][1];
- c.a[2] = p_dec->fmt_in.video.p_palette->palette[i][2];
- c.a[3] = p_dec->fmt_in.video.p_palette->palette[i][3];
-
- p_sys->palette.palette[i] = c.u;
- }
- p_sys->p_context->palctrl = &p_sys->palette;
+ p_dec->fmt_out.video.orientation = p_dec->fmt_in.video.orientation;
- p_dec->fmt_out.video.p_palette = malloc( sizeof(video_palette_t) );
- if( p_dec->fmt_out.video.p_palette )
- *p_dec->fmt_out.video.p_palette = *p_dec->fmt_in.video.p_palette;
- }
- else if( p_sys->i_codec_id != CODEC_ID_MSVIDEO1 && p_sys->i_codec_id != CODEC_ID_CINEPAK )
- {
- p_sys->p_context->palctrl = &p_sys->palette;
- }
-#else
if( p_dec->fmt_in.video.p_palette ) {
p_sys->palette_sent = false;
p_dec->fmt_out.video.p_palette = malloc( sizeof(video_palette_t) );
*p_dec->fmt_out.video.p_palette = *p_dec->fmt_in.video.p_palette;
} else
p_sys->palette_sent = true;
-#endif
/* ***** init this codec with special data ***** */
ffmpeg_InitCodec( p_dec );
/* ***** Open the codec ***** */
- if( ffmpeg_OpenCodec( p_dec ) < 0 )
+ if( OpenVideoCodec( p_dec ) < 0 )
{
- msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
- av_free( p_sys->p_ff_pic );
+ avcodec_free_frame( &p_sys->p_ff_pic );
vlc_sem_destroy( &p_sys->sem_mt );
free( p_sys );
return VLC_EGENERIC;
}
+ p_dec->pf_decode_video = DecodeVideo;
+
+ if ( p_dec->fmt_in.i_codec == VLC_CODEC_VP9 )
+ p_dec->b_need_packetized = true;
+
return VLC_SUCCESS;
}
/*****************************************************************************
* DecodeVideo: Called to decode one or more frames
*****************************************************************************/
-picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
+static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
AVCodecContext *p_context = p_sys->p_context;
int b_drawpicture;
- int b_null_size = false;
block_t *p_block;
- if( !pp_block || !*pp_block )
+ if( !pp_block )
return NULL;
if( !p_context->extradata_size && p_dec->fmt_in.i_extra )
{
ffmpeg_InitCodec( p_dec );
if( p_sys->b_delayed_open )
- {
- if( ffmpeg_OpenCodec( p_dec ) )
- msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
- }
+ OpenVideoCodec( p_dec );
}
p_block = *pp_block;
+ if(!p_block && !(p_sys->p_codec->capabilities & CODEC_CAP_DELAY) )
+ return NULL;
+
if( p_sys->b_delayed_open )
{
- block_Release( p_block );
+ if( p_block )
+ block_Release( p_block );
return NULL;
}
- if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+ if( p_block)
{
- p_sys->i_pts = VLC_TS_INVALID; /* To make sure we recover properly */
+ if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+ {
+ p_sys->i_pts = VLC_TS_INVALID; /* To make sure we recover properly */
- p_sys->i_late_frames = 0;
+ p_sys->i_late_frames = 0;
- post_mt( p_sys );
- if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY )
- avcodec_flush_buffers( p_context );
- wait_mt( p_sys );
+ post_mt( p_sys );
+ if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY )
+ avcodec_flush_buffers( p_context );
+ wait_mt( p_sys );
- block_Release( p_block );
- return NULL;
- }
+ block_Release( p_block );
+ return NULL;
+ }
- if( p_block->i_flags & BLOCK_FLAG_PREROLL )
- {
- /* Do not care about late frames when prerolling
- * TODO avoid decoding of non reference frame
- * (ie all B except for H264 where it depends only on nal_ref_idc) */
- p_sys->i_late_frames = 0;
+ if( p_block->i_flags & BLOCK_FLAG_PREROLL )
+ {
+ /* Do not care about late frames when prerolling
+ * TODO avoid decoding of non reference frame
+ * (ie all B except for H264 where it depends only on nal_ref_idc) */
+ p_sys->i_late_frames = 0;
+ }
}
if( !p_dec->b_pace_control && (p_sys->i_late_frames > 0) &&
{
if( p_sys->i_pts > VLC_TS_INVALID )
{
- msg_Err( p_dec, "more than 5 seconds of late video -> "
- "dropping frame (computer too slow ?)" );
p_sys->i_pts = VLC_TS_INVALID; /* To make sure we recover properly */
}
- block_Release( p_block );
+ if( p_block )
+ block_Release( p_block );
p_sys->i_late_frames--;
+ msg_Err( p_dec, "more than 5 seconds of late video -> "
+ "dropping frame (computer too slow ?)" );
return NULL;
}
/* picture too late, won't decode
* but break picture until a new I, and for mpeg4 ...*/
p_sys->i_late_frames--; /* needed else it will never be decrease */
- block_Release( p_block );
+ if( p_block )
+ block_Release( p_block );
+ msg_Warn( p_dec, "More than 4 late frames, dropping frame" );
return NULL;
}
}
{
if( p_sys->b_hurry_up )
p_context->skip_frame = p_sys->i_skip_frame;
- if( !(p_block->i_flags & BLOCK_FLAG_PREROLL) )
+ if( !p_block || !(p_block->i_flags & BLOCK_FLAG_PREROLL) )
b_drawpicture = 1;
else
b_drawpicture = 0;
{
if( p_sys->b_hurry_up )
p_context->skip_frame = p_sys->i_skip_frame;
- b_null_size = true;
}
else if( !b_drawpicture )
{
/* Don't forget that libavcodec requires a little more bytes
* that the real frame size */
- if( p_block->i_buffer > 0 )
+ if( p_block && p_block->i_buffer > 0 )
{
p_sys->b_flush = ( p_block->i_flags & BLOCK_FLAG_END_OF_SEQUENCE ) != 0;
FF_INPUT_BUFFER_PADDING_SIZE );
}
- while( p_block->i_buffer > 0 || p_sys->b_flush )
+ while( !p_block || p_block->i_buffer > 0 || p_sys->b_flush )
{
int i_used, b_gotpicture;
picture_t *p_pic;
post_mt( p_sys );
av_init_packet( &pkt );
- pkt.data = p_block->p_buffer;
- pkt.size = p_block->i_buffer;
- pkt.pts = p_block->i_pts;
- pkt.dts = p_block->i_dts;
+ if( p_block )
+ {
+ pkt.data = p_block->p_buffer;
+ pkt.size = p_block->i_buffer;
+ pkt.pts = p_block->i_pts;
+ pkt.dts = p_block->i_dts;
+ }
+ else
+ {
+ /* Return delayed frames if codec has CODEC_CAP_DELAY */
+ pkt.data = NULL;
+ pkt.size = 0;
+ }
-#if LIBAVCODEC_VERSION_MAJOR >= 54
if( !p_sys->palette_sent )
{
uint8_t *pal = av_packet_new_side_data(&pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE);
p_sys->palette_sent = true;
}
}
-#endif
/* Make sure we don't reuse the same timestamps twice */
- p_block->i_pts =
- p_block->i_dts = VLC_TS_INVALID;
+ if( p_block )
+ {
+ p_block->i_pts =
+ p_block->i_dts = VLC_TS_INVALID;
+ }
i_used = avcodec_decode_video2( p_context, p_sys->p_ff_pic,
&b_gotpicture, &pkt );
+ av_free_packet( &pkt );
- if( b_null_size && !p_sys->b_flush &&
- p_context->width > 0 && p_context->height > 0 )
- {
- /* Reparse it to not drop the I frame */
- b_null_size = false;
- if( p_sys->b_hurry_up )
- p_context->skip_frame = p_sys->i_skip_frame;
- i_used = avcodec_decode_video2( p_context, p_sys->p_ff_pic,
- &b_gotpicture, &pkt );
- }
wait_mt( p_sys );
if( p_sys->b_flush )
p_sys->b_first_frame = true;
- if( p_block->i_buffer <= 0 )
- p_sys->b_flush = false;
-
- if( i_used < 0 )
+ if( p_block )
{
- if( b_drawpicture )
- msg_Warn( p_dec, "cannot decode one frame (%zu bytes)",
- p_block->i_buffer );
- block_Release( p_block );
- return NULL;
- }
- else if( (unsigned)i_used > p_block->i_buffer ||
- p_context->thread_count > 1 )
- {
- i_used = p_block->i_buffer;
- }
+ if( p_block->i_buffer <= 0 )
+ p_sys->b_flush = false;
+
+ if( i_used < 0 )
+ {
+ if( b_drawpicture )
+ msg_Warn( p_dec, "cannot decode one frame (%zu bytes)",
+ p_block->i_buffer );
+ block_Release( p_block );
+ return NULL;
+ }
+ else if( (unsigned)i_used > p_block->i_buffer ||
+ p_context->thread_count > 1 )
+ {
+ i_used = p_block->i_buffer;
+ }
- /* Consumed bytes */
- p_block->i_buffer -= i_used;
- p_block->p_buffer += i_used;
+ /* Consumed bytes */
+ p_block->i_buffer -= i_used;
+ p_block->p_buffer += i_used;
+ }
/* Nothing to display */
if( !b_gotpicture )
if( p_dec->fmt_in.video.i_frame_rate > 0 &&
p_dec->fmt_in.video.i_frame_rate_base > 0 )
{
- p_sys->i_pts += INT64_C(1000000) *
+ p_sys->i_pts += CLOCK_FREQ *
(2 + p_sys->p_ff_pic->repeat_pict) *
p_dec->fmt_in.video.i_frame_rate_base /
(2 * p_dec->fmt_in.video.i_frame_rate);
if( i_tick <= 0 )
i_tick = 1;
- p_sys->i_pts += INT64_C(1000000) *
+ p_sys->i_pts += CLOCK_FREQ *
(2 + p_sys->p_ff_pic->repeat_pict) *
i_tick * p_context->time_base.num /
(2 * p_context->time_base.den);
/* Update frame late count (except when doing preroll) */
mtime_t i_display_date = 0;
- if( !(p_block->i_flags & BLOCK_FLAG_PREROLL) )
+ if( !p_block || !(p_block->i_flags & BLOCK_FLAG_PREROLL) )
i_display_date = decoder_GetDisplayDate( p_dec, i_pts );
if( i_display_date > 0 && i_display_date <= mdate() )
p_pic = ffmpeg_NewPictBuf( p_dec, p_context );
if( !p_pic )
{
- block_Release( p_block );
+ if( p_block )
+ block_Release( p_block );
return NULL;
}
else
{
p_pic = (picture_t *)p_sys->p_ff_pic->opaque;
- decoder_LinkPicture( p_dec, p_pic );
+ picture_Hold( p_pic );
}
if( !p_dec->fmt_in.video.i_sar_num || !p_dec->fmt_in.video.i_sar_den )
}
else
{
- decoder_DeletePicture( p_dec, p_pic );
+ picture_Release( p_pic );
}
}
- block_Release( p_block );
+ if( p_block )
+ block_Release( p_block );
return NULL;
}
wait_mt( p_sys );
+ ffmpeg_CloseCodec( p_dec );
+
if( p_sys->p_ff_pic )
- av_free( p_sys->p_ff_pic );
+ avcodec_free_frame( &p_sys->p_ff_pic );
if( p_sys->p_va )
- vlc_va_Delete( p_sys->p_va );
+ vlc_va_Delete( p_sys->p_va, p_sys->p_context );
vlc_sem_destroy( &p_sys->sem_mt );
}
if( !i_size ) return;
- if( p_sys->i_codec_id == AV_CODEC_ID_SVQ3 )
+ if( p_sys->p_codec->id == AV_CODEC_ID_SVQ3 )
{
uint8_t *p;
p_sys->p_context->extradata_size = i_size + 12;
- p = p_sys->p_context->extradata =
- malloc( p_sys->p_context->extradata_size );
+ p = p_sys->p_context->extradata =
+ av_malloc( p_sys->p_context->extradata_size +
+ FF_INPUT_BUFFER_PADDING_SIZE );
if( !p )
return;
{
p_sys->p_context->extradata_size = i_size;
p_sys->p_context->extradata =
- malloc( i_size + FF_INPUT_BUFFER_PADDING_SIZE );
+ av_malloc( i_size + FF_INPUT_BUFFER_PADDING_SIZE );
if( p_sys->p_context->extradata )
{
memcpy( p_sys->p_context->extradata,
p_dec->fmt_in.p_extra, i_size );
- memset( &((uint8_t*)p_sys->p_context->extradata)[i_size],
+ memset( p_sys->p_context->extradata + i_size,
0, FF_INPUT_BUFFER_PADDING_SIZE );
}
}
uint8_t *p_dst, *p_src;
int i_src_stride, i_dst_stride;
+ if( p_sys->p_context->pix_fmt == PIX_FMT_PAL8 )
+ {
+ if( !p_pic->format.p_palette )
+ p_pic->format.p_palette = calloc( 1, sizeof(video_palette_t) );
+
+ if( p_pic->format.p_palette )
+ {
+ p_pic->format.p_palette->i_entries = AVPALETTE_COUNT;
+ memcpy( p_pic->format.p_palette->palette, p_ff_pic->data[1], AVPALETTE_SIZE );
+ }
+ }
+
for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
{
p_src = p_ff_pic->data[i_plane];
decoder_sys_t *sys = dec->p_sys;
vlc_va_t *va = sys->p_va;
- if (vlc_va_Setup(va, &ctx->hwaccel_context, &dec->fmt_out.video.i_chroma,
- ctx->coded_width, ctx->coded_height))
+ if (vlc_va_Setup(va, ctx, &dec->fmt_out.video.i_chroma))
{
msg_Err(dec, "hardware acceleration setup failed");
return -1;
return 0;
}
-typedef struct
-{
- decoder_t *decoder;
- picture_t *picture;
-} lavc_pic_ref_t;
-
static void lavc_dr_ReleaseFrame(void *opaque, uint8_t *data)
{
- lavc_pic_ref_t *ref = opaque;
+ picture_t *picture = opaque;
- decoder_UnlinkPicture(ref->decoder, ref->picture);
- free(ref);
+ picture_Release(picture);
(void) data;
}
/* Allocate buffer references */
for (int i = 0; i < pic->i_planes; i++)
{
- lavc_pic_ref_t *ref = malloc(sizeof (*ref));
- if (ref == NULL)
- goto error;
- ref->decoder = dec;
- ref->picture = pic;
- decoder_LinkPicture(dec, pic);
-
uint8_t *data = pic->p[i].p_pixels;
int size = pic->p[i].i_pitch * pic->p[i].i_lines;
frame->buf[i] = av_buffer_create(data, size, lavc_dr_ReleaseFrame,
- ref, 0);
+ picture_Hold(pic), 0);
if (unlikely(frame->buf[i] == NULL))
{
- lavc_dr_ReleaseFrame(ref, data);
+ lavc_dr_ReleaseFrame(pic, data);
goto error;
}
}
- decoder_UnlinkPicture(dec, pic);
+ picture_Release(pic);
(void) flags;
return pic;
error:
for (unsigned i = 0; frame->buf[i] != NULL; i++)
av_buffer_unref(&frame->buf[i]);
no_dr:
- decoder_DeletePicture(dec, pic);
+ picture_Release(pic);
return NULL;
}
vlc_va_t *p_va = p_sys->p_va;
/* hwaccel_context is not present in old ffmpeg version */
- if( vlc_va_Setup( p_va,
- &p_context->hwaccel_context, &p_dec->fmt_out.video.i_chroma,
- p_context->coded_width, p_context->coded_height ) )
+ if( vlc_va_Setup( p_va, p_context, &p_dec->fmt_out.video.i_chroma ) )
{
msg_Err( p_dec, "vlc_va_Setup failed" );
return -1;
static picture_t *ffmpeg_dr_GetFrameBuf(struct AVCodecContext *p_context)
{
decoder_t *p_dec = (decoder_t *)p_context->opaque;
- decoder_sys_t *p_sys = p_dec->p_sys;
int i_width = p_context->width;
int i_height = p_context->height;
for( int i = 0; i < p_pic->i_planes; i++ )
{
unsigned i_align;
- switch( p_sys->i_codec_id )
+ switch( p_context->codec_id )
{
case AV_CODEC_ID_SVQ1:
case AV_CODEC_ID_VP5:
no_dr:
if (p_pic)
- decoder_DeletePicture( p_dec, p_pic );
+ picture_Release( p_pic );
return NULL;
}
#if ! LIBAVCODEC_VERSION_CHECK(54, 34, 0, 79, 101)
p_ff_pic->pkt_pts = p_context->pkt ? p_context->pkt->pts : AV_NOPTS_VALUE;
#endif
-#if LIBAVCODEC_VERSION_MAJOR < 54
- p_ff_pic->age = 256*256*256*64;
-#endif
if( p_sys->p_va )
return ffmpeg_va_GetFrameBuf(p_context, p_ff_pic);
if( p_sys->p_va )
vlc_va_Release( p_sys->p_va, p_ff_pic->opaque, p_ff_pic->data[0] );
else if( p_ff_pic->opaque )
- decoder_UnlinkPicture( p_dec, (picture_t*)p_ff_pic->opaque);
+ picture_Release( (picture_t*)p_ff_pic->opaque);
else if( p_ff_pic->type == FF_BUFFER_TYPE_INTERNAL )
/* We can end up here without the AVFrame being allocated by
* avcodec_default_get_buffer() if VA is used and the frame is
vlc_va_t *p_va = p_sys->p_va;
if( p_va != NULL )
- vlc_va_Delete( p_va );
+ vlc_va_Delete( p_va, p_context );
/* Enumerate available formats */
bool can_hwaccel = false;
if( p_context->level != FF_LEVEL_UNKNOWN)
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_context, &p_dec->fmt_in );
if( p_va == NULL )
goto end;
/* 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 ) )
+ && vlc_va_Setup( p_va, p_context, &p_dec->fmt_out.video.i_chroma ) )
{
msg_Err( p_dec, "acceleration setup failure" );
break;
return pi_fmt[i];
}
- vlc_va_Delete( p_va );
+ vlc_va_Delete( p_va, p_context );
end:
/* Fallback to default behaviour */
projects / vlc / blobdiff