[vlc-commits] PS: pass an extra block_t parameter to ps_track_fill

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Aug 10 08:15:39 2014 +0200| [79bc1641cb871c0b00cba93b2e84e5b32a4d78fe] | committer: Jean-Baptiste Kempf

PS: pass an extra block_t parameter to ps_track_fill

This shouldn't be necessary, but there is no simple way to detect AC3
from EAC3 using the id, in the evobs

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=79bc1641cb871c0b00cba93b2e84e5b32a4d78fe
---

 modules/access/dvdnav.c  |    2 +-
 modules/access/dvdread.c |    2 +-
 modules/demux/ps.c       |    2 +-
 modules/demux/ps.h       |    6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 826179e..858aab7 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -1285,7 +1285,7 @@ static void ESNew( demux_t *p_demux, int i_id )
 
     if( tk->b_seen ) return;
 
-    if( ps_track_fill( tk, 0, i_id ) )
+    if( ps_track_fill( tk, 0, i_id, NULL ) )
     {
         msg_Warn( p_demux, "unknown codec for id=0x%x", i_id );
         return;
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index bab7217..f6d9cdb 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -650,7 +650,7 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang )
 
     if( tk->b_seen ) return;
 
-    if( ps_track_fill( tk, 0, i_id ) )
+    if( ps_track_fill( tk, 0, i_id, NULL ) )
     {
         msg_Warn( p_demux, "unknown codec for id=0x%x", i_id );
         return;
diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index 4126a97..b74d07d 100644
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -380,7 +380,7 @@ static int Demux( demux_t *p_demux )
 
             if( !tk->b_seen )
             {
-                if( !ps_track_fill( tk, &p_sys->psm, i_id ) )
+                if( !ps_track_fill( tk, &p_sys->psm, i_id, p_pkt ) )
                 {
                     tk->es = es_out_Add( p_demux->out, &tk->fmt );
                     b_new = true;
diff --git a/modules/demux/ps.h b/modules/demux/ps.h
index 1377428..618c25b 100644
--- a/modules/demux/ps.h
+++ b/modules/demux/ps.h
@@ -78,7 +78,7 @@ static inline void ps_track_init( ps_track_t tk[PS_TK_COUNT] )
 }
 
 /* From id fill i_skip and es_format_t */
-static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id )
+static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id, block_t *p_pkt )
 {
     tk->i_skip = 0;
     tk->i_id = i_id;
@@ -399,7 +399,7 @@ static inline int ps_pkt_parse_system( block_t *p_pkt, ps_psm_t *p_psm,
 
             if( !tk[i_tk].b_seen )
             {
-                if( !ps_track_fill( &tk[i_tk], p_psm, i_id ) )
+                if( !ps_track_fill( &tk[i_tk], p_psm, i_id, p_pkt ) )
                 {
                     tk[i_tk].b_seen = true;
                 }
@@ -686,7 +686,7 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt,
 
         if( !tk[i].b_seen || !tk[i].es ) continue;
 
-        if( ps_track_fill( &tk_tmp, p_psm, tk[i].i_id ) != VLC_SUCCESS )
+        if( ps_track_fill( &tk_tmp, p_psm, tk[i].i_id, p_pkt ) != VLC_SUCCESS )
             continue;
 
         if( tk_tmp.fmt.i_codec == tk[i].fmt.i_codec )