[Mplayer-cvslog] CVS: main/libmpdemux demux_ts.c,1.7,1.8

Arpi of Ize arpi at mplayerhq.hu
Sun Aug 24 20:07:30 CEST 2003


Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv24377

Modified Files:
	demux_ts.c 
Log Message:
- seek() is always synchronized to keyframes, so the decoders don't
crash anymore; successfully tested with libmpeg2 and ffmpeg12
- support for tables PAT and PMT, used the associate pids to program and
to play the right streams
- option -tsprog <number> to specify the chosen program (-vid and -aid
still override the single stream pids)
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
- defragmenting mechanism (without buffering, so it has 0 added cost) to
improve the playback of high bitrate movies
- refers to demux_mpg_control() to  get length and percentage position
in the stream
patch by Nico <nsabbi at libero.it>


Index: demux_ts.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ts.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- demux_ts.c	19 Jun 2003 18:20:15 -0000	1.7
+++ demux_ts.c	24 Aug 2003 18:07:00 -0000	1.8
@@ -42,20 +42,23 @@
 
 #define MAX_HEADER_SIZE 6			/* enough for PES header + length */
 #define MAX_CHECK_SIZE	65535
-#define MAX_PROBE_SIZE	1000000
+#define MAX_PROBE_SIZE	2000000
 #define NUM_CONSECUTIVE_TS_PACKETS 32
 #define NUM_CONSECUTIVE_AUDIO_PACKETS 348
 
 
-int ts_fastparse = 0;
+int ts_prog;
[...1489 lines suppressed...]
+		else //MPEG4
+		{
+			if(i==0x1B6) break; // found it!
+		}
+
+		if(!i || !skip_video_packet(d_video)) break; // EOF?
+	}
 }
+
+
+int demux_ts_fill_buffer(demuxer_t * demuxer)
+{
+	ES_stream_t es;
+	char packet[TS_FEC_PACKET_SIZE];
+
+	return -ts_parse(demuxer, &es, packet, 0);
+}
+
 
 



More information about the MPlayer-cvslog mailing list