annotate libmpdemux/demux_mpg.c @ 18306:f10ade0e0c3e

sync with 1.248
author luran
date Thu, 27 Apr 2006 07:37:10 +0000
parents cede662f40a5
children 841789620ed1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1 // MPG/VOB file parser for DEMUXER v2.5 by A'rpi/ESP-team
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
3 #include <stdio.h>
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
4 #include <stdlib.h>
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1338
diff changeset
5 #include <unistd.h>
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
6
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
7 #include "config.h"
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
8 #include "mp_msg.h"
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1735
diff changeset
9 #include "help_mp.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
10
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
11 #include "stream.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
12 #include "demuxer.h"
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
13 #include "parse_es.h"
2338
4f3e8c8ea32f includes cleanup
arpi
parents: 2310
diff changeset
14 #include "stheader.h"
4711
39f5eccd54c2 added mp3 detection
arpi
parents: 4391
diff changeset
15 #include "mp3_hdr.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
16
524
9105fc95636c A fast'n'ugly hack to correct DVD VOB playback problems
lgb
parents: 501
diff changeset
17 //#define MAX_PS_PACKETSIZE 2048
501
bfc86f5a5ba7 PES supported again, VOB 0x1F0 problems fixed
arpi_esp
parents: 494
diff changeset
18 #define MAX_PS_PACKETSIZE (224*1024)
bfc86f5a5ba7 PES supported again, VOB 0x1F0 problems fixed
arpi_esp
parents: 494
diff changeset
19
14923
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
20 #define UNKNOWN 0
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
21 #define VIDEO_MPEG1 0x10000001
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
22 #define VIDEO_MPEG2 0x10000002
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
23 #define VIDEO_MPEG4 0x10000004
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
24 #define VIDEO_H264 0x10000005
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
25 #define AUDIO_MP2 0x50
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
26 #define AUDIO_A52 0x2000
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
27 #define AUDIO_LPCM_BE 0x10001
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
28 #define AUDIO_AAC mmioFOURCC('M', 'P', '4', 'A')
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
29
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
30 typedef struct mpg_demuxer {
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
31 float last_pts;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
32 float final_pts;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
33 int has_valid_timestamps;
14923
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
34 unsigned int es_map[0x40]; //es map of stream types (associated to the pes id) from 0xb0 to 0xef
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
35 int num_a_streams;
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
36 int a_stream_ids[MAX_A_STREAMS];
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
37 } mpg_demuxer_t;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
38
17286
b0046966ab82 don't reset dvdsub->id unless -slang is specified; assign default sub stream id when demux->sub->id is -1 (autodetect)
nicodvb
parents: 16877
diff changeset
39 extern char* dvdsub_lang;
547
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
40 static int mpeg_pts_error=0;
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
41
14923
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
42 static int parse_psm(demuxer_t *demux, int len) {
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
43 unsigned char c, id, type;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
44 unsigned int plen, prog_len, es_map_len;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
45 mpg_demuxer_t *priv = (mpg_demuxer_t *) demux->priv;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
46
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
47 mp_dbg(MSGT_DEMUX,MSGL_V, "PARSE_PSM, len=%d\n", len);
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
48 if(! len)
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
49 return 0;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
50
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
51 c = stream_read_char(demux->stream);
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
52 if(! (c & 0x80)) {
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
53 stream_skip(demux->stream, len - 1); //not yet valid, discard
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
54 return 0;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
55 }
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
56 stream_skip(demux->stream, 1);
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
57 prog_len = stream_read_word(demux->stream); //length of program descriptors
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
58 stream_skip(demux->stream, prog_len); //.. that we ignore
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
59 es_map_len = stream_read_word(demux->stream); //length of elementary streams map
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
60 es_map_len = min(es_map_len, len - prog_len - 8); //sanity check
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
61 while(es_map_len > 0) {
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
62 type = stream_read_char(demux->stream);
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
63 id = stream_read_char(demux->stream);
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
64 if(id >= 0xB0 && id <= 0xEF && priv) {
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
65 int idoffset = id - 0xB0;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
66 switch(type) {
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
67 case 0x1:
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
68 priv->es_map[idoffset] = VIDEO_MPEG1;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
69 break;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
70 case 0x2:
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
71 priv->es_map[idoffset] = VIDEO_MPEG2;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
72 break;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
73 case 0x3:
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
74 case 0x4:
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
75 priv->es_map[idoffset] = AUDIO_MP2;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
76 break;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
77 case 0x0f:
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
78 case 0x11:
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
79 priv->es_map[idoffset] = AUDIO_AAC;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
80 break;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
81 case 0x10:
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
82 priv->es_map[idoffset] = VIDEO_MPEG4;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
83 break;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
84 case 0x1b:
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
85 priv->es_map[idoffset] = VIDEO_H264;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
86 break;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
87 case 0x81:
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
88 priv->es_map[idoffset] = AUDIO_A52;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
89 break;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
90 }
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
91 mp_dbg(MSGT_DEMUX,MSGL_V, "PSM ES, id=0x%x, type=%x, stype: %x\n", id, type, priv->es_map[idoffset]);
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
92 }
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
93 plen = stream_read_word(demux->stream); //length of elementary stream descriptors
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
94 plen = min(plen, es_map_len); //sanity check
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
95 stream_skip(demux->stream, plen); //skip descriptors for now
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
96 es_map_len -= 4 + plen;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
97 }
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
98 stream_skip(demux->stream, 4); //skip crc32
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
99 return 1;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
100 }
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
101
18072
284751bccd04 make sure the check for valid timestamps does not accidentially search through
reimar
parents: 17822
diff changeset
102 // 500000 is a wild guess
284751bccd04 make sure the check for valid timestamps does not accidentially search through
reimar
parents: 17822
diff changeset
103 #define TIMESTAMP_PROBE_LEN 500000
284751bccd04 make sure the check for valid timestamps does not accidentially search through
reimar
parents: 17822
diff changeset
104
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
105 /// Open an mpg physical stream
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
106 static demuxer_t* demux_mpg_open(demuxer_t* demuxer) {
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
107 stream_t *s = demuxer->stream;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
108 off_t pos = stream_tell(s);
18072
284751bccd04 make sure the check for valid timestamps does not accidentially search through
reimar
parents: 17822
diff changeset
109 off_t end_seq_start = demuxer->movi_end-TIMESTAMP_PROBE_LEN;
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
110 float half_pts = 0.0;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
111 mpg_demuxer_t* mpg_d;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
112
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
113 if (!ds_fill_buffer(demuxer->video)) return 0;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
114 mpg_d = (mpg_demuxer_t*)calloc(1,sizeof(mpg_demuxer_t));
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
115 demuxer->priv = mpg_d;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
116 mpg_d->final_pts = 0.0;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
117 mpg_d->has_valid_timestamps = 1;
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
118 mpg_d->num_a_streams = 0;
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
119 if (demuxer->seekable && stream_tell(demuxer->stream) < end_seq_start) {
18072
284751bccd04 make sure the check for valid timestamps does not accidentially search through
reimar
parents: 17822
diff changeset
120 off_t half_pos = pos + end_seq_start / 2;
284751bccd04 make sure the check for valid timestamps does not accidentially search through
reimar
parents: 17822
diff changeset
121 stream_seek(s, half_pos);
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
122 while ((!s->eof) && ds_fill_buffer(demuxer->video) && half_pts == 0.0) {
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
123 half_pts = mpg_d->last_pts;
18072
284751bccd04 make sure the check for valid timestamps does not accidentially search through
reimar
parents: 17822
diff changeset
124 if (stream_tell(s) > half_pos + TIMESTAMP_PROBE_LEN)
284751bccd04 make sure the check for valid timestamps does not accidentially search through
reimar
parents: 17822
diff changeset
125 break;
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
126 }
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
127 stream_seek(s,end_seq_start);
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
128 while ((!s->eof) && ds_fill_buffer(demuxer->video)) {
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
129 if (mpg_d->final_pts < mpg_d->last_pts) mpg_d->final_pts = mpg_d->last_pts;
18072
284751bccd04 make sure the check for valid timestamps does not accidentially search through
reimar
parents: 17822
diff changeset
130 if (stream_tell(s) > demuxer->movi_end)
284751bccd04 make sure the check for valid timestamps does not accidentially search through
reimar
parents: 17822
diff changeset
131 break;
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
132 }
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
133 // educated guess about validity of timestamps
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
134 if (mpg_d->final_pts > 3 * half_pts || mpg_d->final_pts < 1.5 * half_pts) {
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
135 mpg_d->has_valid_timestamps = 0;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
136 }
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
137 ds_free_packs(demuxer->audio);
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
138 ds_free_packs(demuxer->video);
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
139 demuxer->stream->eof=0; // clear eof flag
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
140 demuxer->video->eof=0;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
141 demuxer->audio->eof=0;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
142
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
143 stream_seek(s,pos);
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
144 ds_fill_buffer(demuxer->video);
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
145 }
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
146 return demuxer;
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
147 }
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
148
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
149 static void demux_close_mpg(demuxer_t* demuxer) {
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
150 mpg_demuxer_t* mpg_d = demuxer->priv;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
151 if (mpg_d) free(mpg_d);
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
152 }
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
153
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
154
18077
cede662f40a5 timestamps are 33 bits long, so they don't fit in an unsigned int; 10l
nicodvb
parents: 18072
diff changeset
155 static unsigned long long read_mpeg_timestamp(stream_t *s,int c){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
156 int d,e;
18077
cede662f40a5 timestamps are 33 bits long, so they don't fit in an unsigned int; 10l
nicodvb
parents: 18072
diff changeset
157 unsigned long long pts;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
158 d=stream_read_word(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
159 e=stream_read_word(s);
547
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
160 if( ((c&1)!=1) || ((d&1)!=1) || ((e&1)!=1) ){
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
161 ++mpeg_pts_error;
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
162 return 0; // invalid pts
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
163 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
164 pts=(((c>>1)&7)<<30)|((d>>1)<<15)|(e>>1);
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
165 mp_dbg(MSGT_DEMUX,MSGL_DBG3,"{%d}",pts);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
166 return pts;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
167 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
168
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
169 static void new_audio_stream(demuxer_t *demux, int aid){
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
170 if(!demux->a_streams[aid]){
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
171 mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demux->priv;
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
172 sh_audio_t* sh_a;
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
173 new_sh_audio(demux,aid);
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
174 sh_a = (sh_audio_t*)demux->a_streams[aid];
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
175 switch(aid & 0xE0){ // 1110 0000 b (high 3 bit: type low 5: id)
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
176 case 0x00: sh_a->format=0x50;break; // mpeg
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
177 case 0xA0: sh_a->format=0x10001;break; // dvd pcm
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
178 case 0x80: if((aid & 0xF8) == 0x88) sh_a->format=0x2001;//dts
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
179 else sh_a->format=0x2000;break; // ac3
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
180 }
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
181 if (mpg_d) mpg_d->a_stream_ids[mpg_d->num_a_streams++] = aid;
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
182 }
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
183 if(demux->audio->id==-1) demux->audio->id=aid;
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
184 }
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
185
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
186 static int demux_mpg_read_packet(demuxer_t *demux,int id){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
187 int d;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
188 int len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
189 unsigned char c=0;
18077
cede662f40a5 timestamps are 33 bits long, so they don't fit in an unsigned int; 10l
nicodvb
parents: 18072
diff changeset
190 unsigned long long pts=0;
cede662f40a5 timestamps are 33 bits long, so they don't fit in an unsigned int; 10l
nicodvb
parents: 18072
diff changeset
191 unsigned long long dts=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
192 demux_stream_t *ds=NULL;
14923
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
193 mpg_demuxer_t *priv = (mpg_demuxer_t *) demux->priv;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
194
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
195 mp_dbg(MSGT_DEMUX,MSGL_DBG3,"demux_read_packet: %X\n",id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
196
536
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
197 // if(id==0x1F0){
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
198 // demux->synced=0; // force resync after 0x1F0
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
199 // return -1;
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
200 //}
501
bfc86f5a5ba7 PES supported again, VOB 0x1F0 problems fixed
arpi_esp
parents: 494
diff changeset
201
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
202 // if(id==0x1BA) packet_start_pos=stream_tell(demux->stream);
501
bfc86f5a5ba7 PES supported again, VOB 0x1F0 problems fixed
arpi_esp
parents: 494
diff changeset
203 if(id<0x1BC || id>=0x1F0) return -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
204 if(id==0x1BE) return -1; // padding stream
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
205 if(id==0x1BF) return -1; // private2
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
206
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
207 len=stream_read_word(demux->stream);
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
208 mp_dbg(MSGT_DEMUX,MSGL_DBG3,"PACKET len=%d",len);
536
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
209 // if(len==62480){ demux->synced=0;return -1;} /* :) */
501
bfc86f5a5ba7 PES supported again, VOB 0x1F0 problems fixed
arpi_esp
parents: 494
diff changeset
210 if(len==0 || len>MAX_PS_PACKETSIZE){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
211 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"Invalid PS packet len: %d\n",len);
501
bfc86f5a5ba7 PES supported again, VOB 0x1F0 problems fixed
arpi_esp
parents: 494
diff changeset
212 return -2; // invalid packet !!!!!!
bfc86f5a5ba7 PES supported again, VOB 0x1F0 problems fixed
arpi_esp
parents: 494
diff changeset
213 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
214
547
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
215 mpeg_pts_error=0;
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
216
14923
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
217 if(id==0x1BC) {
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
218 parse_psm(demux, len);
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
219 return 0;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
220 }
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
221
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
222 while(len>0){ // Skip stuFFing bytes
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
223 c=stream_read_char(demux->stream);--len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
224 if(c!=0xFF)break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
225 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
226 if((c>>6)==1){ // Read (skip) STD scale & size value
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
227 // printf(" STD_scale=%d",(c>>5)&1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
228 d=((c&0x1F)<<8)|stream_read_char(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
229 len-=2;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
230 // printf(" STD_size=%d",d);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
231 c=stream_read_char(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
232 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
233 // Read System-1 stream timestamps:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
234 if((c>>4)==2){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
235 pts=read_mpeg_timestamp(demux->stream,c);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
236 len-=4;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
237 } else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
238 if((c>>4)==3){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
239 pts=read_mpeg_timestamp(demux->stream,c);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
240 c=stream_read_char(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
241 if((c>>4)!=1) pts=0; //printf("{ERROR4}");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
242 dts=read_mpeg_timestamp(demux->stream,c);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243 len-=4+1+4;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
244 } else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
245 if((c>>6)==2){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
246 int pts_flags;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
247 int hdrlen;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
248 // System-2 (.VOB) stream:
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 426
diff changeset
249 if((c>>4)&3) {
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1735
diff changeset
250 mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_EncryptedVOB);
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 426
diff changeset
251 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
252 c=stream_read_char(demux->stream); pts_flags=c>>6;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
253 c=stream_read_char(demux->stream); hdrlen=c;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
254 len-=2;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
255 mp_dbg(MSGT_DEMUX,MSGL_DBG3," hdrlen=%d (len=%d)",hdrlen,len);
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
256 if(hdrlen>len){ mp_msg(MSGT_DEMUX,MSGL_V,"demux_mpg: invalid header length \n"); return -1;}
7671
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
257 if(pts_flags==2 && hdrlen>=5){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
258 c=stream_read_char(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
259 pts=read_mpeg_timestamp(demux->stream,c);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
260 len-=5;hdrlen-=5;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
261 } else
7671
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
262 if(pts_flags==3 && hdrlen>=10){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
263 c=stream_read_char(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
264 pts=read_mpeg_timestamp(demux->stream,c);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
265 c=stream_read_char(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
266 dts=read_mpeg_timestamp(demux->stream,c);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
267 len-=10;hdrlen-=10;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
268 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
269 len-=hdrlen;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
270 if(hdrlen>0) stream_skip(demux->stream,hdrlen); // skip header bytes
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
271
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
272 //============== DVD Audio sub-stream ======================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
273 if(id==0x1BD){
15815
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
274 int aid, rawa52 = 0;
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
275 off_t tmppos;
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
276 unsigned int tmp;
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
277
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
278 tmppos = stream_tell(demux->stream);
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
279 tmp = stream_read_word(demux->stream);
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
280 stream_seek(demux->stream, tmppos);
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
281 /// vdr stores A52 without the 4 header bytes, so we have to check this condition first
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
282 if(tmp == 0x0B77) {
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
283 aid = 128;
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
284 rawa52 = 1;
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
285 }
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
286 else {
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
287 aid=stream_read_char(demux->stream);--len;
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
288 if(len<3) return -1; // invalid audio packet
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
289 }
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
290
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
291 // AID:
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
292 // 0x20..0x3F subtitle
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
293 // 0x80..0x9F AC3 audio
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
294 // 0xA0..0xBF PCM audio
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
295
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
296 if((aid & 0xE0) == 0x20){
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
297 // subtitle:
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
298 aid&=0x1F;
426
26e513f392b2 new stream selection code
arpi_esp
parents: 397
diff changeset
299
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
300 if(!demux->s_streams[aid]){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
301 mp_msg(MSGT_DEMUX,MSGL_V,"==> Found subtitle: %d\n",aid);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
302 demux->s_streams[aid]=1;
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
303 }
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
304
17286
b0046966ab82 don't reset dvdsub->id unless -slang is specified; assign default sub stream id when demux->sub->id is -1 (autodetect)
nicodvb
parents: 16877
diff changeset
305 if(demux->sub->id > -1)
b0046966ab82 don't reset dvdsub->id unless -slang is specified; assign default sub stream id when demux->sub->id is -1 (autodetect)
nicodvb
parents: 16877
diff changeset
306 demux->sub->id &= 0x1F;
b0046966ab82 don't reset dvdsub->id unless -slang is specified; assign default sub stream id when demux->sub->id is -1 (autodetect)
nicodvb
parents: 16877
diff changeset
307 if(!dvdsub_lang && demux->sub->id == -1)
b0046966ab82 don't reset dvdsub->id unless -slang is specified; assign default sub stream id when demux->sub->id is -1 (autodetect)
nicodvb
parents: 16877
diff changeset
308 demux->sub->id = aid;
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
309 if(demux->sub->id==aid){
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
310 ds=demux->sub;
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
311 }
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
312
3955
ceab3c2f261e hotfix for ac3 aid<0x20 (VDR)
arpi
parents: 3770
diff changeset
313 } else if((aid & 0xC0) == 0x80 || (aid & 0xE0) == 0x00) {
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
314
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
315 // aid=128+(aid&0x7F);
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
316 // aid=0x80..0xBF
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
317 new_audio_stream(demux, aid);
426
26e513f392b2 new stream selection code
arpi_esp
parents: 397
diff changeset
318 if(demux->audio->id==aid){
7671
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
319 int type;
426
26e513f392b2 new stream selection code
arpi_esp
parents: 397
diff changeset
320 ds=demux->audio;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
321 if(!ds->sh) ds->sh=demux->a_streams[aid];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
322 // READ Packet: Skip additional audio header data:
15815
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
323 if(!rawa52) {
7671
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
324 c=stream_read_char(demux->stream);//num of frames
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
325 type=stream_read_char(demux->stream);//startpos hi
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
326 type=(type<<8)|stream_read_char(demux->stream);//startpos lo
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
327 // printf("\r[%02X][%04X]",c,type);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
328 len-=3;
15815
488f31bd127e support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
nicodvb
parents: 15670
diff changeset
329 }
7671
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
330 if((aid&0xE0)==0xA0 && len>=3){
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
331 unsigned char* hdr;
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
332 // save audio header as codecdata!
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
333 if(!((sh_audio_t*)(ds->sh))->codecdata_len){
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
334 ((sh_audio_t*)(ds->sh))->codecdata=malloc(3);
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
335 ((sh_audio_t*)(ds->sh))->codecdata_len=3;
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
336 }
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
337 hdr=((sh_audio_t*)(ds->sh))->codecdata;
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
338 // read LPCM header:
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
339 // emphasis[1], mute[1], rvd[1], frame number[5]:
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
340 hdr[0]=stream_read_char(demux->stream);
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
341 // printf(" [%01X:%02d]",c>>5,c&31);
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
342 // quantization[2],freq[2],rvd[1],channels[3]
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
343 hdr[1]=stream_read_char(demux->stream);
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
344 // printf("[%01X:%01X] ",c>>4,c&15);
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
345 // dynamic range control (0x80=off):
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
346 hdr[2]=stream_read_char(demux->stream);
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
347 // printf("[%02X] ",c);
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
348 len-=3;
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
349 if(len<=0) mp_msg(MSGT_DEMUX,MSGL_V,"End of packet while searching for PCM header\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
350 }
7671
2d186a94dd5f fixed LPCM parsing
arpi
parents: 7559
diff changeset
351 // printf(" \n");
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
352 } // if(demux->audio->id==aid)
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
353
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
354 } else mp_msg(MSGT_DEMUX,MSGL_V,"Unknown 0x1BD substream: 0x%02X \n",aid);
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
355
c2a449f90087 dvd sub support reading
arpi_esp
parents: 547
diff changeset
356 } //if(id==0x1BD)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
357
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
358 } else {
539
48f0c6f0519f dumb bug here too :)
arpi_esp
parents: 536
diff changeset
359 if(c!=0x0f){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
360 mp_msg(MSGT_DEMUX,MSGL_V," {ERROR5,c=%d} \n",c);
539
48f0c6f0519f dumb bug here too :)
arpi_esp
parents: 536
diff changeset
361 return -1; // invalid packet !!!!!!
48f0c6f0519f dumb bug here too :)
arpi_esp
parents: 536
diff changeset
362 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
363 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
364 if(mpeg_pts_error) mp_msg(MSGT_DEMUX,MSGL_V," {PTS_err:%d} \n",mpeg_pts_error);
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
365 mp_dbg(MSGT_DEMUX,MSGL_DBG3," => len=%d\n",len);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
366
501
bfc86f5a5ba7 PES supported again, VOB 0x1F0 problems fixed
arpi_esp
parents: 494
diff changeset
367 // if(len<=0 || len>MAX_PS_PACKETSIZE) return -1; // Invalid packet size
bfc86f5a5ba7 PES supported again, VOB 0x1F0 problems fixed
arpi_esp
parents: 494
diff changeset
368 if(len<=0 || len>MAX_PS_PACKETSIZE){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
369 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"Invalid PS data len: %d\n",len);
501
bfc86f5a5ba7 PES supported again, VOB 0x1F0 problems fixed
arpi_esp
parents: 494
diff changeset
370 return -1; // invalid packet !!!!!!
bfc86f5a5ba7 PES supported again, VOB 0x1F0 problems fixed
arpi_esp
parents: 494
diff changeset
371 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
372
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
373 if(id>=0x1C0 && id<=0x1DF){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
374 // mpeg audio
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
375 int aid=id-0x1C0;
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
376 new_audio_stream(demux, aid);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
377 if(demux->audio->id==aid){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
378 ds=demux->audio;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
379 if(!ds->sh) ds->sh=demux->a_streams[aid];
14923
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
380 if(priv && ds->sh) {
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
381 sh_audio_t *sh = (sh_audio_t *)ds->sh;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
382 if(priv->es_map[id - 0x1B0])
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
383 sh->format = priv->es_map[id - 0x1B0];
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
384 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"ASSIGNED TO STREAM %d CODEC %x\n", id, priv->es_map[id - 0x1B0]);
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
385 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
386 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
387 } else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
388 if(id>=0x1E0 && id<=0x1EF){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
389 // mpeg video
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
390 int aid=id-0x1E0;
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1162
diff changeset
391 if(!demux->v_streams[aid]) new_sh_video(demux,aid);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
392 if(demux->video->id==-1) demux->video->id=aid;
426
26e513f392b2 new stream selection code
arpi_esp
parents: 397
diff changeset
393 if(demux->video->id==aid){
26e513f392b2 new stream selection code
arpi_esp
parents: 397
diff changeset
394 ds=demux->video;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
395 if(!ds->sh) ds->sh=demux->v_streams[aid];
14923
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
396 if(priv && ds->sh) {
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
397 sh_video_t *sh = (sh_video_t *)ds->sh;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
398 if(priv->es_map[id - 0x1B0]) {
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
399 sh->format = priv->es_map[id - 0x1B0];
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
400 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"ASSIGNED TO STREAM %d CODEC %x\n", id, priv->es_map[id - 0x1B0]);
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
401 }
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
402 }
426
26e513f392b2 new stream selection code
arpi_esp
parents: 397
diff changeset
403 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
404 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
405
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
406 if(ds){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
407 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_MPG: Read %d data bytes from packet %04X\n",len,id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
408 // printf("packet start = 0x%X \n",stream_tell(demux->stream)-packet_start_pos);
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1628
diff changeset
409 ds_read_packet(ds,demux->stream,len,pts/90000.0f,demux->filepos,0);
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
410 if (demux->priv) ((mpg_demuxer_t*)demux->priv)->last_pts = pts/90000.0f;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
411 // if(ds==demux->sub) parse_dvdsub(ds->last->buffer,ds->last->len);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
412 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
413 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
414 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_MPG: Skipping %d data bytes from packet %04X\n",len,id);
536
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
415 if(len<=2356) stream_skip(demux->stream,len);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
416 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
417 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
418
15670
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
419 static int num_elementary_packets100=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
420 static int num_elementary_packets101=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
421 static int num_elementary_packets12x=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
422 static int num_elementary_packets1B6=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
423 static int num_elementary_packetsPES=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
424 static int num_h264_slice=0; //combined slice
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
425 static int num_h264_dpa=0; //DPA Slice
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
426 static int num_h264_dpb=0; //DPB Slice
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
427 static int num_h264_dpc=0; //DPC Slice
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
428 static int num_h264_idr=0; //IDR Slice
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
429 static int num_h264_sps=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
430 static int num_h264_pps=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
431
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
432 static int num_mp3audio_packets=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
433
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
434 static int demux_mpg_probe(demuxer_t *demuxer) {
15670
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
435 int pes=1;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
436 int tmp;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
437 off_t tmppos;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
438 int file_format = DEMUXER_TYPE_UNKNOWN;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
439
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
440 tmppos=stream_tell(demuxer->stream);
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
441 tmp=stream_read_dword(demuxer->stream);
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
442 if(tmp==0x1E0 || tmp==0x1C0) {
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
443 tmp=stream_read_word(demuxer->stream);
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
444 if(tmp>1 && tmp<=2048) pes=0; // demuxer->synced=3; // PES...
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
445 }
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
446 stream_seek(demuxer->stream,tmppos);
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
447
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
448 num_elementary_packets100=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
449 num_elementary_packets101=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
450 num_elementary_packets1B6=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
451 num_elementary_packets12x=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
452 num_elementary_packetsPES=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
453 num_h264_slice=0; //combined slice
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
454 num_h264_dpa=0; //DPA Slice
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
455 num_h264_dpb=0; //DPB Slice
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
456 num_h264_dpc=0; //DPC Slice
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
457 num_h264_idr=0; //IDR Slice
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
458 num_h264_sps=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
459 num_h264_pps=0;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
460 num_mp3audio_packets=0;
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9069
diff changeset
461
15670
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
462 if(demux_mpg_open(demuxer))
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
463 file_format=DEMUXER_TYPE_MPEG_PS;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
464 else {
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
465 mp_msg(MSGT_DEMUX,MSGL_V,"MPEG packet stats: p100: %d p101: %d p1B6: %d p12x: %d sli: %d a: %d b: %d c: %d idr: %d sps: %d pps: %d PES: %d MP3: %d, synced: %d\n",
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
466 num_elementary_packets100,num_elementary_packets101,
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
467 num_elementary_packets1B6,num_elementary_packets12x,
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
468 num_h264_slice, num_h264_dpa,
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
469 num_h264_dpb, num_h264_dpc=0,
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
470 num_h264_idr, num_h264_sps=0,
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
471 num_h264_pps,
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
472 num_elementary_packetsPES,num_mp3audio_packets, demuxer->synced);
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
473
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
474 //MPEG packet stats: p100: 458 p101: 458 PES: 0 MP3: 1103 (.m2v)
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
475 if(num_mp3audio_packets>50 && num_mp3audio_packets>2*num_elementary_packets100
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
476 && abs(num_elementary_packets100-num_elementary_packets101)>2)
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
477 return file_format;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
478
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
479 // some hack to get meaningfull error messages to our unhappy users:
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
480 if(num_elementary_packets100>=2 && num_elementary_packets101>=2 &&
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
481 abs(num_elementary_packets101+8-num_elementary_packets100)<16) {
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
482 if(num_elementary_packetsPES>=4 && num_elementary_packetsPES>=num_elementary_packets100-4) {
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
483 return file_format;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
484 }
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
485 file_format=DEMUXER_TYPE_MPEG_ES; // <-- hack is here :)
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
486 } else
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
487 #if 1
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
488 // fuzzy mpeg4-es detection. do NOT enable without heavy testing of mpeg formats detection!
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
489 if(num_elementary_packets1B6>3 && num_elementary_packets12x>=1 &&
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
490 num_elementary_packetsPES==0 && num_elementary_packets100<=num_elementary_packets12x &&
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
491 demuxer->synced<2) {
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
492 file_format=DEMUXER_TYPE_MPEG4_ES;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
493 } else
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
494 #endif
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
495 #if 1
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
496 // fuzzy h264-es detection. do NOT enable without heavy testing of mpeg formats detection!
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
497 if((num_h264_slice>3 || (num_h264_dpa>3 && num_h264_dpb>3 && num_h264_dpc>3)) &&
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
498 /* FIXME num_h264_sps>=1 && */ num_h264_pps>=1 && num_h264_idr>=1 &&
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
499 num_elementary_packets1B6==0 && num_elementary_packetsPES==0 &&
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
500 demuxer->synced<2) {
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
501 file_format=DEMUXER_TYPE_H264_ES;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
502 } else
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
503 #endif
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
504 {
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
505 if(demuxer->synced==2)
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
506 mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug);
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
507 else
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
508 mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_NotSystemStream);
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
509 }
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
510 }
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
511 return file_format;
081bee8052cf moved mpeg-ps/es probing code to demux_mpg.c
nicodvb
parents: 15285
diff changeset
512 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
513
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
514 static int demux_mpg_es_fill_buffer(demuxer_t *demux, demux_stream_t *ds){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
515 // Elementary video stream
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
516 if(demux->stream->eof) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
517 demux->filepos=stream_tell(demux->stream);
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1628
diff changeset
518 ds_read_packet(demux->video,demux->stream,STREAM_BUFFER_SIZE,0,demux->filepos,0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
519 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
520 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
521
16369
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
522 /**
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
523 * \brief discard until 0x100 header and return a filled buffer
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
524 * \param b buffer-end pointer
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
525 * \param pos current pos in stream, negative since b points to end of buffer
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
526 * \param s stream to read from
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
527 * \return new position, differs from original pos when eof hit and thus
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
528 * b was modified to point to the new end of buffer
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
529 */
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
530 static int find_end(unsigned char **b, int pos, stream_t *s) {
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
531 register int state = 0xffffffff;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
532 unsigned char *buf = *b;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
533 int start = pos;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
534 int read, unused;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
535 // search already read part
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
536 while (state != 0x100 && pos) {
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
537 state = state << 8 | buf[pos++];
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
538 }
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
539 // continue search in stream
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
540 while (state != 0x100) {
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
541 register int c = stream_read_char(s);
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
542 if (c < 0) break;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
543 state = state << 8 | c;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
544 }
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
545 // modify previous header (from 0x1bc or 0x1bf to 0x100)
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
546 buf[start++] = 0;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
547 // copy remaining buffer part to current pos
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
548 memmove(&buf[start], &buf[pos], -pos);
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
549 unused = start + -pos; // -unused bytes in buffer
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
550 read = stream_read(s, &buf[unused], -unused);
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
551 unused += read;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
552 // fix buffer so it ends at pos == 0 (eof case)
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
553 *b = &buf[unused];
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
554 start -= unused;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
555 return start;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
556 }
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
557
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
558 /**
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
559 * This format usually uses an insane bitrate, which makes this function
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
560 * performance-critical!
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
561 * Be sure to benchmark any changes with different compiler versions.
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
562 */
16310
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
563 static int demux_mpg_gxf_fill_buffer(demuxer_t *demux, demux_stream_t *ds) {
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
564 demux_packet_t *pack;
16369
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
565 int len;
16310
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
566 demux->filepos = stream_tell(demux->stream);
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
567 pack = new_demux_packet(STREAM_BUFFER_SIZE);
16369
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
568 len = stream_read(demux->stream, pack->buffer, STREAM_BUFFER_SIZE);
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
569 if (len <= 0)
17779
031185213fa9 Missing free_demux_packet after read error
reimar
parents: 17699
diff changeset
570 {
031185213fa9 Missing free_demux_packet after read error
reimar
parents: 17699
diff changeset
571 free_demux_packet(pack);
16369
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
572 return 0;
17779
031185213fa9 Missing free_demux_packet after read error
reimar
parents: 17699
diff changeset
573 }
16369
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
574 {
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
575 register uint32_t state = (uint32_t)demux->priv;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
576 register int pos = -len;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
577 unsigned char *buf = &pack->buffer[len];
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
578 do {
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
579 state = state << 8 | buf[pos];
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
580 if (unlikely((state | 3) == 0x1bf))
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
581 pos = find_end(&buf, pos, demux->stream);
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
582 } while (++pos);
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
583 demux->priv = (void *)state;
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
584 len = buf - pack->buffer;
16310
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
585 }
16369
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
586 if (len < STREAM_BUFFER_SIZE)
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
587 resize_demux_packet(pack, len);
16310
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
588 ds_add_packet(ds, pack);
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
589 return 1;
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
590 }
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
591
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
592 int demux_mpg_fill_buffer(demuxer_t *demux, demux_stream_t *ds){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
593 unsigned int head=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
594 int skipped=0;
5570
3a8d8c51355a max_packs increased for some dvd with too many audio/sub
arpi
parents: 4711
diff changeset
595 int max_packs=256; // 512kbyte
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
596 int ret=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
597
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
598 // System stream
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
599 do{
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
600 demux->filepos=stream_tell(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
601 head=stream_read_dword(demux->stream);
547
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
602 if((head&0xFFFFFF00)!=0x100){
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
603 // sync...
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
604 demux->filepos-=skipped;
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
605 while(1){
536
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
606 int c=stream_read_char(demux->stream);
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
607 if(c<0) break; //EOF
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
608 head<<=8;
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
609 if(head!=0x100){
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
610 head|=c;
4711
39f5eccd54c2 added mp3 detection
arpi
parents: 4391
diff changeset
611 if(mp_check_mp3_header(head)) ++num_mp3audio_packets;
536
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
612 ++skipped; //++demux->filepos;
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
613 continue;
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
614 }
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
615 head|=c;
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
616 break;
547
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
617 }
3e46eab9f782 small bugfix in the new optimized head sync code
arpi_esp
parents: 546
diff changeset
618 demux->filepos+=skipped;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
619 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
620 if(stream_eof(demux->stream)) break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
621 // sure: head=0x000001XX
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
622 mp_dbg(MSGT_DEMUX,MSGL_DBG4,"*** head=0x%X\n",head);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
623 if(demux->synced==0){
3770
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3255
diff changeset
624 if(head==0x1BA) demux->synced=1; //else
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3255
diff changeset
625 // if(head==0x1BD || (head>=0x1C0 && head<=0x1EF)) demux->synced=3; // PES?
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
626 } else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
627 if(demux->synced==1){
929
6dedc7cb0146 accept 1BD packets for PS stream sync
arpi_esp
parents: 605
diff changeset
628 if(head==0x1BB || head==0x1BD || (head>=0x1C0 && head<=0x1EF)){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
629 demux->synced=2;
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17289
diff changeset
630 mp_msg(MSGT_DEMUX,MSGL_V,"system stream synced at 0x%"PRIX64" (%"PRId64")!\n",(int64_t)demux->filepos,(int64_t)demux->filepos);
536
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
631 num_elementary_packets100=0; // requires for re-sync!
3c9b3ce721f0 PES vs. VOB problem... yet another solution
arpi_esp
parents: 524
diff changeset
632 num_elementary_packets101=0; // requires for re-sync!
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
633 } else demux->synced=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
634 } // else
3255
ee28577dad02 combined PS/PES sync to allow .VDR playback from stdin
arpi
parents: 2555
diff changeset
635 if(demux->synced>=2){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
636 ret=demux_mpg_read_packet(demux,head);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
637 if(!ret)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
638 if(--max_packs==0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
639 demux->stream->eof=1;
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1735
diff changeset
640 mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_DoesntContainSelectedStream);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
641 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
642 }
3255
ee28577dad02 combined PS/PES sync to allow .VDR playback from stdin
arpi
parents: 2555
diff changeset
643 if(demux->synced==3) demux->synced=(ret==1)?2:0; // PES detect
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
644 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
645 if(head>=0x100 && head<0x1B0){
1162
11e49d541f11 packet 0x1B6 (mpeg4 stream) detection
arpi_esp
parents: 979
diff changeset
646 if(head==0x100) ++num_elementary_packets100; else
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8254
diff changeset
647 if(head==0x101) ++num_elementary_packets101; else
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8254
diff changeset
648 if(head>=0x120 && head<=0x12F) ++num_elementary_packets12x;
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9069
diff changeset
649
39b68c2664ec H264-ES demuxer
michael
parents: 9069
diff changeset
650 if((head&~0x60) == 0x101) ++num_h264_slice; else
39b68c2664ec H264-ES demuxer
michael
parents: 9069
diff changeset
651 if((head&~0x60) == 0x102) ++num_h264_dpa; else
39b68c2664ec H264-ES demuxer
michael
parents: 9069
diff changeset
652 if((head&~0x60) == 0x103) ++num_h264_dpb; else
39b68c2664ec H264-ES demuxer
michael
parents: 9069
diff changeset
653 if((head&~0x60) == 0x104) ++num_h264_dpc; else
39b68c2664ec H264-ES demuxer
michael
parents: 9069
diff changeset
654 if((head&~0x60) == 0x105 && head != 0x105) ++num_h264_idr; else
39b68c2664ec H264-ES demuxer
michael
parents: 9069
diff changeset
655 if((head&~0x60) == 0x107 && head != 0x107) ++num_h264_sps; else
39b68c2664ec H264-ES demuxer
michael
parents: 9069
diff changeset
656 if((head&~0x60) == 0x108 && head != 0x108) ++num_h264_pps;
39b68c2664ec H264-ES demuxer
michael
parents: 9069
diff changeset
657
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
658 mp_msg(MSGT_DEMUX,MSGL_DBG3,"Opps... elementary video packet found: %03X\n",head);
1162
11e49d541f11 packet 0x1B6 (mpeg4 stream) detection
arpi_esp
parents: 979
diff changeset
659 } else
4711
39f5eccd54c2 added mp3 detection
arpi
parents: 4391
diff changeset
660 if((head>=0x1C0 && head<0x1F0) || head==0x1BD){
1338
345585097137 mpeg PES steram support (only 1E0 & 1C0 packets, no 1BA/1BB headers)
arpi
parents: 1331
diff changeset
661 ++num_elementary_packetsPES;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
662 mp_msg(MSGT_DEMUX,MSGL_DBG3,"Opps... PES packet found: %03X\n",head);
1338
345585097137 mpeg PES steram support (only 1E0 & 1C0 packets, no 1BA/1BB headers)
arpi
parents: 1331
diff changeset
663 } else
1162
11e49d541f11 packet 0x1B6 (mpeg4 stream) detection
arpi_esp
parents: 979
diff changeset
664 if(head==0x1B6) ++num_elementary_packets1B6;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
665 #if 1
1338
345585097137 mpeg PES steram support (only 1E0 & 1C0 packets, no 1BA/1BB headers)
arpi
parents: 1331
diff changeset
666 if( ( (num_elementary_packets100>50 && num_elementary_packets101>50) ||
345585097137 mpeg PES steram support (only 1E0 & 1C0 packets, no 1BA/1BB headers)
arpi
parents: 1331
diff changeset
667 (num_elementary_packetsPES>50) ) && skipped>4000000){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
668 mp_msg(MSGT_DEMUX,MSGL_V,"sync_mpeg_ps: seems to be ES/PES stream...\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
669 demux->stream->eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
670 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
671 }
4711
39f5eccd54c2 added mp3 detection
arpi
parents: 4391
diff changeset
672 if(num_mp3audio_packets>100 && num_elementary_packets100<10){
39f5eccd54c2 added mp3 detection
arpi
parents: 4391
diff changeset
673 mp_msg(MSGT_DEMUX,MSGL_V,"sync_mpeg_ps: seems to be MP3 stream...\n");
39f5eccd54c2 added mp3 detection
arpi
parents: 4391
diff changeset
674 demux->stream->eof=1;
39f5eccd54c2 added mp3 detection
arpi
parents: 4391
diff changeset
675 break;
39f5eccd54c2 added mp3 detection
arpi
parents: 4391
diff changeset
676 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
677 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
678 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
679 } while(ret!=1);
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
680 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"demux: %d bad bytes skipped\n",skipped);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
681 if(demux->stream->eof){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
682 mp_msg(MSGT_DEMUX,MSGL_V,"MPEG Stream reached EOF\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
683 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
684 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
685 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
686 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
687
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 7671
diff changeset
688 extern void skip_audio_frame(sh_audio_t *sh_audio);
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 7671
diff changeset
689
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
690 void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, int flags){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
691 demux_stream_t *d_audio=demuxer->audio;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
692 demux_stream_t *d_video=demuxer->video;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
693 sh_audio_t *sh_audio=d_audio->sh;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
694 sh_video_t *sh_video=d_video->sh;
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
695 mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
696 int precision = 1;
14426
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
697 float oldpts = 0;
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
698 off_t oldpos = demuxer->filepos;
14426
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
699 float newpts = 0;
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
700 off_t newpos = (flags & 1) ? demuxer->movi_start : oldpos;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
701
14426
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
702 if(mpg_d)
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
703 oldpts = mpg_d->last_pts;
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
704 newpts = (flags & 1) ? 0.0 : oldpts;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
705 //================= seek in MPEG ==========================
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
706 //calculate the pts to seek to
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
707 if(flags & 2) {
14426
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
708 if (mpg_d && mpg_d->final_pts > 0.0)
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
709 newpts += mpg_d->final_pts * rel_seek_secs;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
710 else
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
711 newpts += rel_seek_secs * (demuxer->movi_end - demuxer->movi_start) * oldpts / oldpos;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
712 } else
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
713 newpts += rel_seek_secs;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
714 if (newpts < 0) newpts = 0;
1628
bd1ef18cdf33 seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents: 1597
diff changeset
715
bd1ef18cdf33 seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents: 1597
diff changeset
716 if(flags&2){
bd1ef18cdf33 seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents: 1597
diff changeset
717 // float seek 0..1
bd1ef18cdf33 seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents: 1597
diff changeset
718 newpos+=(demuxer->movi_end-demuxer->movi_start)*rel_seek_secs;
bd1ef18cdf33 seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents: 1597
diff changeset
719 } else {
bd1ef18cdf33 seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents: 1597
diff changeset
720 // time seek (secs)
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
721 if (mpg_d && mpg_d->has_valid_timestamps) {
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
722 if (mpg_d->final_pts > 0.0)
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
723 newpos += rel_seek_secs * (demuxer->movi_end - demuxer->movi_start) / mpg_d->final_pts;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
724 else if (oldpts > 0.0)
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
725 newpos += rel_seek_secs * (oldpos - demuxer->movi_start) / oldpts;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
726 } else if(!sh_video || !sh_video->i_bps) // unspecified or VBR
1628
bd1ef18cdf33 seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents: 1597
diff changeset
727 newpos+=2324*75*rel_seek_secs; // 174.3 kbyte/sec
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
728 else
1628
bd1ef18cdf33 seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents: 1597
diff changeset
729 newpos+=sh_video->i_bps*rel_seek_secs;
bd1ef18cdf33 seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents: 1597
diff changeset
730 }
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
731
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
732 while (1) {
4391
6394c1e9e770 DVD start position handling changed (progbar/eta fix)
arpi
parents: 3975
diff changeset
733 if(newpos<demuxer->movi_start){
6394c1e9e770 DVD start position handling changed (progbar/eta fix)
arpi
parents: 3975
diff changeset
734 if(demuxer->stream->type!=STREAMTYPE_VCD) demuxer->movi_start=0; // for VCD
6394c1e9e770 DVD start position handling changed (progbar/eta fix)
arpi
parents: 3975
diff changeset
735 if(newpos<demuxer->movi_start) newpos=demuxer->movi_start;
6394c1e9e770 DVD start position handling changed (progbar/eta fix)
arpi
parents: 3975
diff changeset
736 }
1628
bd1ef18cdf33 seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents: 1597
diff changeset
737
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
738 #ifdef _LARGEFILE_SOURCE
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
739 newpos&=~((long long)STREAM_BUFFER_SIZE-1); /* sector boundary */
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
740 #else
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
741 newpos&=~(STREAM_BUFFER_SIZE-1); /* sector boundary */
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
742 #endif
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
743 stream_seek(demuxer->stream,newpos);
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
744
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
745 // re-sync video:
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
746 videobuf_code_len=0; // reset ES stream buffer
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
747
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
748 ds_fill_buffer(d_video);
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
749 if(sh_audio){
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
750 ds_fill_buffer(d_audio);
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
751 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
752
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
753 while(1){
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
754 int i;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
755 if(sh_audio && !d_audio->eof && d_video->pts && d_audio->pts){
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
756 float a_pts=d_audio->pts;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
757 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
758 if(d_video->pts>a_pts){
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
759 skip_audio_frame(sh_audio); // sync audio
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
760 continue;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
761 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
762 }
17821
6be72b753b82 check sh_video before seeking; closes cid 56
nicodvb
parents: 17819
diff changeset
763 if(!sh_video) break;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
764 i=sync_video_packet(d_video);
14426
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
765 if(sh_video->format == 0x10000004) { //mpeg4
14923
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
766 if(i==0x1B6) { //vop (frame) startcode
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
767 int pos = videobuf_len;
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
768 if(!read_video_packet(d_video)) break; // EOF
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
769 if((videobuffer[pos+4] & 0x3F) == 0) break; //I-frame
658fc109eefc added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents: 14502
diff changeset
770 }
14426
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
771 } else if(sh_video->format == 0x10000005){ //h264
17289
0c031c0ba80b h264es: don't seek to non-keyframes
lorenm
parents: 17286
diff changeset
772 if((i & ~0x60) == 0x105) break;
14426
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
773 } else { //default mpeg1/2
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
774 if(i==0x1B3 || i==0x1B8) break; // found it!
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
775 }
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
776 if(!i || !skip_video_packet(d_video)) break; // EOF?
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
777 }
14426
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
778 if(!mpg_d)
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
779 break;
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
780 if (!precision || abs(newpts - mpg_d->last_pts) < 0.5 || (mpg_d->last_pts == oldpts)) break;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
781 if ((newpos - oldpos) * (mpg_d->last_pts - oldpts) < 0) { // invalid timestamps
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
782 mpg_d->has_valid_timestamps = 0;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
783 break;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
784 }
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
785 precision--;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
786 //prepare another seek because we are off by more than 0.5s
14426
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
787 if(mpg_d) {
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
788 newpos += (newpts - mpg_d->last_pts) * (newpos - oldpos) / (mpg_d->last_pts - oldpts);
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
789 ds_free_packs(d_audio);
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
790 ds_free_packs(d_video);
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
791 demuxer->stream->eof=0; // clear eof flag
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
792 d_video->eof=0;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
793 d_audio->eof=0;
14426
3faa873334d7 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
nicodvb
parents: 13738
diff changeset
794 }
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
795 }
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
796 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1430
diff changeset
797
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
798 int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
799 demux_stream_t *d_video=demuxer->video;
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
800 sh_video_t *sh_video=d_video->sh;
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
801 mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv;
17699
b742a2c71c25 try to get duration from the stream layer, if an implementation of STREAM_CTRL_GET_TIME_LENGTH is available
nicodvb
parents: 17636
diff changeset
802 int msec = 0;
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
803
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
804 switch(cmd) {
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
805 case DEMUXER_CTRL_GET_TIME_LENGTH:
17699
b742a2c71c25 try to get duration from the stream layer, if an implementation of STREAM_CTRL_GET_TIME_LENGTH is available
nicodvb
parents: 17636
diff changeset
806 msec = stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, arg);
b742a2c71c25 try to get duration from the stream layer, if an implementation of STREAM_CTRL_GET_TIME_LENGTH is available
nicodvb
parents: 17636
diff changeset
807 if(msec != STREAM_UNSUPORTED) {
b742a2c71c25 try to get duration from the stream layer, if an implementation of STREAM_CTRL_GET_TIME_LENGTH is available
nicodvb
parents: 17636
diff changeset
808 msec = *((unsigned int*)arg);
b742a2c71c25 try to get duration from the stream layer, if an implementation of STREAM_CTRL_GET_TIME_LENGTH is available
nicodvb
parents: 17636
diff changeset
809 *((double *)arg)=(double)msec/1000.0f;
b742a2c71c25 try to get duration from the stream layer, if an implementation of STREAM_CTRL_GET_TIME_LENGTH is available
nicodvb
parents: 17636
diff changeset
810 mp_msg(MSGT_DEMUXER,MSGL_DBG2,"\r\nDEMUX_MPG_CTRL, stream len: %d (%.3lf)\r\n", msec, *((double*)arg));
b742a2c71c25 try to get duration from the stream layer, if an implementation of STREAM_CTRL_GET_TIME_LENGTH is available
nicodvb
parents: 17636
diff changeset
811 return DEMUXER_CTRL_GUESS;
b742a2c71c25 try to get duration from the stream layer, if an implementation of STREAM_CTRL_GET_TIME_LENGTH is available
nicodvb
parents: 17636
diff changeset
812 }
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
813 if (mpg_d && mpg_d->has_valid_timestamps) {
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16314
diff changeset
814 *((double *)arg)=(double)mpg_d->final_pts;
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
815 return DEMUXER_CTRL_GUESS;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
816 }
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
817 return DEMUXER_CTRL_DONTKNOW;
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
818
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
819 case DEMUXER_CTRL_GET_PERCENT_POS:
13738
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
820 if (mpg_d && mpg_d->has_valid_timestamps && mpg_d->final_pts > 0.0) {
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
821 *((int *)arg)=(int)(100 * mpg_d->last_pts / mpg_d->final_pts);
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
822 return DEMUXER_CTRL_OK;
39004f891def seeking based on the largest timestamp in an mpeg stream
aurel
parents: 13649
diff changeset
823 }
14502
8769fa370f83 Move generic length and percent pos calculation to demuxer.c
reimar
parents: 14426
diff changeset
824 return DEMUXER_CTRL_DONTKNOW;
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
825
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
826 case DEMUXER_CTRL_SWITCH_AUDIO:
17822
24fc4279bf99 fail immediately if any of the parameters necessary to switch audio stream isn't set/correct; closes cid 55
nicodvb
parents: 17821
diff changeset
827 if(! (mpg_d && mpg_d->num_a_streams > 1 && demuxer->audio && demuxer->audio->sh))
24fc4279bf99 fail immediately if any of the parameters necessary to switch audio stream isn't set/correct; closes cid 55
nicodvb
parents: 17821
diff changeset
828 return DEMUXER_CTRL_NOTIMPL;
24fc4279bf99 fail immediately if any of the parameters necessary to switch audio stream isn't set/correct; closes cid 55
nicodvb
parents: 17821
diff changeset
829 else {
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
830 demux_stream_t *d_audio = demuxer->audio;
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
831 sh_audio_t *sh_audio = d_audio->sh;
17819
7d5716fd634c init sh_a (new audio stream) to sh_audio (current audio stream); closes cid 241
nicodvb
parents: 17779
diff changeset
832 sh_audio_t *sh_a = sh_audio;
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
833 int i;
17822
24fc4279bf99 fail immediately if any of the parameters necessary to switch audio stream isn't set/correct; closes cid 55
nicodvb
parents: 17821
diff changeset
834 if(!sh_audio)
24fc4279bf99 fail immediately if any of the parameters necessary to switch audio stream isn't set/correct; closes cid 55
nicodvb
parents: 17821
diff changeset
835 return DEMUXER_CTRL_NOTIMPL;
15285
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
836 if (*((int*)arg) < 0)
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
837 {
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
838 for (i = 0; i < mpg_d->num_a_streams; i++) {
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
839 if (d_audio->id == mpg_d->a_stream_ids[i]) break;
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
840 }
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
841 do {
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
842 i = (i+1) % mpg_d->num_a_streams;
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
843 sh_a = (sh_audio_t*)demuxer->a_streams[mpg_d->a_stream_ids[i]];
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
844 } while (sh_a->format != sh_audio->format);
15285
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
845 }
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
846 else {
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
847 for (i = 0; i < mpg_d->num_a_streams; i++)
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
848 if (*((int*)arg) == mpg_d->a_stream_ids[i]) break;
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
849 if (i < mpg_d->num_a_streams)
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
850 sh_a = (sh_audio_t*)demuxer->a_streams[*((int*)arg)];
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
851 if (sh_a->format != sh_audio->format)
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
852 i = mpg_d->num_a_streams;
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
853 }
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
854 if (i < mpg_d->num_a_streams && d_audio->id != mpg_d->a_stream_ids[i]) {
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
855 d_audio->id = mpg_d->a_stream_ids[i];
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
856 d_audio->sh = sh_a;
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
857 ds_free_packs(d_audio);
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
858 }
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
859 }
15285
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
860 *((int*)arg) = demuxer->audio->id;
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
861 return DEMUXER_CTRL_OK;
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14923
diff changeset
862
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
863 default:
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
864 return DEMUXER_CTRL_NOTIMPL;
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
865 }
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
866 }
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
867
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
868
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
869 static int demux_mpg_pes_probe(demuxer_t *demuxer) {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
870 demuxer->synced = 3;
16314
6720cdd99559 Fix mpeg-pes playback
rtognimp
parents: 16310
diff changeset
871 return (demux_mpg_probe(demuxer) == DEMUXER_TYPE_MPEG_PS) ? DEMUXER_TYPE_MPEG_PES : 0;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
872 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
873
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
874
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
875 static demuxer_t* demux_mpg_es_open(demuxer_t* demuxer)
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
876 {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
877 sh_video_t *sh_video=NULL;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
878
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
879 demuxer->audio->sh = NULL; // ES streams has no audio channel
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
880 demuxer->video->sh = new_sh_video(demuxer,0); // create dummy video stream header, id=0
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
881 sh_video=demuxer->video->sh;sh_video->ds=demuxer->video;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
882
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
883 return demuxer;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
884 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
885
16310
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
886 static demuxer_t *demux_mpg_gxf_open(demuxer_t *demuxer) {
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
887 demuxer->audio->sh = NULL;
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
888 demuxer->video->sh = new_sh_video(demuxer,0);
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
889 ((sh_video_t *)demuxer->video->sh)->ds = demuxer->video;
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
890 demuxer->priv = (void *) 0xffffffff;
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
891 return demuxer;
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
892 }
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
893
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
894 static demuxer_t* demux_mpg_ps_open(demuxer_t* demuxer)
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
895 {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
896 sh_audio_t *sh_audio=NULL;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
897 sh_video_t *sh_video=NULL;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
898
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
899 sh_video=demuxer->video->sh;sh_video->ds=demuxer->video;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
900
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
901 if(demuxer->audio->id!=-2) {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
902 if(!ds_fill_buffer(demuxer->audio)){
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
903 mp_msg(MSGT_DEMUXER,MSGL_INFO,"MPEG: " MSGTR_MissingAudioStream);
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
904 demuxer->audio->sh=NULL;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
905 } else {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
906 sh_audio=demuxer->audio->sh;sh_audio->ds=demuxer->audio;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
907 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
908 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
909
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
910 return demuxer;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
911 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
912
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
913
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
914 demuxer_desc_t demuxer_desc_mpeg_ps = {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
915 "MPEG PS demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
916 "mpegps",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
917 "MPEG-PS",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
918 "Arpi?",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
919 "Mpeg",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
920 DEMUXER_TYPE_MPEG_PS,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
921 0, // unsafe autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
922 demux_mpg_probe,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
923 demux_mpg_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
924 demux_mpg_ps_open,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
925 demux_close_mpg,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
926 demux_seek_mpg,
16771
82a56c89b54d 10l, demux_mpg_control was missing from demuxer info struct, causing audio
reimar
parents: 16369
diff changeset
927 demux_mpg_control,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
928 };
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
929
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
930
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
931 demuxer_desc_t demuxer_desc_mpeg_pes = {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
932 "MPEG PES demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
933 "mpegpes",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
934 "MPEG-PES",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
935 "Arpi?",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
936 "Mpeg",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
937 DEMUXER_TYPE_MPEG_PES,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
938 0, // unsafe autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
939 demux_mpg_pes_probe,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
940 demux_mpg_fill_buffer,
16314
6720cdd99559 Fix mpeg-pes playback
rtognimp
parents: 16310
diff changeset
941 demux_mpg_ps_open,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
942 demux_close_mpg,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
943 demux_seek_mpg,
16771
82a56c89b54d 10l, demux_mpg_control was missing from demuxer info struct, causing audio
reimar
parents: 16369
diff changeset
944 demux_mpg_control,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
945 };
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
946
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
947
16310
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
948 demuxer_desc_t demuxer_desc_mpeg_gxf = {
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
949 "MPEG ES in GXF demuxer",
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
950 "mpeggxf",
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
951 "MPEG-ES in GXF",
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
952 "Reimar Döffinger",
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
953 "Mpeg",
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
954 DEMUXER_TYPE_MPEG_GXF,
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
955 0, // hack autodetection
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
956 NULL,
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
957 demux_mpg_gxf_fill_buffer,
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
958 demux_mpg_gxf_open,
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
959 NULL,
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
960 NULL,
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
961 NULL
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
962 };
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
963
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
964 demuxer_desc_t demuxer_desc_mpeg_es = {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
965 "MPEG ES demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
966 "mpeges",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
967 "MPEG-ES",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
968 "Arpi?",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
969 "Mpeg",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
970 DEMUXER_TYPE_MPEG_ES,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
971 0, // hack autodetection
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
972 NULL,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
973 demux_mpg_es_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
974 demux_mpg_es_open,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
975 demux_close_mpg,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
976 demux_seek_mpg,
16771
82a56c89b54d 10l, demux_mpg_control was missing from demuxer info struct, causing audio
reimar
parents: 16369
diff changeset
977 demux_mpg_control,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
978 };
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
979
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
980
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
981 demuxer_desc_t demuxer_desc_mpeg4_es = {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
982 "MPEG4 ES demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
983 "mpeg4es",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
984 "MPEG-ES",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
985 "Arpi?",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
986 "Mpeg",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
987 DEMUXER_TYPE_MPEG4_ES,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
988 0, // hack autodetection
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
989 NULL,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
990 demux_mpg_es_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
991 demux_mpg_es_open,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
992 demux_close_mpg,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
993 demux_seek_mpg,
16771
82a56c89b54d 10l, demux_mpg_control was missing from demuxer info struct, causing audio
reimar
parents: 16369
diff changeset
994 demux_mpg_control,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
995 };
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
996
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
997
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
998 demuxer_desc_t demuxer_desc_h264_es = {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
999 "H.264 ES demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
1000 "h264es",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
1001 "H264-ES",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
1002 "Arpi?",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
1003 "Mpeg",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
1004 DEMUXER_TYPE_H264_ES,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
1005 0, // hack autodetection
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
1006 NULL,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
1007 demux_mpg_es_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
1008 demux_mpg_es_open,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
1009 demux_close_mpg,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
1010 demux_seek_mpg,
16771
82a56c89b54d 10l, demux_mpg_control was missing from demuxer info struct, causing audio
reimar
parents: 16369
diff changeset
1011 demux_mpg_control,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15815
diff changeset
1012 };