[vlc-commits] demux: ts: weaken topfield probing, rely on sync code only

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Fri May 
18 10:07:47 2018 +0200| [517fab832eed218e96ed187ad1182887ee3efcf7] | committer: 
Jean-Baptiste Kempf

demux: ts: weaken topfield probing, rely on sync code only

probed value does not work with non sat recordings

(cherry picked from commit 6eb4e888122c813f975046054ca11d91c415b006)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=517fab832eed218e96ed187ad1182887ee3efcf7
---

 modules/demux/mpeg/ts.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index e3ff94e277..f7c87a8531 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -265,8 +265,7 @@ static int DetectPVRHeadersAndHeaderSize( demux_t *p_demux, 
unsigned *pi_header_
  _peek, TS_PACKET_SIZE_MAX ) < TS_PACKET_SIZE_MAX )
 return -1;
 
-if( memcmp( p_peek, "TFrc", 4 ) == 0 &&
-p_peek[6] == 0 && ((GetDWBE(_peek[53]) & 0x7F00U) == 0x00) &&
+if( memcmp( p_peek, "TFrc", 4 ) == 0 && p_peek[6] == 0 &&
 vlc_stream_Peek( p_demux->s, _peek, TOPFIELD_HEADER_SIZE + 
TS_PACKET_SIZE_MAX )
 == TOPFIELD_HEADER_SIZE + TS_PACKET_SIZE_MAX )
 {
@@ -277,7 +276,7 @@ static int DetectPVRHeadersAndHeaderSize( demux_t *p_demux, 
unsigned *pi_header_
 msg_Dbg( p_demux, "this is a topfield file" );
 #if 0
 /* I used the TF5000PVR 2004 Firmware .doc header documentation,
- * 
http://www.i-topfield.com/data/product/firmware/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc
+ * 
/doc/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc 
on streams.vo
  * but after the filename the offsets seem to be incorrect.  - DJ 
*/
 int i_duration, i_name;
 char *psz_name = xmalloc(25);

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: ts: weaken topfield probing, rely on sync code only

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Fri May 18 
10:07:47 2018 +0200| [6eb4e888122c813f975046054ca11d91c415b006] | committer: 
Francois Cartegnie

demux: ts: weaken topfield probing, rely on sync code only

probed value does not work with non sat recordings

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

 modules/demux/mpeg/ts.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 35a21aa6a7..1cc1ec5ee5 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -265,8 +265,7 @@ static int DetectPVRHeadersAndHeaderSize( demux_t *p_demux, 
unsigned *pi_header_
  _peek, TS_PACKET_SIZE_MAX ) < TS_PACKET_SIZE_MAX )
 return -1;
 
-if( memcmp( p_peek, "TFrc", 4 ) == 0 &&
-p_peek[6] == 0 && ((GetDWBE(_peek[53]) & 0x7F00U) == 0x00) &&
+if( memcmp( p_peek, "TFrc", 4 ) == 0 && p_peek[6] == 0 &&
 vlc_stream_Peek( p_demux->s, _peek, TOPFIELD_HEADER_SIZE + 
TS_PACKET_SIZE_MAX )
 == TOPFIELD_HEADER_SIZE + TS_PACKET_SIZE_MAX )
 {
@@ -277,7 +276,7 @@ static int DetectPVRHeadersAndHeaderSize( demux_t *p_demux, 
unsigned *pi_header_
 msg_Dbg( p_demux, "this is a topfield file" );
 #if 0
 /* I used the TF5000PVR 2004 Firmware .doc header documentation,
- * 
http://www.i-topfield.com/data/product/firmware/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc
+ * 
/doc/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc 
on streams.vo
  * but after the filename the offsets seem to be incorrect.  - DJ 
*/
 int i_duration, i_name;
 char *psz_name = xmalloc(25);

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits