annotate mpeg.c @ 2595:f9cfd91f344a libavformat

fix buffer overread with invalid Vorbis header
author mru
date Wed, 10 Oct 2007 22:59:31 +0000
parents a8122196ad95
children bb2ba011f1e1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
2176
50322a49fa2b split mpeg ps and variants muxer and demuxer, I'll clean more in a few minutes, lpcm freq tab is left static const in mpeg.h for now until we have more code in common
bcoudurier
parents: 2164
diff changeset
2 * MPEG1/2 demuxer
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
3 * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 885
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 */
2176
50322a49fa2b split mpeg ps and variants muxer and demuxer, I'll clean more in a few minutes, lpcm freq tab is left static const in mpeg.h for now until we have more code in common
bcoudurier
parents: 2164
diff changeset
21
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22 #include "avformat.h"
2176
50322a49fa2b split mpeg ps and variants muxer and demuxer, I'll clean more in a few minutes, lpcm freq tab is left static const in mpeg.h for now until we have more code in common
bcoudurier
parents: 2164
diff changeset
23 #include "mpeg.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
25 //#define DEBUG_SEEK
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
27 #undef NDEBUG
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
28 #include <assert.h>
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
29
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
30 /*********************************************/
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31 /* demux code */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
32
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 #define MAX_SYNC_SIZE 100000
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34
1284
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
35 static int cdxa_probe(AVProbeData *p)
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
36 {
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
37 /* check file header */
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
38 if (p->buf[0] == 'R' && p->buf[1] == 'I' &&
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
39 p->buf[2] == 'F' && p->buf[3] == 'F' &&
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
40 p->buf[8] == 'C' && p->buf[9] == 'D' &&
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
41 p->buf[10] == 'X' && p->buf[11] == 'A')
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
42 return AVPROBE_SCORE_MAX;
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
43 else
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
44 return 0;
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
45 }
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
46
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
47 static int mpegps_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
48 {
936
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
49 uint32_t code= -1;
1138
36ce24677f96 detect MPEG PES streams as MPEG PS; the PS demuxer will cope
mru
parents: 1126
diff changeset
50 int sys=0, pspack=0, priv1=0, vid=0, audio=0;
539
78a8cbdad269 64bit and reading over the end of the array fixes
michael
parents: 537
diff changeset
51 int i;
1257
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
52 int score=0;
49
3e7e13e08b27 avoid too many false detections
bellard
parents: 41
diff changeset
53
1284
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
54 score = cdxa_probe(p);
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
55 if (score > 0) return score;
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
56
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
57 /* Search for MPEG stream */
936
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
58 for(i=0; i<p->buf_size; i++){
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
59 code = (code<<8) + p->buf[i];
165
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
60 if ((code & 0xffffff00) == 0x100) {
1140
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
61 if(code == SYSTEM_HEADER_START_CODE) sys++;
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
62 else if(code == PRIVATE_STREAM_1) priv1++;
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
63 else if(code == PACK_START_CODE) pspack++;
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
64 else if((code & 0xf0) == VIDEO_ID) vid++;
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
65 else if((code & 0xe0) == AUDIO_ID) audio++;
165
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
66 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 }
1257
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
68
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
69 if(vid || audio) /* invalid VDR files nd short PES streams */
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
70 score= AVPROBE_SCORE_MAX/4;
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
71
2311
aac77d24706f //more debug info
michael
parents: 2274
diff changeset
72 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, p->buf_size);
936
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
73 if(sys && sys*9 <= pspack*10)
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
74 return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
1140
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
75 if((priv1 || vid || audio) && (priv1+vid+audio)*9 <= pspack*10)
940
53c4a89c1a82 mpeg-ps probe 2nd try
michael
parents: 936
diff changeset
76 return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
2312
a8122196ad95 fix misdetection of out.ac3
michael
parents: 2311
diff changeset
77 if((!!vid ^ !!audio) && (audio+vid > 1) && !sys && !pspack && p->buf_size>2048) /* PES stream */
1140
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
78 return AVPROBE_SCORE_MAX/2+2;
1257
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
79
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
80 //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
81 return score;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
82 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
85 typedef struct MpegDemuxContext {
1332
7474cc6383d4 fix some signedness warnings
mru
parents: 1322
diff changeset
86 int32_t header_state;
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
87 unsigned char psm_es_type[256];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 } MpegDemuxContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
89
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
90 static int mpegps_read_header(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
91 AVFormatParameters *ap)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
92 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
93 MpegDemuxContext *m = s->priv_data;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
94 m->header_state = 0xff;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
95 s->ctx_flags |= AVFMTCTX_NOHEADER;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
96
944c8edaf609 seek support
bellard
parents: 293
diff changeset
97 /* no need to do more */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
98 return 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
99 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
100
944c8edaf609 seek support
bellard
parents: 293
diff changeset
101 static int64_t get_pts(ByteIOContext *pb, int c)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
102 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
103 int64_t pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
104 int val;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
105
944c8edaf609 seek support
bellard
parents: 293
diff changeset
106 if (c < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
107 c = get_byte(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
108 pts = (int64_t)((c >> 1) & 0x07) << 30;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
109 val = get_be16(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
110 pts |= (int64_t)(val >> 1) << 15;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
111 val = get_be16(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
112 pts |= (int64_t)(val >> 1);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
113 return pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
114 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
115
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
116 static int find_next_start_code(ByteIOContext *pb, int *size_ptr,
1332
7474cc6383d4 fix some signedness warnings
mru
parents: 1322
diff changeset
117 int32_t *header_state)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 unsigned int state, v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120 int val, n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122 state = *header_state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 n = *size_ptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 while (n > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125 if (url_feof(pb))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
126 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
127 v = get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128 n--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
129 if (state == 0x000001) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
130 state = ((state << 8) | v) & 0xffffff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
131 val = state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 goto found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
134 state = ((state << 8) | v) & 0xffffff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136 val = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
137 found:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
138 *header_state = state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 *size_ptr = n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
140 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142
683
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 674
diff changeset
143 #if 0 /* unused, remove? */
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
144 /* XXX: optimize */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
145 static int find_prev_start_code(ByteIOContext *pb, int *size_ptr)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
146 {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
147 int64_t pos, pos_start;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
148 int max_size, start_code;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
149
944c8edaf609 seek support
bellard
parents: 293
diff changeset
150 max_size = *size_ptr;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
151 pos_start = url_ftell(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
152
944c8edaf609 seek support
bellard
parents: 293
diff changeset
153 /* in order to go faster, we fill the buffer */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
154 pos = pos_start - 16386;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
155 if (pos < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
156 pos = 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
157 url_fseek(pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
158 get_byte(pb);
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 291
diff changeset
159
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
160 pos = pos_start;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
161 for(;;) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
162 pos--;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
163 if (pos < 0 || (pos_start - pos) >= max_size) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
164 start_code = -1;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
165 goto the_end;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
166 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
167 url_fseek(pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
168 start_code = get_be32(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
169 if ((start_code & 0xffffff00) == 0x100)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
170 break;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
171 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
172 the_end:
944c8edaf609 seek support
bellard
parents: 293
diff changeset
173 *size_ptr = pos_start - pos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
174 return start_code;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
175 }
683
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 674
diff changeset
176 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
177
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
178 /**
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
179 * Extracts stream types from a program stream map
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
180 * According to ISO/IEC 13818-1 ('MPEG-2 Systems') table 2-35
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
181 *
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
182 * @return number of bytes occupied by PSM in the bitstream
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
183 */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
184 static long mpegps_psm_parse(MpegDemuxContext *m, ByteIOContext *pb)
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
185 {
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
186 int psm_length, ps_info_length, es_map_length;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
187
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
188 psm_length = get_be16(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
189 get_byte(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
190 get_byte(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
191 ps_info_length = get_be16(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
192
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
193 /* skip program_stream_info */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
194 url_fskip(pb, ps_info_length);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
195 es_map_length = get_be16(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
196
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
197 /* at least one es available? */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
198 while (es_map_length >= 4){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
199 unsigned char type = get_byte(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
200 unsigned char es_id = get_byte(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
201 uint16_t es_info_length = get_be16(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
202 /* remember mapping from stream id to stream type */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
203 m->psm_es_type[es_id] = type;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
204 /* skip program_stream_info */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
205 url_fskip(pb, es_info_length);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
206 es_map_length -= 4 + es_info_length;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
207 }
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
208 get_be32(pb); /* crc32 */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
209 return 2 + psm_length;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
210 }
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
211
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
212 /* read the next PES header. Return its position in ppos
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
213 (if not NULL), and its start code, pts and dts.
944c8edaf609 seek support
bellard
parents: 293
diff changeset
214 */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
215 static int mpegps_read_pes_header(AVFormatContext *s,
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
216 int64_t *ppos, int *pstart_code,
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
217 int64_t *ppts, int64_t *pdts)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219 MpegDemuxContext *m = s->priv_data;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
220 int len, size, startcode, c, flags, header_len;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
221 int pes_ext, ext2_len, id_ext, skip;
1664
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
222 int64_t pts, dts;
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
223 int64_t last_sync= url_ftell(&s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
224
1664
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
225 error_redo:
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
226 url_fseek(&s->pb, last_sync, SEEK_SET);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
227 redo:
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
228 /* next start code (should be immediately after) */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
229 m->header_state = 0xff;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
230 size = MAX_SYNC_SIZE;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
231 startcode = find_next_start_code(&s->pb, &size, &m->header_state);
1664
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
232 last_sync = url_ftell(&s->pb);
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
233 //printf("startcode=%x pos=0x%"PRIx64"\n", startcode, url_ftell(&s->pb));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
234 if (startcode < 0)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2177
diff changeset
235 return AVERROR(EIO);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 if (startcode == PACK_START_CODE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
237 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
238 if (startcode == SYSTEM_HEADER_START_CODE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
240 if (startcode == PADDING_STREAM ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
241 startcode == PRIVATE_STREAM_2) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 /* skip them */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 len = get_be16(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 url_fskip(&s->pb, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 }
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
247 if (startcode == PROGRAM_STREAM_MAP) {
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
248 mpegps_psm_parse(m, &s->pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
249 goto redo;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
250 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
251
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252 /* find matching stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 if (!((startcode >= 0x1c0 && startcode <= 0x1df) ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254 (startcode >= 0x1e0 && startcode <= 0x1ef) ||
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
255 (startcode == 0x1bd) || (startcode == 0x1fd)))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 goto redo;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
257 if (ppos) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
258 *ppos = url_ftell(&s->pb) - 4;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
259 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260 len = get_be16(&s->pb);
1666
682ea2701149 cosmetic
michael
parents: 1665
diff changeset
261 pts =
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
262 dts = AV_NOPTS_VALUE;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
263 /* stuffing */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
264 for(;;) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
265 if (len < 1)
1664
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
266 goto error_redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 c = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268 len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 /* XXX: for mpeg1, should test only bit 7 */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
270 if (c != 0xff)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273 if ((c & 0xc0) == 0x40) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274 /* buffer scale & size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276 c = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277 len -= 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
278 }
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
279 if ((c & 0xe0) == 0x20) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
280 dts = pts = get_pts(&s->pb, c);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
281 len -= 4;
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
282 if (c & 0x10){
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
283 dts = get_pts(&s->pb, -1);
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
284 len -= 5;
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
285 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
286 } else if ((c & 0xc0) == 0x80) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
287 /* mpeg 2 PES */
1126
8ba9a025a342 allow packets with non-zero PES_scrambling_control
mru
parents: 979
diff changeset
288 #if 0 /* some streams have this field set for no apparent reason */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
289 if ((c & 0x30) != 0) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
290 /* Encrypted multiplex not handled */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
291 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 }
1126
8ba9a025a342 allow packets with non-zero PES_scrambling_control
mru
parents: 979
diff changeset
293 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 flags = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
295 header_len = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
296 len -= 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 if (header_len > len)
1664
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
298 goto error_redo;
1668
b609473bf4bb simplify
michael
parents: 1667
diff changeset
299 len -= header_len;
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
300 if (flags & 0x80) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
301 dts = pts = get_pts(&s->pb, -1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
302 header_len -= 5;
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
303 if (flags & 0x40) {
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
304 dts = get_pts(&s->pb, -1);
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
305 header_len -= 5;
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
306 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
307 }
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
308 if (flags & 0x01) { /* PES extension */
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
309 pes_ext = get_byte(&s->pb);
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
310 header_len--;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
311 if (pes_ext & 0x40) { /* pack header - should be zero in PS */
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
312 goto error_redo;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
313 }
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
314 /* Skip PES private data, program packet sequence counter and P-STD buffer */
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
315 skip = (pes_ext >> 4) & 0xb;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
316 skip += skip & 0x9;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
317 url_fskip(&s->pb, skip);
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
318 header_len -= skip;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
319
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
320 if (pes_ext & 0x01) { /* PES extension 2 */
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
321 ext2_len = get_byte(&s->pb);
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
322 header_len--;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
323 if ((ext2_len & 0x7f) > 0) {
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
324 id_ext = get_byte(&s->pb);
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
325 if ((id_ext & 0x80) == 0)
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
326 startcode = ((startcode & 0xff) << 8) | id_ext;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
327 header_len--;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
328 }
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
329 }
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
330 }
1668
b609473bf4bb simplify
michael
parents: 1667
diff changeset
331 if(header_len < 0)
b609473bf4bb simplify
michael
parents: 1667
diff changeset
332 goto error_redo;
b609473bf4bb simplify
michael
parents: 1667
diff changeset
333 url_fskip(&s->pb, header_len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334 }
447
94aa265c18b9 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents: 437
diff changeset
335 else if( c!= 0xf )
94aa265c18b9 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents: 437
diff changeset
336 goto redo;
94aa265c18b9 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents: 437
diff changeset
337
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
338 if (startcode == PRIVATE_STREAM_1 && !m->psm_es_type[startcode & 0xff]) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
339 startcode = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
340 len--;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
341 if (startcode >= 0x80 && startcode <= 0xcf) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
342 /* audio: skip header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
345 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
346 len -= 3;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
347 if (startcode >= 0xb0 && startcode <= 0xbf) {
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
348 /* MLP/TrueHD audio has a 4-byte header */
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
349 get_byte(&s->pb);
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
350 len--;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
351 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
352 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353 }
1665
074b64b1fb61 reduce len checks, simplifies code
michael
parents: 1664
diff changeset
354 if(len<0)
074b64b1fb61 reduce len checks, simplifies code
michael
parents: 1664
diff changeset
355 goto error_redo;
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
356 if(dts != AV_NOPTS_VALUE && ppos){
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
357 int i;
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
358 for(i=0; i<s->nb_streams; i++){
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
359 if(startcode == s->streams[i]->id) {
979
d2e5dfdf4def add size to AVIndex
michael
parents: 940
diff changeset
360 av_add_index_entry(s->streams[i], *ppos, dts, 0, 0, AVINDEX_KEYFRAME /* FIXME keyframe? */);
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
361 }
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
362 }
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
363 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
364
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
365 *pstart_code = startcode;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
366 *ppts = pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
367 *pdts = dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
368 return len;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
369 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
370
944c8edaf609 seek support
bellard
parents: 293
diff changeset
371 static int mpegps_read_packet(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
372 AVPacket *pkt)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
373 {
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
374 MpegDemuxContext *m = s->priv_data;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
375 AVStream *st;
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
376 int len, startcode, i, type, codec_id = 0, es_type;
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
377 int64_t pts, dts, dummy_pos; //dummy_pos is needed for the index building to work
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
378
944c8edaf609 seek support
bellard
parents: 293
diff changeset
379 redo:
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
380 len = mpegps_read_pes_header(s, &dummy_pos, &startcode, &pts, &dts);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
381 if (len < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
382 return len;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
383
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
384 /* now find stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
385 for(i=0;i<s->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
386 st = s->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
387 if (st->id == startcode)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
388 goto found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
389 }
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
390
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
391 es_type = m->psm_es_type[startcode & 0xff];
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
392 if(es_type > 0){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
393 if(es_type == STREAM_TYPE_VIDEO_MPEG1){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
394 codec_id = CODEC_ID_MPEG2VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
395 type = CODEC_TYPE_VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
396 } else if(es_type == STREAM_TYPE_VIDEO_MPEG2){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
397 codec_id = CODEC_ID_MPEG2VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
398 type = CODEC_TYPE_VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
399 } else if(es_type == STREAM_TYPE_AUDIO_MPEG1 ||
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
400 es_type == STREAM_TYPE_AUDIO_MPEG2){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
401 codec_id = CODEC_ID_MP3;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
402 type = CODEC_TYPE_AUDIO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
403 } else if(es_type == STREAM_TYPE_AUDIO_AAC){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
404 codec_id = CODEC_ID_AAC;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
405 type = CODEC_TYPE_AUDIO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
406 } else if(es_type == STREAM_TYPE_VIDEO_MPEG4){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
407 codec_id = CODEC_ID_MPEG4;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
408 type = CODEC_TYPE_VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
409 } else if(es_type == STREAM_TYPE_VIDEO_H264){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
410 codec_id = CODEC_ID_H264;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
411 type = CODEC_TYPE_VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
412 } else if(es_type == STREAM_TYPE_AUDIO_AC3){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
413 codec_id = CODEC_ID_AC3;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
414 type = CODEC_TYPE_AUDIO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
415 } else {
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
416 goto skip;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
417 }
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
418 } else if (startcode >= 0x1e0 && startcode <= 0x1ef) {
1146
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
419 static const unsigned char avs_seqh[4] = { 0, 0, 1, 0xb0 };
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
420 unsigned char buf[8];
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
421 get_buffer(&s->pb, buf, 8);
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
422 url_fseek(&s->pb, -8, SEEK_CUR);
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
423 if(!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1))
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
424 codec_id = CODEC_ID_CAVS;
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
425 else
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
426 codec_id = CODEC_ID_MPEG2VIDEO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
427 type = CODEC_TYPE_VIDEO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
428 } else if (startcode >= 0x1c0 && startcode <= 0x1df) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
429 type = CODEC_TYPE_AUDIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
430 codec_id = CODEC_ID_MP2;
767
cbfea73709bd fix ac3 and dts detection (patch by Joakim Plate <joakim.plate at ecce.se>)
mru
parents: 722
diff changeset
431 } else if (startcode >= 0x80 && startcode <= 0x87) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
432 type = CODEC_TYPE_AUDIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
433 codec_id = CODEC_ID_AC3;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
434 } else if ((startcode >= 0x88 && startcode <= 0x8f)
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
435 ||( startcode >= 0x98 && startcode <= 0x9f)) {
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
436 /* 0x90 - 0x97 is reserved for SDDS in DVD specs */
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
437 type = CODEC_TYPE_AUDIO;
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
438 codec_id = CODEC_ID_DTS;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
439 } else if (startcode >= 0xa0 && startcode <= 0xaf) {
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
440 type = CODEC_TYPE_AUDIO;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
441 codec_id = CODEC_ID_PCM_S16BE;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
442 } else if (startcode >= 0xb0 && startcode <= 0xbf) {
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
443 type = CODEC_TYPE_AUDIO;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
444 codec_id = CODEC_ID_MLP;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
445 } else if (startcode >= 0xc0 && startcode <= 0xcf) {
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
446 /* Used for both AC-3 and E-AC-3 in EVOB files */
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
447 type = CODEC_TYPE_AUDIO;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
448 codec_id = CODEC_ID_AC3;
783
2e8b5a7d7e02 DVD subtitle parsing - show mpeg component IDs by default
bellard
parents: 767
diff changeset
449 } else if (startcode >= 0x20 && startcode <= 0x3f) {
2e8b5a7d7e02 DVD subtitle parsing - show mpeg component IDs by default
bellard
parents: 767
diff changeset
450 type = CODEC_TYPE_SUBTITLE;
2e8b5a7d7e02 DVD subtitle parsing - show mpeg component IDs by default
bellard
parents: 767
diff changeset
451 codec_id = CODEC_ID_DVD_SUBTITLE;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
452 } else if (startcode >= 0xfd55 && startcode <= 0xfd5f) {
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
453 type = CODEC_TYPE_VIDEO;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
454 codec_id = CODEC_ID_VC1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
455 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
456 skip:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
457 /* skip packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458 url_fskip(&s->pb, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
459 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
460 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
461 /* no stream found: add a new stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
462 st = av_new_stream(s, startcode);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
463 if (!st)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
464 goto skip;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
465 st->codec->codec_type = type;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
466 st->codec->codec_id = codec_id;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
467 if (codec_id != CODEC_ID_PCM_S16BE)
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2001
diff changeset
468 st->need_parsing = AVSTREAM_PARSE_FULL;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
469 found:
708
d79164865a7c more fine grained discarding of packets
michael
parents: 698
diff changeset
470 if(st->discard >= AVDISCARD_ALL)
652
b47948262721 support discarding uninterresting packets
michael
parents: 628
diff changeset
471 goto skip;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
472 if (startcode >= 0xa0 && startcode <= 0xaf) {
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
473 int b1, freq;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
474
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
475 /* for LPCM, we just skip the header and consider it is raw
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
476 audio data */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
477 if (len <= 3)
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
478 goto skip;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
479 get_byte(&s->pb); /* emphasis (1), muse(1), reserved(1), frame number(5) */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
480 b1 = get_byte(&s->pb); /* quant (2), freq(2), reserved(1), channels(3) */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
481 get_byte(&s->pb); /* dynamic range control (0x80 = off) */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
482 len -= 3;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
483 freq = (b1 >> 4) & 3;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
484 st->codec->sample_rate = lpcm_freq_tab[freq];
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
485 st->codec->channels = 1 + (b1 & 7);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
486 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * 2;
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
487 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
488 av_new_packet(pkt, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
489 get_buffer(&s->pb, pkt->data, pkt->size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
490 pkt->pts = pts;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
491 pkt->dts = dts;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
492 pkt->stream_index = st->index;
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
493 #if 0
652
b47948262721 support discarding uninterresting packets
michael
parents: 628
diff changeset
494 av_log(s, AV_LOG_DEBUG, "%d: pts=%0.3f dts=%0.3f size=%d\n",
b47948262721 support discarding uninterresting packets
michael
parents: 628
diff changeset
495 pkt->stream_index, pkt->pts / 90000.0, pkt->dts / 90000.0, pkt->size);
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
496 #endif
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 475
diff changeset
497
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
498 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
499 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
500
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
501 static int mpegps_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
502 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
503 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
504 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
505
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
506 static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index,
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
507 int64_t *ppos, int64_t pos_limit)
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
508 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
509 int len, startcode;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
510 int64_t pos, pts, dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
511
944c8edaf609 seek support
bellard
parents: 293
diff changeset
512 pos = *ppos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
513 #ifdef DEBUG_SEEK
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
514 printf("read_dts: pos=0x%"PRIx64" next=%d -> ", pos, find_next);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
515 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
516 url_fseek(&s->pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
517 for(;;) {
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
518 len = mpegps_read_pes_header(s, &pos, &startcode, &pts, &dts);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
519 if (len < 0) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
520 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
521 printf("none (ret=%d)\n", len);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
522 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
523 return AV_NOPTS_VALUE;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
524 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
525 if (startcode == s->streams[stream_index]->id &&
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
526 dts != AV_NOPTS_VALUE) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
527 break;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
528 }
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
529 url_fskip(&s->pb, len);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
530 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
531 #ifdef DEBUG_SEEK
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
532 printf("pos=0x%"PRIx64" dts=0x%"PRIx64" %0.3f\n", pos, dts, dts / 90000.0);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
533 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
534 *ppos = pos;
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 452
diff changeset
535 return dts;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
536 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
537
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1146
diff changeset
538 AVInputFormat mpegps_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
539 "mpeg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
540 "MPEG PS format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
541 sizeof(MpegDemuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
542 mpegps_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
543 mpegps_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
544 mpegps_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
545 mpegps_read_close,
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
546 NULL, //mpegps_read_seek,
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
547 mpegps_read_dts,
783
2e8b5a7d7e02 DVD subtitle parsing - show mpeg component IDs by default
bellard
parents: 767
diff changeset
548 .flags = AVFMT_SHOW_IDS,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
549 };