#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
-#include <vlc_vout.h>
/*****************************************************************************
* decoder_sys_t : raw video decoder descriptor
/*
* Common properties
*/
- mtime_t i_pts;
-
+ date_t pts;
};
/****************************************************************************
switch( p_dec->fmt_in.i_codec )
{
/* Planar YUV */
- case VLC_FOURCC('I','4','4','4'):
- case VLC_FOURCC('I','4','2','2'):
- case VLC_FOURCC('I','4','2','0'):
- case VLC_FOURCC('Y','V','1','2'):
- case VLC_FOURCC('I','Y','U','V'):
- case VLC_FOURCC('I','4','1','1'):
- case VLC_FOURCC('I','4','1','0'):
- case VLC_FOURCC('Y','V','U','9'):
- case VLC_FOURCC('Y','4','2','B'):
- case VLC_FOURCC('Y','4','1','B'):
+ case VLC_CODEC_I444:
+ case VLC_CODEC_J444:
+ case VLC_CODEC_I422:
+ case VLC_CODEC_J422:
+ case VLC_CODEC_I420:
+ case VLC_CODEC_J420:
+ case VLC_CODEC_YV12:
+ case VLC_CODEC_YV9:
+ case VLC_CODEC_I411:
+ case VLC_CODEC_I410:
+ case VLC_CODEC_GREY:
+ case VLC_CODEC_YUVP:
/* Packed YUV */
- case VLC_FOURCC('Y','U','Y','2'):
- case VLC_FOURCC('Y','8','0','0'):
- case VLC_FOURCC('U','Y','V','Y'):
- case VLC_FOURCC('H','D','Y','C'):
+ case VLC_CODEC_YUYV:
+ case VLC_CODEC_YVYU:
+ case VLC_CODEC_UYVY:
+ case VLC_CODEC_VYUY:
/* RGB */
- case VLC_FOURCC('R','V','3','2'):
- case VLC_FOURCC('R','V','2','4'):
- case VLC_FOURCC('R','V','1','6'):
- case VLC_FOURCC('R','V','1','5'):
- break;
- case VLC_FOURCC('2','V','u','y'):
- case VLC_FOURCC('2','v','u','y'):
- case VLC_FOURCC('A','V','U','I'):
- p_dec->fmt_in.i_codec = VLC_FOURCC('U','Y','V','Y');
- break;
- case VLC_FOURCC('y','v','1','2'):
- p_dec->fmt_in.i_codec = VLC_FOURCC('Y','V','1','2');
+ case VLC_CODEC_RGB32:
+ case VLC_CODEC_RGB24:
+ case VLC_CODEC_RGB16:
+ case VLC_CODEC_RGB15:
+ case VLC_CODEC_RGB8:
+ case VLC_CODEC_RGBP:
break;
default:
return VLC_ENOMEM;
/* Misc init */
p_dec->p_sys->b_packetizer = false;
- p_sys->i_pts = 0;
p_sys->b_invert = 0;
if( (int)p_dec->fmt_in.video.i_height < 0 )
return VLC_EGENERIC;
}
- /* Find out p_vdec->i_raw_size */
- vout_InitFormat( &p_dec->fmt_out.video, p_dec->fmt_in.i_codec,
- p_dec->fmt_in.video.i_width,
- p_dec->fmt_in.video.i_height,
- p_dec->fmt_in.video.i_aspect );
- p_sys->i_raw_size = p_dec->fmt_out.video.i_bits_per_pixel *
- p_dec->fmt_out.video.i_width * p_dec->fmt_out.video.i_height / 8;
-
- /* Set output properties */
- p_dec->fmt_out.i_cat = VIDEO_ES;
- p_dec->fmt_out.i_codec = p_dec->fmt_in.i_codec;
- if( !p_dec->fmt_in.video.i_aspect )
+ es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
+
+ date_Init( &p_sys->pts, p_dec->fmt_out.video.i_frame_rate,
+ p_dec->fmt_out.video.i_frame_rate_base );
+ if( p_dec->fmt_out.video.i_frame_rate == 0 ||
+ p_dec->fmt_out.video.i_frame_rate_base == 0)
{
- p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR *
- p_dec->fmt_out.video.i_width / p_dec->fmt_out.video.i_height;
+ msg_Warn( p_dec, "invalid frame rate %d/%d, using 25 fps instead",
+ p_dec->fmt_out.video.i_frame_rate,
+ p_dec->fmt_out.video.i_frame_rate_base);
+ date_Init( &p_sys->pts, 25, 1 );
}
- else p_dec->fmt_out.video.i_aspect = p_dec->fmt_in.video.i_aspect;
- if( p_dec->fmt_in.video.i_rmask )
- p_dec->fmt_out.video.i_rmask = p_dec->fmt_in.video.i_rmask;
- if( p_dec->fmt_in.video.i_gmask )
- p_dec->fmt_out.video.i_gmask = p_dec->fmt_in.video.i_gmask;
- if( p_dec->fmt_in.video.i_bmask )
- p_dec->fmt_out.video.i_bmask = p_dec->fmt_in.video.i_bmask;
+ /* Find out p_vdec->i_raw_size */
+ video_format_Setup( &p_dec->fmt_out.video, p_dec->fmt_in.i_codec,
+ p_dec->fmt_in.video.i_width,
+ p_dec->fmt_in.video.i_height,
+ p_dec->fmt_in.video.i_sar_num,
+ p_dec->fmt_in.video.i_sar_den );
+ picture_t picture;
+ picture_Setup( &picture, p_dec->fmt_out.i_codec,
+ p_dec->fmt_in.video.i_width,
+ p_dec->fmt_in.video.i_height, 0, 1 );
+ p_sys->i_raw_size = 0;
+ for( int i = 0; i < picture.i_planes; i++ )
+ p_sys->i_raw_size += picture.p[i].i_visible_pitch *
+ picture.p[i].i_visible_lines;
+
+ if( !p_dec->fmt_in.video.i_sar_num || !p_dec->fmt_in.video.i_sar_den )
+ {
+ p_dec->fmt_out.video.i_sar_num = 1;
+ p_dec->fmt_out.video.i_sar_den = 1;
+ }
/* Set callbacks */
p_dec->pf_decode_video = (picture_t *(*)(decoder_t *, block_t **))
p_block = *pp_block;
- if( !p_sys->i_pts && !p_block->i_pts && !p_block->i_dts )
+
+ if( p_block->i_pts <= VLC_TS_INVALID && p_block->i_dts <= VLC_TS_INVALID &&
+ !date_Get( &p_sys->pts ) )
{
/* We've just started the stream, wait for the first PTS. */
block_Release( p_block );
return NULL;
}
- /* Date management */
- if( p_block->i_pts > 0 || p_block->i_dts > 0 )
+ /* Date management: If there is a pts avaliable, use that. */
+ if( p_block->i_pts > VLC_TS_INVALID )
+ {
+ date_Set( &p_sys->pts, p_block->i_pts );
+ }
+ else if( p_block->i_dts > VLC_TS_INVALID )
{
- if( p_block->i_pts > 0 ) p_sys->i_pts = p_block->i_pts;
- else if( p_block->i_dts > 0 ) p_sys->i_pts = p_block->i_dts;
+ /* NB, davidf doesn't quite agree with this in general, it is ok
+ * for rawvideo since it is in order (ie pts=dts), however, it
+ * may not be ok for an out-of-order codec, so don't copy this
+ * without thinking */
+ date_Set( &p_sys->pts, p_block->i_dts );
}
if( p_block->i_buffer < p_sys->i_raw_size )
}
/* Date management: 1 frame per packet */
- p_sys->i_pts += ( INT64_C(1000000) * 1.0 / 25 /*FIXME*/ );
+ date_Increment( &p_sys->pts, 1 );
*pp_block = NULL;
return p_buf;
FillPicture( p_dec, p_block, p_pic );
- p_pic->date = p_sys->i_pts;
+ p_pic->date = date_Get( &p_sys->pts );
+ if( p_block->i_flags & BLOCK_FLAG_INTERLACED_MASK )
+ {
+ p_pic->b_progressive = false;
+ p_pic->i_nb_fields = 2;
+ if( p_block->i_flags & BLOCK_FLAG_TOP_FIELD_FIRST )
+ p_pic->b_top_field_first = true;
+ else
+ p_pic->b_top_field_first = false;
+ }
+ else
+ p_pic->b_progressive = true;
block_Release( p_block );
return p_pic;
{
decoder_sys_t *p_sys = p_dec->p_sys;
- p_block->i_dts = p_block->i_pts = p_sys->i_pts;
+ p_block->i_dts = p_block->i_pts = date_Get( &p_sys->pts );
if( p_sys->b_invert )
{
int i, j;
/* Fill in picture_t fields */
- vout_InitPicture( VLC_OBJECT(p_dec), &pic, p_dec->fmt_out.i_codec,
- p_dec->fmt_out.video.i_width,
- p_dec->fmt_out.video.i_height, VOUT_ASPECT_FACTOR );
+ picture_Setup( &pic, p_dec->fmt_out.i_codec,
+ p_dec->fmt_out.video.i_width,
+ p_dec->fmt_out.video.i_height, 0, 1 );
if( !pic.i_planes )
{