# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_codec.h>
-#include <vlc_vout.h>
#include <vlc_block.h>
#include <p64/p64.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( _("Video decoder using openmash") );
- set_capability( "decoder", 50 );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_VCODEC );
- set_callbacks( OpenDecoder, CloseDecoder );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("Video decoder using openmash") )
+ set_capability( "decoder", 50 )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_VCODEC )
+ set_callbacks( OpenDecoder, CloseDecoder )
+vlc_module_end ()
/*****************************************************************************
* OpenDecoder: probe the decoder and return score
switch( p_dec->fmt_in.i_codec )
{
/* Planar YUV */
- case VLC_FOURCC('h','2','6','1'):
- case VLC_FOURCC('H','2','6','1'):
+ case VLC_CODEC_H261:
break;
default:
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys =
(decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
- {
- msg_Err( p_dec, "out of memory" );
- return VLC_EGENERIC;
- }
+ return VLC_ENOMEM;
/* Misc init */
- p_sys->i_pts = 0;
+ p_sys->i_pts = VLC_TS_INVALID;
p_sys->b_inited = false;
p_sys->i_counter = 0;
/* Set output properties */
p_dec->fmt_out.i_cat = VIDEO_ES;
- p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0');
+ p_dec->fmt_out.i_codec = VLC_CODEC_I420;
/* 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_sys->i_pts <= VLC_TS_INVALID && p_block->i_pts <= VLC_TS_INVALID &&
+ p_block->i_dts <= VLC_TS_INVALID )
{
/* We've just started the stream, wait for the first PTS. */
block_Release( p_block );
/* Date management */
- if( p_block->i_pts > 0 || p_block->i_dts > 0 )
- {
- 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;
- }
+ if( p_block->i_pts > VLC_TS_INVALID )
+ p_sys->i_pts = p_block->i_pts;
+ else if( p_block->i_dts > VLC_TS_INVALID )
+ p_sys->i_pts = p_block->i_dts;
i_video_header = *(uint32_t*)p_block->p_buffer; /* yes, it is native endian */
sbit = i_video_header >> 29; /* start bit position */
mvdv = i_video_header & 0x1f; /* vertical motion vector data */
cc = p_block->i_buffer - 4;
msg_Dbg( p_dec, "packet size %d", cc );
-
+
/* Find out p_vdec->i_raw_size */
p_sys->p_decoder->decode( p_block->p_buffer + 4 /*bp?*/,
cc /*cc?*/,
{
msg_Dbg( p_dec, "video size is perhaps %dx%d", i_width,
i_height);
- vout_InitFormat( &p_dec->fmt_out.video, VLC_FOURCC('I','4','2','0'),
- i_width, i_height,
- VOUT_ASPECT_FACTOR * i_width / i_height );
+ video_format_Setup( &p_dec->fmt_out.video, VLC_CODEC_I420,
+ i_width, i_height,
+ 1, 1 );
p_sys->b_inited = true;
}
p_pic = NULL;
// p_sys->p_decoder->sync();
if( p_block->i_flags & BLOCK_FLAG_END_OF_FRAME )
{
- p_pic = p_dec->pf_vout_buffer_new( p_dec );
+ p_pic = decoder_NewPicture( p_dec );
if( !p_pic )
{
block_Release( p_block );