[vlc-devel] commit: libmpeg2: Fix Closed Captions in GOP. (Derk-Jan Hartman )
git version control
git at videolan.org
Mon Apr 6 23:00:20 CEST 2009
vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Mon Apr 6 22:54:11 2009 +0200| [3fac9782373bfc7dbb6839183a6003fae26d4a43] | committer: Derk-Jan Hartman
libmpeg2: Fix Closed Captions in GOP.
This fixes a case where our libmpeg2 module was not extracting
Closed Captions from the user_data, when this user_data was in the
GOP header, instead of in the picture header. This information is
retained until the next picture (date) is handled.
See sample "bob-dvd-closedcaptioning works in ffmpeg but not in libmpeg2.ts"
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3fac9782373bfc7dbb6839183a6003fae26d4a43
---
modules/codec/libmpeg2.c | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c
index 4b6f282..5a2ef6f 100644
--- a/modules/codec/libmpeg2.c
+++ b/modules/codec/libmpeg2.c
@@ -82,6 +82,8 @@ struct decoder_sys_t
mtime_t i_cc_pts;
mtime_t i_cc_dts;
cc_data_t cc;
+ uint8_t *p_gop_user_data;
+ uint32_t i_gop_user_data;
};
/*****************************************************************************
@@ -154,6 +156,8 @@ static int OpenDecoder( vlc_object_t *p_this )
p_dec->pf_get_cc = GetCc;
cc_Init( &p_sys->cc );
#endif
+ p_sys->p_gop_user_data = NULL;
+ p_sys->i_gop_user_data = 0;
#if defined( __i386__ ) || defined( __x86_64__ )
if( vlc_CPU() & CPU_CAPABILITY_MMX )
@@ -464,7 +468,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic );
mpeg2_stride( p_sys->p_mpeg2dec, p_pic->p[Y_PLANE].i_pitch );
}
- if( p_sys->p_info->user_data_len > 2 )
+ if( p_sys->p_info->user_data_len > 2 || p_sys->i_gop_user_data > 2 )
{
p_sys->i_cc_pts = i_pts;
p_sys->i_cc_dts = i_dts;
@@ -476,11 +480,34 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_sys->i_cc_flags = BLOCK_FLAG_TYPE_B;
else p_sys->i_cc_flags = BLOCK_FLAG_TYPE_I;
- cc_Extract( &p_sys->cc, &p_sys->p_info->user_data[0], p_sys->p_info->user_data_len );
+ if( p_sys->i_gop_user_data > 2 )
+ {
+ /* We now have picture info for any cached user_data out of the gop */
+ cc_Extract( &p_sys->cc, &p_sys->p_gop_user_data[0], p_sys->i_gop_user_data );
+ p_sys->i_gop_user_data = 0;
+ }
+
+ /* Extract the CC from the user_data of the picture */
+ if( p_sys->p_info->user_data_len > 2 )
+ cc_Extract( &p_sys->cc, &p_sys->p_info->user_data[0], p_sys->p_info->user_data_len );
}
}
break;
+ case STATE_GOP:
+ /* There can be userdata in a GOP. It needs to be remembered for the next picture. */
+ if( p_sys->p_info->user_data_len > 2 )
+ {
+ free( p_sys->p_gop_user_data );
+ p_sys->p_gop_user_data = calloc( p_sys->p_info->user_data_len, sizeof(uint8_t) );
+ if( p_sys->p_gop_user_data )
+ {
+ p_sys->i_gop_user_data = p_sys->p_info->user_data_len;
+ memcpy( p_sys->p_gop_user_data, p_sys->p_info->user_data, p_sys->p_info->user_data_len );
+ }
+ }
+ break;
+
case STATE_END:
case STATE_SLICE:
p_pic = NULL;
@@ -600,6 +627,8 @@ static void CloseDecoder( vlc_object_t *p_this )
decoder_t *p_dec = (decoder_t *)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
+ free( p_sys->p_gop_user_data );
+
if( p_sys->p_synchro ) decoder_SynchroRelease( p_sys->p_synchro );
if( p_sys->p_mpeg2dec ) mpeg2_close( p_sys->p_mpeg2dec );
More information about the vlc-devel
mailing list