vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Dec 22 15:45:26 2016 +0100| [e9b9ab2add7a5ca56569996cbe183d538aa36320] | committer: Francois Cartegnie
demux: ts: sections: remove packet size check > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e9b9ab2add7a5ca56569996cbe183d538aa36320 --- modules/demux/mpeg/sections.c | 18 ++++-------------- modules/demux/mpeg/sections.h | 2 +- modules/demux/mpeg/ts.c | 2 +- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/modules/demux/mpeg/sections.c b/modules/demux/mpeg/sections.c index ef68003..23602e1 100644 --- a/modules/demux/mpeg/sections.c +++ b/modules/demux/mpeg/sections.c @@ -22,7 +22,6 @@ #endif #include <vlc_common.h> -#include <vlc_block.h> #include <vlc_demux.h> #include "ts_pid.h" @@ -140,20 +139,11 @@ void ts_sections_processor_Reset( ts_sections_processor_t *p_chain ) } void ts_sections_processor_Push( ts_sections_processor_t *p_chain, - block_t *p_pkt ) + const uint8_t *p_buf ) { - if(likely(p_pkt->i_buffer >= 188 )) + for( ts_sections_processor_t *p_proc = p_chain; + p_proc; p_proc = p_proc->p_next ) { - for( ts_sections_processor_t *p_proc = p_chain; - p_proc; p_proc = p_proc->p_next ) - { - dvbpsi_packet_push( p_chain->p_dvbpsi, p_pkt->p_buffer ); - } + dvbpsi_packet_push( p_chain->p_dvbpsi, (uint8_t *) p_buf ); } - else - { - assert( p_pkt->i_buffer >= 188 ); - } - - block_Release( p_pkt ); } diff --git a/modules/demux/mpeg/sections.h b/modules/demux/mpeg/sections.h index b8593ce..bb56d3b 100644 --- a/modules/demux/mpeg/sections.h +++ b/modules/demux/mpeg/sections.h @@ -38,5 +38,5 @@ void ts_sections_processor_ChainDelete( ts_sections_processor_t *p_chain ); void ts_sections_processor_Reset( ts_sections_processor_t *p_chain ); void ts_sections_processor_Push( ts_sections_processor_t *p_chain, - block_t *p_pkt ); + const uint8_t * ); #endif diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c index e4eefe4..2464cbe 100644 --- a/modules/demux/mpeg/ts.c +++ b/modules/demux/mpeg/ts.c @@ -709,7 +709,7 @@ static int Demux( demux_t *p_demux ) else if( p_pid->u.p_pes->transport == TS_TRANSPORT_SECTIONS && !(p_pkt->i_flags & BLOCK_FLAG_SCRAMBLED) ) { - ts_sections_processor_Push( p_pid->u.p_pes->p_sections_proc, p_pkt ); + ts_sections_processor_Push( p_pid->u.p_pes->p_sections_proc, p_pkt->p_buffer ); b_frame = true; } else // pid->u.p_pes->transport == TS_TRANSPORT_IGNORE _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
