#if LIBAVCODEC_VERSION_MAJOR < 54
AVPaletteControl palette;
#else
-# warning FIXME
+ bool palette_sent;
#endif
/* */
AVCodecContext *p_context )
{
decoder_sys_t *p_sys = p_dec->p_sys;
+ int width = p_context->coded_width;
+ int height = p_context->coded_height;
- if( p_context->coded_width != p_context->width ||
- p_context->coded_height != p_context->height )
+ if( p_sys->p_va == NULL )
{
- p_dec->fmt_out.video.i_visible_width = p_context->width;
- p_dec->fmt_out.video.i_visible_height = p_context->height;
+ int aligns[AV_NUM_DATA_POINTERS];
+
+ avcodec_align_dimensions2(p_context, &width, &height, aligns);
}
- p_dec->fmt_out.video.i_width = p_context->coded_width;
- p_dec->fmt_out.video.i_height = p_context->coded_height;
- if( !p_context->width || !p_context->height )
+
+ 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;
+
+ if( width != p_context->width || height != p_context->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;
if( var_CreateGetBool( p_dec, "avcodec-fast" ) )
p_sys->p_context->flags2 |= CODEC_FLAG2_FAST;
-#if LIBAVCODEC_VERSION_CHECK( 54, 41, 0, 91, 100 )
- if( var_InheritBool( p_dec, "avcodec-ignorecrop" ) )
- p_sys->p_context->flags2 |= CODEC_FLAG2_IGNORE_CROP;
-#endif
-
/* ***** libavcodec frame skipping ***** */
p_sys->b_hurry_up = var_CreateGetBool( p_dec, "avcodec-hurry-up" );
- switch( var_CreateGetInteger( p_dec, "avcodec-skip-frame" ) )
- {
- case -1:
- p_sys->p_context->skip_frame = AVDISCARD_NONE;
- break;
- case 0:
- p_sys->p_context->skip_frame = AVDISCARD_DEFAULT;
- break;
- case 1:
- p_sys->p_context->skip_frame = AVDISCARD_NONREF;
- break;
- case 2:
- p_sys->p_context->skip_frame = AVDISCARD_NONKEY;
- break;
- case 3:
- p_sys->p_context->skip_frame = AVDISCARD_ALL;
- break;
- default:
- p_sys->p_context->skip_frame = AVDISCARD_NONE;
- break;
- }
+ 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;
- switch( var_CreateGetInteger( p_dec, "avcodec-skip-idct" ) )
- {
- case -1:
- p_sys->p_context->skip_idct = AVDISCARD_NONE;
- break;
- case 0:
- p_sys->p_context->skip_idct = AVDISCARD_DEFAULT;
- break;
- case 1:
- p_sys->p_context->skip_idct = AVDISCARD_NONREF;
- break;
- case 2:
- p_sys->p_context->skip_idct = AVDISCARD_NONKEY;
- break;
- case 3:
- p_sys->p_context->skip_idct = AVDISCARD_ALL;
- break;
- default:
- p_sys->p_context->skip_idct = AVDISCARD_NONE;
- break;
- }
+ 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;
/* ***** libavcodec direct rendering ***** */
}
p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma;
+ p_dec->fmt_out.video.orientation = p_dec->fmt_in.video.orientation;
+
#if LIBAVCODEC_VERSION_MAJOR < 54
/* Setup palette */
memset( &p_sys->palette, 0, sizeof(p_sys->palette) );
p_sys->p_context->palctrl = &p_sys->palette;
}
#else
-# warning FIXME
+ 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) );
+ if( p_dec->fmt_out.video.p_palette )
+ *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 ***** */
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);
+ if (pal) {
+ memcpy(pal, p_dec->fmt_in.video.p_palette->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( 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 )
+ if( p_block )
{
- i_used = p_block->i_buffer;
- }
+ if( p_block->i_buffer <= 0 )
+ p_sys->b_flush = false;
- /* Consumed bytes */
- p_block->i_buffer -= i_used;
- p_block->p_buffer += i_used;
+ 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;
+ }
/* Nothing to display */
if( !b_gotpicture )
/* 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;
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 );
}
}
if( p_sys->p_va )
{
- vlc_va_Extract( p_sys->p_va, p_pic, p_ff_pic );
+ vlc_va_Extract( p_sys->p_va, p_pic, p_ff_pic->opaque,
+ p_ff_pic->data[3] );
}
else if( FindVlcChroma( p_sys->p_context->pix_fmt ) )
{
msg_Err(dec, "hardware acceleration setup failed");
return -1;
}
- if (vlc_va_Get(va, frame))
+ if (vlc_va_Get(va, &frame->opaque, &frame->data[0]))
{
msg_Err(dec, "hardware acceleration picture allocation failed");
return -1;
}
+ /* data[0] must be non-NULL for libavcodec internal checks.
+ * data[3] actually contains the format-specific surface handle. */
+ frame->data[3] = frame->data[0];
frame->buf[0] = av_buffer_create(frame->data[0], 0, va->release,
frame->opaque, 0);
return -1;
}
assert(frame->data[0] != NULL);
- assert(frame->data[3] != NULL);
(void) flags;
return 0;
}
AVFrame *frame, int flags)
{
decoder_t *dec = (decoder_t *)ctx->opaque;
+ decoder_sys_t *sys = dec->p_sys;
if (GetVlcChroma(&dec->fmt_out.video, ctx->pix_fmt) != VLC_SUCCESS)
return NULL;
/* Check that the picture is suitable for libavcodec */
if (pic->p[0].i_pitch < width * pic->p[0].i_pixel_pitch)
{
- msg_Dbg(dec, "plane 0: pitch too small (%d/%d*%d)",
- pic->p[0].i_pitch, width, pic->p[0].i_pixel_pitch);
+ if (sys->i_direct_rendering_used != 0)
+ msg_Dbg(dec, "plane 0: pitch too small (%d/%d*%d)",
+ pic->p[0].i_pitch, width, pic->p[0].i_pixel_pitch);
goto no_dr;
}
if (pic->p[0].i_lines < height)
{
- msg_Dbg(dec, "plane 0: lines too few (%d/%d)",
- pic->p[0].i_lines, height);
+ if (sys->i_direct_rendering_used != 0)
+ msg_Dbg(dec, "plane 0: lines too few (%d/%d)",
+ pic->p[0].i_lines, height);
goto no_dr;
}
{
if (pic->p[i].i_pitch % aligns[i])
{
- msg_Dbg(dec, "plane %d: pitch not aligned (%d%%%d)",
- i, pic->p[i].i_pitch, aligns[i]);
+ if (sys->i_direct_rendering_used != 0)
+ msg_Dbg(dec, "plane %d: pitch not aligned (%d%%%d)",
+ i, pic->p[i].i_pitch, aligns[i]);
goto no_dr;
}
if (((uintptr_t)pic->p[i].p_pixels) % aligns[i])
{
- msg_Warn(dec, "plane %d not aligned", i);
+ if (sys->i_direct_rendering_used != 0)
+ msg_Warn(dec, "plane %d not aligned", i);
goto no_dr;
}
}
return -1;
}
- if( vlc_va_Get( p_va, p_ff_pic ) )
+ if( vlc_va_Get( p_va, &p_ff_pic->opaque, &p_ff_pic->data[0] ) )
{
msg_Err( p_dec, "vlc_va_Get failed" );
return -1;
}
+ p_ff_pic->data[3] = p_ff_pic->data[0];
p_ff_pic->type = FF_BUFFER_TYPE_USER;
return 0;
}
if (!can_hwaccel)
goto end;
- /* Profile and level informations are needed now.
+ /* Profile and level information is needed now.
* TODO: avoid code duplication with avcodec.c */
if( p_context->profile != FF_PROFILE_UNKNOWN)
p_dec->fmt_in.i_profile = p_context->profile;
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;