Commit 1a2ecda0 authored by David Flynn's avatar David Flynn Committed by Jean-Baptiste Kempf

codec/schroedinger: remove ts hack, request packetizer

Signed-off-by: default avatarDavid Flynn <davidf@rd.bbc.co.uk>
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent eead4875
...@@ -90,7 +90,6 @@ struct decoder_sys_t ...@@ -90,7 +90,6 @@ struct decoder_sys_t
SchroDecoder *p_schro; SchroDecoder *p_schro;
SchroVideoFormat *p_format; SchroVideoFormat *p_format;
struct picture_pts_t pts_tlb[PTS_TLB_SIZE]; struct picture_pts_t pts_tlb[PTS_TLB_SIZE];
int i_ts_resync_hack;
}; };
//#define TRACE //#define TRACE
...@@ -141,10 +140,12 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -141,10 +140,12 @@ static int OpenDecoder( vlc_object_t *p_this )
p_sys->p_format = NULL; p_sys->p_format = NULL;
p_sys->i_lastpts = -1; p_sys->i_lastpts = -1;
p_sys->i_frame_pts_delta = 0; p_sys->i_frame_pts_delta = 0;
p_sys->i_ts_resync_hack = 0;
ResetPTStlb(p_dec); ResetPTStlb(p_dec);
/* request packetizer */
p_dec->b_need_packetized = true;
/* Set output properties */ /* Set output properties */
p_dec->fmt_out.i_cat = VIDEO_ES; 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_FOURCC('I','4','2','0');
...@@ -384,9 +385,6 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -384,9 +385,6 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if ( p_block ) do { if ( p_block ) do {
/* prepare block for submission */ /* prepare block for submission */
if (p_sys->i_ts_resync_hack && p_sys->i_ts_resync_hack--)
return NULL;
if( !p_block->i_buffer ) { if( !p_block->i_buffer ) {
msg_Err( p_dec, "block is of zero size" ); msg_Err( p_dec, "block is of zero size" );
break; break;
...@@ -404,10 +402,6 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -404,10 +402,6 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_sys->i_lastpts = -1; p_sys->i_lastpts = -1;
/* The ts layer manages to corrupt the next packet we are to receive
* Since schro has no sync support, we need to drop it */
p_sys->i_ts_resync_hack = 1;
block_Release( p_block ); block_Release( p_block );
*pp_block = NULL; *pp_block = NULL;
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment