/* */
-#if LIBAVCODEC_VERSION_MAJOR < 54
- AVPaletteControl palette;
-#else
bool palette_sent;
-#endif
/* */
bool b_flush;
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 ) )
{
if( var_CreateGetBool( p_dec, "grayscale" ) )
p_sys->p_context->flags |= CODEC_FLAG_GRAY;
+ /* ***** Output always the frames ***** */
+#if LIBAVCODEC_VERSION_CHECK(55, 23, 1, 40, 101)
+ p_sys->p_context->flags |= CODEC_FLAG_OUTPUT_CORRUPT;
+#endif
+
i_val = var_CreateGetInteger( p_dec, "avcodec-vismv" );
if( i_val ) p_sys->p_context->debug_mv = i_val;
# endif
}
+ /* 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_sys->p_context->thread_type &= ~FF_THREAD_FRAME;
+ }
+ free( avcodec_hw );
+# endif
+
if( p_sys->p_context->thread_type & FF_THREAD_FRAME )
p_dec->i_extra_picture_buffers = 2 * p_sys->p_context->thread_count;
#endif
}
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 );
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 )
}
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 );
- 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;
}
}
}
- block_Release( p_block );
+ if( p_block )
+ block_Release( p_block );
return NULL;
}
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];
#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_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;
projects / vlc / blobdiff