[vlc-commits] demux: ts: probe atsc using psip base pid

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jul 26 12:24:39 2017 +0200| [2be3e6c3fe0a2d4d248d7426aed5574a839bbe95] | committer: Francois Cartegnie

demux: ts: probe atsc using psip base pid

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

 modules/demux/mpeg/ts_psi.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mpeg/ts_psi.c b/modules/demux/mpeg/ts_psi.c
index feda7eaf46..4c5d0c7871 100644
--- a/modules/demux/mpeg/ts_psi.c
+++ b/modules/demux/mpeg/ts_psi.c
@@ -1623,8 +1623,15 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_dvbpsipmt )
                 TsChangeStandard( p_sys, TS_STANDARD_ATSC );
                 break;
             default:
-                /* Probe using ES */
-                p_sys->standard = ProbePMTStandard( p_dvbpsipmt );
+                if(SEEN(GetPID(p_sys, ATSC_BASE_PID)))
+                {
+                    TsChangeStandard( p_sys, TS_STANDARD_ATSC );
+                }
+                else
+                {
+                    /* Probe using ES */
+                    p_sys->standard = ProbePMTStandard( p_dvbpsipmt );
+                }
                 break;
         }
     }