/* Video output callbacks
* XXX use decoder_NewPicture/decoder_DeletePicture
- * and decoder_LinkPicture/decoder_UnlinkPicture */
+ * and decoder_UnlinkPicture */
int (*pf_vout_format_update)( decoder_t * );
picture_t *(*pf_vout_buffer_new)( decoder_t * );
void (*pf_vout_buffer_del)( decoder_t *, picture_t * );
- void (*pf_picture_link) ( decoder_t *, picture_t * );
void (*pf_picture_unlink) ( decoder_t *, picture_t * );
/**
*/
VLC_API void decoder_DeletePicture( decoder_t *, picture_t *p_picture );
-/**
- * This function will increase the picture reference count.
- * (picture_Hold is not usable.)
- */
-VLC_API void decoder_LinkPicture( decoder_t *, picture_t * );
-
/**
* This function will decrease the picture reference count.
* (picture_Release is not usable.)
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 )
goto error;
ref->decoder = dec;
ref->picture = pic;
- decoder_LinkPicture(dec, pic);
+ picture_Hold(pic);
uint8_t *data = pic->p[i].p_pixels;
int size = pic->p[i].i_pitch * pic->p[i].i_lines;
p->p_picture = GetNewPicture( p_dec );
if( p->p_picture )
{
- decoder_LinkPicture( p_dec, p->p_picture );
+ picture_Hold( p->p_picture );
p->b_linked = true;
p->b_displayed = false;
static int video_update_format( vlc_object_t *, decoder_owner_sys_t *,
es_format_t * );
-static void video_link_picture_decoder( decoder_t *, picture_t * );
static void video_unlink_picture_decoder( decoder_t *, picture_t * );
static int HeightCallback( vlc_object_t *, char const *,
p_sys->p_decoder->pf_vout_format_update = video_update_format_decoder;
p_sys->p_decoder->pf_vout_buffer_new = video_new_buffer_decoder;
p_sys->p_decoder->pf_vout_buffer_del = video_del_buffer_decoder;
- p_sys->p_decoder->pf_picture_link = video_link_picture_decoder;
p_sys->p_decoder->pf_picture_unlink = video_unlink_picture_decoder;
p_sys->p_decoder->p_owner = malloc( sizeof(decoder_owner_sys_t) );
if( !p_sys->p_decoder->p_owner )
picture_Release( p_pic );
}
-static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
-{
- VLC_UNUSED(p_dec);
- picture_Hold( p_pic );
-}
-
static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
{
VLC_UNUSED(p_dec);
picture_Release( p_pic );
}
-static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
-{
- VLC_UNUSED(p_dec);
- picture_Hold( p_pic );
-}
-
static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
{
VLC_UNUSED(p_dec);
id->p_decoder->pf_vout_format_update = video_update_format_decoder;
id->p_decoder->pf_vout_buffer_new = video_new_buffer_decoder;
id->p_decoder->pf_vout_buffer_del = video_del_buffer_decoder;
- id->p_decoder->pf_picture_link = video_link_picture_decoder;
id->p_decoder->pf_picture_unlink = video_unlink_picture_decoder;
id->p_decoder->p_owner = malloc( sizeof(decoder_owner_sys_t) );
if( !id->p_decoder->p_owner )
{
p_decoder->pf_vout_buffer_del( p_decoder, p_picture );
}
-void decoder_LinkPicture( decoder_t *p_decoder, picture_t *p_picture )
-{
- p_decoder->pf_picture_link( p_decoder, p_picture );
-}
void decoder_UnlinkPicture( decoder_t *p_decoder, picture_t *p_picture )
{
p_decoder->pf_picture_unlink( p_decoder, p_picture );
p_dec->pf_vout_format_update = vout_update_format;
p_dec->pf_vout_buffer_new = vout_new_buffer;
p_dec->pf_vout_buffer_del = vout_del_buffer;
- p_dec->pf_picture_link = vout_link_picture;
p_dec->pf_picture_unlink = vout_unlink_picture;
p_dec->pf_spu_buffer_new = spu_new_buffer;
p_dec->pf_spu_buffer_del = spu_del_buffer;
vout_ReleasePicture( p_dec->p_owner->p_vout, p_pic );
}
-static void vout_link_picture( decoder_t *p_dec, picture_t *p_pic )
-{
- picture_Hold( p_pic );
-}
-
static void vout_unlink_picture( decoder_t *p_dec, picture_t *p_pic )
{
vout_ReleasePicture( p_dec->p_owner->p_vout, p_pic );
decoder_GetDisplayDate
decoder_GetDisplayRate
decoder_GetInputAttachments
-decoder_LinkPicture
decoder_NewAudioBuffer
decoder_NewPicture
decoder_NewSubpicture
picture_Release( p_pic );
}
-static void video_link_picture( decoder_t *p_dec, picture_t *p_pic )
-{
- (void)p_dec;
- picture_Hold( p_pic );
-}
-
static void video_unlink_picture( decoder_t *p_dec, picture_t *p_pic )
{
(void)p_dec;
p_dec->pf_vout_format_update = video_update_format;
p_dec->pf_vout_buffer_new = video_new_buffer;
p_dec->pf_vout_buffer_del = video_del_buffer;
- p_dec->pf_picture_link = video_link_picture;
p_dec->pf_picture_unlink = video_unlink_picture;
/* Find a suitable decoder module */