Mercurial > libavformat.hg
annotate mpeg.c @ 5234:b133e5865370 libavformat
Export mov/mp4 major and compatible brands as metadata.
Patch by haim alon, haim dot alter at gmail dot com
author | bcoudurier |
---|---|
date | Sat, 26 Sep 2009 20:51:38 +0000 |
parents | 4277da592002 |
children | a4a45f236eec |
rev | line source |
---|---|
0 | 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 |
4251
77e0c7511d41
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
3967
diff
changeset
|
3 * Copyright (c) 2000, 2001, 2002 Fabrice Bellard |
0 | 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 | 8 * modify it under the terms of the GNU Lesser General Public |
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 | 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 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
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 | 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 | 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 | 24 |
310 | 25 //#define DEBUG_SEEK |
0 | 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 | 30 /*********************************************/ |
31 /* demux code */ | |
32 | |
33 #define MAX_SYNC_SIZE 100000 | |
34 | |
2697
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
35 static int check_pes(uint8_t *p, uint8_t *end){ |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
36 int pes1; |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
37 int pes2= (p[3] & 0xC0) == 0x80 |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
38 && (p[4] & 0xC0) != 0x40 |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
39 &&((p[4] & 0xC0) == 0x00 || (p[4]&0xC0)>>2 == (p[6]&0xF0)); |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
40 |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
41 for(p+=3; p<end && *p == 0xFF; p++); |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
42 if((*p&0xC0) == 0x40) p+=2; |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
43 if((*p&0xF0) == 0x20){ |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
44 pes1= p[0]&p[2]&p[4]&1; |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
45 }else if((*p&0xF0) == 0x30){ |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
46 pes1= p[0]&p[2]&p[4]&p[5]&p[7]&p[9]&1; |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
47 }else |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
48 pes1 = *p == 0x0F; |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
49 |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
50 return pes1||pes2; |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
51 } |
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
52 |
0 | 53 static int mpegps_probe(AVProbeData *p) |
54 { | |
936 | 55 uint32_t code= -1; |
2799 | 56 int sys=0, pspack=0, priv1=0, vid=0, audio=0, invalid=0; |
539 | 57 int i; |
1257 | 58 int score=0; |
49 | 59 |
936 | 60 for(i=0; i<p->buf_size; i++){ |
61 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
|
62 if ((code & 0xffffff00) == 0x100) { |
2698 | 63 int pes= check_pes(p->buf+i, p->buf+p->buf_size); |
2697
afbdd52324e3
fix misdetection of mp3could_not_find_codec_parameters.mp3
michael
parents:
2695
diff
changeset
|
64 |
1140
2cfb5e02b299
detect audio-only program streams and broken files made by VDR
mru
parents:
1138
diff
changeset
|
65 if(code == SYSTEM_HEADER_START_CODE) sys++; |
2cfb5e02b299
detect audio-only program streams and broken files made by VDR
mru
parents:
1138
diff
changeset
|
66 else if(code == PRIVATE_STREAM_1) priv1++; |
2cfb5e02b299
detect audio-only program streams and broken files made by VDR
mru
parents:
1138
diff
changeset
|
67 else if(code == PACK_START_CODE) pspack++; |
3779 | 68 else if((code & 0xf0) == VIDEO_ID && pes) vid++; |
69 else if((code & 0xe0) == AUDIO_ID && pes) audio++; | |
2799 | 70 |
71 else if((code & 0xf0) == VIDEO_ID && !pes) invalid++; | |
72 else if((code & 0xe0) == AUDIO_ID && !pes) invalid++; | |
165
e4d2f704bf80
- Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents:
65
diff
changeset
|
73 } |
0 | 74 } |
1257 | 75 |
2799 | 76 if(vid+audio > invalid) /* invalid VDR files nd short PES streams */ |
1257 | 77 score= AVPROBE_SCORE_MAX/4; |
78 | |
2311 | 79 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, p->buf_size); |
2799 | 80 if(sys>invalid && sys*9 <= pspack*10) |
5190 | 81 return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg |
2799 | 82 if(priv1 + vid + audio > invalid && (priv1+vid+audio)*9 <= pspack*10) |
5190 | 83 return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg |
84 if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048 && vid + audio > invalid) /* PES stream */ | |
5189
cfe130ee18f1
Slightly stricter MPEG-PES probing, fixes issue 1383.
reimar
parents:
4888
diff
changeset
|
85 return (audio > 12 || vid > 3) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; |
1257 | 86 |
87 //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1 | |
5189
cfe130ee18f1
Slightly stricter MPEG-PES probing, fixes issue 1383.
reimar
parents:
4888
diff
changeset
|
88 //mp3_misidentified_2.mp3 has sys:0 priv1:0 pspack:0 vid:0 audio:6 |
1257 | 89 return score; |
0 | 90 } |
91 | |
92 | |
93 typedef struct MpegDemuxContext { | |
1332 | 94 int32_t header_state; |
722 | 95 unsigned char psm_es_type[256]; |
2718
1bbb4fa1cdcd
correctly set audio codec when demuxing sofdec files
aurel
parents:
2698
diff
changeset
|
96 int sofdec; |
0 | 97 } MpegDemuxContext; |
98 | |
310 | 99 static int mpegps_read_header(AVFormatContext *s, |
100 AVFormatParameters *ap) | |
101 { | |
102 MpegDemuxContext *m = s->priv_data; | |
2728 | 103 const char *sofdec = "Sofdec"; |
104 int v, i = 0; | |
2718
1bbb4fa1cdcd
correctly set audio codec when demuxing sofdec files
aurel
parents:
2698
diff
changeset
|
105 |
310 | 106 m->header_state = 0xff; |
107 s->ctx_flags |= AVFMTCTX_NOHEADER; | |
108 | |
2728 | 109 m->sofdec = -1; |
110 do { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
111 v = get_byte(s->pb); |
2728 | 112 m->header_state = m->header_state << 8 | v; |
113 m->sofdec++; | |
114 } while (v == sofdec[i] && i++ < 6); | |
2718
1bbb4fa1cdcd
correctly set audio codec when demuxing sofdec files
aurel
parents:
2698
diff
changeset
|
115 |
310 | 116 /* no need to do more */ |
117 return 0; | |
118 } | |
119 | |
120 static int64_t get_pts(ByteIOContext *pb, int c) | |
121 { | |
2906
e5dfe3c96f3b
Move parsing of MPEG-PES timestamp to mpeg.h (as an inline function) so it
ivo
parents:
2886
diff
changeset
|
122 uint8_t buf[5]; |
310 | 123 |
2906
e5dfe3c96f3b
Move parsing of MPEG-PES timestamp to mpeg.h (as an inline function) so it
ivo
parents:
2886
diff
changeset
|
124 buf[0] = c<0 ? get_byte(pb) : c; |
e5dfe3c96f3b
Move parsing of MPEG-PES timestamp to mpeg.h (as an inline function) so it
ivo
parents:
2886
diff
changeset
|
125 get_buffer(pb, buf+1, 4); |
e5dfe3c96f3b
Move parsing of MPEG-PES timestamp to mpeg.h (as an inline function) so it
ivo
parents:
2886
diff
changeset
|
126 |
e5dfe3c96f3b
Move parsing of MPEG-PES timestamp to mpeg.h (as an inline function) so it
ivo
parents:
2886
diff
changeset
|
127 return ff_parse_pes_pts(buf); |
310 | 128 } |
129 | |
885 | 130 static int find_next_start_code(ByteIOContext *pb, int *size_ptr, |
1332 | 131 int32_t *header_state) |
0 | 132 { |
133 unsigned int state, v; | |
134 int val, n; | |
135 | |
136 state = *header_state; | |
137 n = *size_ptr; | |
138 while (n > 0) { | |
139 if (url_feof(pb)) | |
140 break; | |
141 v = get_byte(pb); | |
142 n--; | |
143 if (state == 0x000001) { | |
144 state = ((state << 8) | v) & 0xffffff; | |
145 val = state; | |
146 goto found; | |
147 } | |
148 state = ((state << 8) | v) & 0xffffff; | |
149 } | |
150 val = -1; | |
151 found: | |
152 *header_state = state; | |
153 *size_ptr = n; | |
154 return val; | |
155 } | |
156 | |
683
095009fc2f35
kill warnings patch by (M¸«©ns Rullg¸«©rd <mru inprovide com>)
michael
parents:
674
diff
changeset
|
157 #if 0 /* unused, remove? */ |
310 | 158 /* XXX: optimize */ |
159 static int find_prev_start_code(ByteIOContext *pb, int *size_ptr) | |
0 | 160 { |
310 | 161 int64_t pos, pos_start; |
162 int max_size, start_code; | |
163 | |
164 max_size = *size_ptr; | |
165 pos_start = url_ftell(pb); | |
166 | |
167 /* in order to go faster, we fill the buffer */ | |
168 pos = pos_start - 16386; | |
169 if (pos < 0) | |
170 pos = 0; | |
171 url_fseek(pb, pos, SEEK_SET); | |
172 get_byte(pb); | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
291
diff
changeset
|
173 |
310 | 174 pos = pos_start; |
175 for(;;) { | |
176 pos--; | |
177 if (pos < 0 || (pos_start - pos) >= max_size) { | |
178 start_code = -1; | |
179 goto the_end; | |
180 } | |
181 url_fseek(pb, pos, SEEK_SET); | |
182 start_code = get_be32(pb); | |
183 if ((start_code & 0xffffff00) == 0x100) | |
184 break; | |
185 } | |
186 the_end: | |
187 *size_ptr = pos_start - pos; | |
188 return start_code; | |
0 | 189 } |
683
095009fc2f35
kill warnings patch by (M¸«©ns Rullg¸«©rd <mru inprovide com>)
michael
parents:
674
diff
changeset
|
190 #endif |
0 | 191 |
722 | 192 /** |
193 * Extracts stream types from a program stream map | |
194 * According to ISO/IEC 13818-1 ('MPEG-2 Systems') table 2-35 | |
885 | 195 * |
722 | 196 * @return number of bytes occupied by PSM in the bitstream |
197 */ | |
198 static long mpegps_psm_parse(MpegDemuxContext *m, ByteIOContext *pb) | |
199 { | |
200 int psm_length, ps_info_length, es_map_length; | |
201 | |
202 psm_length = get_be16(pb); | |
203 get_byte(pb); | |
204 get_byte(pb); | |
205 ps_info_length = get_be16(pb); | |
206 | |
207 /* skip program_stream_info */ | |
208 url_fskip(pb, ps_info_length); | |
209 es_map_length = get_be16(pb); | |
210 | |
211 /* at least one es available? */ | |
212 while (es_map_length >= 4){ | |
3779 | 213 unsigned char type = get_byte(pb); |
214 unsigned char es_id = get_byte(pb); | |
722 | 215 uint16_t es_info_length = get_be16(pb); |
216 /* remember mapping from stream id to stream type */ | |
217 m->psm_es_type[es_id] = type; | |
218 /* skip program_stream_info */ | |
219 url_fskip(pb, es_info_length); | |
220 es_map_length -= 4 + es_info_length; | |
221 } | |
222 get_be32(pb); /* crc32 */ | |
223 return 2 + psm_length; | |
224 } | |
225 | |
885 | 226 /* read the next PES header. Return its position in ppos |
310 | 227 (if not NULL), and its start code, pts and dts. |
228 */ | |
229 static int mpegps_read_pes_header(AVFormatContext *s, | |
885 | 230 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
|
231 int64_t *ppts, int64_t *pdts) |
0 | 232 { |
233 MpegDemuxContext *m = s->priv_data; | |
310 | 234 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
|
235 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
|
236 int64_t pts, dts; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
237 int64_t last_sync= url_ftell(s->pb); |
0 | 238 |
1664
5e7460a2f209
seperate redo (we dont handle this possibly valid packet) from
michael
parents:
1443
diff
changeset
|
239 error_redo: |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
240 url_fseek(s->pb, last_sync, SEEK_SET); |
0 | 241 redo: |
310 | 242 /* next start code (should be immediately after) */ |
243 m->header_state = 0xff; | |
244 size = MAX_SYNC_SIZE; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
245 startcode = find_next_start_code(s->pb, &size, &m->header_state); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
246 last_sync = url_ftell(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
247 //printf("startcode=%x pos=0x%"PRIx64"\n", startcode, url_ftell(s->pb)); |
0 | 248 if (startcode < 0) |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2177
diff
changeset
|
249 return AVERROR(EIO); |
0 | 250 if (startcode == PACK_START_CODE) |
251 goto redo; | |
252 if (startcode == SYSTEM_HEADER_START_CODE) | |
253 goto redo; | |
2728 | 254 if (startcode == PADDING_STREAM) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
255 url_fskip(s->pb, get_be16(s->pb)); |
2728 | 256 goto redo; |
257 } | |
258 if (startcode == PRIVATE_STREAM_2) { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
259 len = get_be16(s->pb); |
2728 | 260 if (!m->sofdec) { |
261 while (len-- >= 6) { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
262 if (get_byte(s->pb) == 'S') { |
2728 | 263 uint8_t buf[5]; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
264 get_buffer(s->pb, buf, sizeof(buf)); |
2728 | 265 m->sofdec = !memcmp(buf, "ofdec", 5); |
266 len -= sizeof(buf); | |
267 break; | |
268 } | |
269 } | |
270 m->sofdec -= !m->sofdec; | |
271 } | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
272 url_fskip(s->pb, len); |
0 | 273 goto redo; |
274 } | |
722 | 275 if (startcode == PROGRAM_STREAM_MAP) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
276 mpegps_psm_parse(m, s->pb); |
722 | 277 goto redo; |
278 } | |
885 | 279 |
0 | 280 /* find matching stream */ |
281 if (!((startcode >= 0x1c0 && startcode <= 0x1df) || | |
282 (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
|
283 (startcode == 0x1bd) || (startcode == 0x1fd))) |
0 | 284 goto redo; |
310 | 285 if (ppos) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
286 *ppos = url_ftell(s->pb) - 4; |
310 | 287 } |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
288 len = get_be16(s->pb); |
1666 | 289 pts = |
0 | 290 dts = AV_NOPTS_VALUE; |
291 /* stuffing */ | |
292 for(;;) { | |
310 | 293 if (len < 1) |
1664
5e7460a2f209
seperate redo (we dont handle this possibly valid packet) from
michael
parents:
1443
diff
changeset
|
294 goto error_redo; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
295 c = get_byte(s->pb); |
0 | 296 len--; |
297 /* XXX: for mpeg1, should test only bit 7 */ | |
885 | 298 if (c != 0xff) |
0 | 299 break; |
300 } | |
301 if ((c & 0xc0) == 0x40) { | |
302 /* buffer scale & size */ | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
303 get_byte(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
304 c = get_byte(s->pb); |
0 | 305 len -= 2; |
306 } | |
1667 | 307 if ((c & 0xe0) == 0x20) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
308 dts = pts = get_pts(s->pb, c); |
0 | 309 len -= 4; |
1667 | 310 if (c & 0x10){ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
311 dts = get_pts(s->pb, -1); |
1667 | 312 len -= 5; |
313 } | |
0 | 314 } else if ((c & 0xc0) == 0x80) { |
315 /* mpeg 2 PES */ | |
1126 | 316 #if 0 /* some streams have this field set for no apparent reason */ |
0 | 317 if ((c & 0x30) != 0) { |
310 | 318 /* Encrypted multiplex not handled */ |
319 goto redo; | |
0 | 320 } |
1126 | 321 #endif |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
322 flags = get_byte(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
323 header_len = get_byte(s->pb); |
0 | 324 len -= 2; |
325 if (header_len > len) | |
1664
5e7460a2f209
seperate redo (we dont handle this possibly valid packet) from
michael
parents:
1443
diff
changeset
|
326 goto error_redo; |
1668 | 327 len -= header_len; |
1667 | 328 if (flags & 0x80) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
329 dts = pts = get_pts(s->pb, -1); |
0 | 330 header_len -= 5; |
1667 | 331 if (flags & 0x40) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
332 dts = get_pts(s->pb, -1); |
1667 | 333 header_len -= 5; |
334 } | |
0 | 335 } |
3109
20e070d8706f
Ignore flags after pts/dts if there are no bytes left.
michael
parents:
2934
diff
changeset
|
336 if (flags & 0x3f && header_len == 0){ |
20e070d8706f
Ignore flags after pts/dts if there are no bytes left.
michael
parents:
2934
diff
changeset
|
337 flags &= 0xC0; |
20e070d8706f
Ignore flags after pts/dts if there are no bytes left.
michael
parents:
2934
diff
changeset
|
338 av_log(s, AV_LOG_WARNING, "Further flags set but no bytes left\n"); |
20e070d8706f
Ignore flags after pts/dts if there are no bytes left.
michael
parents:
2934
diff
changeset
|
339 } |
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
|
340 if (flags & 0x01) { /* PES extension */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
341 pes_ext = get_byte(s->pb); |
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
|
342 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
|
343 /* 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
|
344 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
|
345 skip += skip & 0x9; |
3270 | 346 if (pes_ext & 0x40 || skip > header_len){ |
347 av_log(s, AV_LOG_WARNING, "pes_ext %X is invalid\n", pes_ext); | |
348 pes_ext=skip=0; | |
349 } | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
350 url_fskip(s->pb, 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
|
351 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
|
352 |
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
|
353 if (pes_ext & 0x01) { /* PES extension 2 */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
354 ext2_len = get_byte(s->pb); |
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
|
355 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
|
356 if ((ext2_len & 0x7f) > 0) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
357 id_ext = get_byte(s->pb); |
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
|
358 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
|
359 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
|
360 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
|
361 } |
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
|
362 } |
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
|
363 } |
1668 | 364 if(header_len < 0) |
365 goto error_redo; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
366 url_fskip(s->pb, header_len); |
0 | 367 } |
447
94aa265c18b9
Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents:
437
diff
changeset
|
368 else if( c!= 0xf ) |
94aa265c18b9
Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents:
437
diff
changeset
|
369 goto redo; |
94aa265c18b9
Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents:
437
diff
changeset
|
370 |
722 | 371 if (startcode == PRIVATE_STREAM_1 && !m->psm_es_type[startcode & 0xff]) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
372 startcode = get_byte(s->pb); |
0 | 373 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
|
374 if (startcode >= 0x80 && startcode <= 0xcf) { |
0 | 375 /* audio: skip header */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
376 get_byte(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
377 get_byte(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
378 get_byte(s->pb); |
0 | 379 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
|
380 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
|
381 /* MLP/TrueHD audio has a 4-byte header */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
382 get_byte(s->pb); |
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
|
383 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
|
384 } |
0 | 385 } |
386 } | |
1665 | 387 if(len<0) |
388 goto error_redo; | |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
337
diff
changeset
|
389 if(dts != AV_NOPTS_VALUE && ppos){ |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
337
diff
changeset
|
390 int i; |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
337
diff
changeset
|
391 for(i=0; i<s->nb_streams; i++){ |
2934 | 392 if(startcode == s->streams[i]->id && |
393 !url_is_streamed(s->pb) /* index useless on streams anyway */) { | |
2932
f5de41d943e2
user specifyable maximum amount of memory to use for the index.
michael
parents:
2906
diff
changeset
|
394 ff_reduce_index(s, i); |
979 | 395 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
|
396 } |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
337
diff
changeset
|
397 } |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
337
diff
changeset
|
398 } |
885 | 399 |
310 | 400 *pstart_code = startcode; |
401 *ppts = pts; | |
402 *pdts = dts; | |
403 return len; | |
404 } | |
405 | |
406 static int mpegps_read_packet(AVFormatContext *s, | |
407 AVPacket *pkt) | |
408 { | |
722 | 409 MpegDemuxContext *m = s->priv_data; |
310 | 410 AVStream *st; |
3967 | 411 int len, startcode, i, es_type; |
412 enum CodecID codec_id = CODEC_ID_NONE; | |
413 enum CodecType type; | |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
337
diff
changeset
|
414 int64_t pts, dts, dummy_pos; //dummy_pos is needed for the index building to work |
4648
30513a35c94d
Mark dvdaudio_substream_type variable as av_uninit to work around false
diego
parents:
4450
diff
changeset
|
415 uint8_t av_uninit(dvdaudio_substream_type); |
310 | 416 |
417 redo: | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
396
diff
changeset
|
418 len = mpegps_read_pes_header(s, &dummy_pos, &startcode, &pts, &dts); |
310 | 419 if (len < 0) |
420 return len; | |
885 | 421 |
4450
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
422 if(startcode == 0x1bd) { |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
423 dvdaudio_substream_type = get_byte(s->pb); |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
424 url_fskip(s->pb, 3); |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
425 len -= 4; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
426 } |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
427 |
0 | 428 /* now find stream */ |
429 for(i=0;i<s->nb_streams;i++) { | |
430 st = s->streams[i]; | |
431 if (st->id == startcode) | |
432 goto found; | |
433 } | |
722 | 434 |
435 es_type = m->psm_es_type[startcode & 0xff]; | |
4450
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
436 if(es_type > 0 && es_type != STREAM_TYPE_PRIVATE_DATA){ |
722 | 437 if(es_type == STREAM_TYPE_VIDEO_MPEG1){ |
438 codec_id = CODEC_ID_MPEG2VIDEO; | |
439 type = CODEC_TYPE_VIDEO; | |
440 } else if(es_type == STREAM_TYPE_VIDEO_MPEG2){ | |
441 codec_id = CODEC_ID_MPEG2VIDEO; | |
442 type = CODEC_TYPE_VIDEO; | |
443 } else if(es_type == STREAM_TYPE_AUDIO_MPEG1 || | |
444 es_type == STREAM_TYPE_AUDIO_MPEG2){ | |
445 codec_id = CODEC_ID_MP3; | |
446 type = CODEC_TYPE_AUDIO; | |
447 } else if(es_type == STREAM_TYPE_AUDIO_AAC){ | |
448 codec_id = CODEC_ID_AAC; | |
449 type = CODEC_TYPE_AUDIO; | |
450 } else if(es_type == STREAM_TYPE_VIDEO_MPEG4){ | |
451 codec_id = CODEC_ID_MPEG4; | |
452 type = CODEC_TYPE_VIDEO; | |
453 } else if(es_type == STREAM_TYPE_VIDEO_H264){ | |
454 codec_id = CODEC_ID_H264; | |
455 type = CODEC_TYPE_VIDEO; | |
456 } else if(es_type == STREAM_TYPE_AUDIO_AC3){ | |
457 codec_id = CODEC_ID_AC3; | |
458 type = CODEC_TYPE_AUDIO; | |
459 } else { | |
460 goto skip; | |
461 } | |
462 } else if (startcode >= 0x1e0 && startcode <= 0x1ef) { | |
1146 | 463 static const unsigned char avs_seqh[4] = { 0, 0, 1, 0xb0 }; |
464 unsigned char buf[8]; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
465 get_buffer(s->pb, buf, 8); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
466 url_fseek(s->pb, -8, SEEK_CUR); |
1146 | 467 if(!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1)) |
468 codec_id = CODEC_ID_CAVS; | |
469 else | |
3576
270e9f324405
Use CODEC_ID_PROBE when the mpeg-ps demuxer does not know exactly which
michael
parents:
3484
diff
changeset
|
470 codec_id = CODEC_ID_PROBE; |
0 | 471 type = CODEC_TYPE_VIDEO; |
472 } else if (startcode >= 0x1c0 && startcode <= 0x1df) { | |
473 type = CODEC_TYPE_AUDIO; | |
2728 | 474 codec_id = m->sofdec > 0 ? CODEC_ID_ADPCM_ADX : CODEC_ID_MP2; |
767
cbfea73709bd
fix ac3 and dts detection (patch by Joakim Plate <joakim.plate at ecce.se>)
mru
parents:
722
diff
changeset
|
475 } else if (startcode >= 0x80 && startcode <= 0x87) { |
0 | 476 type = CODEC_TYPE_AUDIO; |
477 codec_id = CODEC_ID_AC3; | |
3779 | 478 } else if ( ( startcode >= 0x88 && startcode <= 0x8f) |
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
|
479 ||( 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
|
480 /* 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
|
481 type = CODEC_TYPE_AUDIO; |
112057e05179
libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents:
483
diff
changeset
|
482 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
|
483 } else if (startcode >= 0xa0 && startcode <= 0xaf) { |
41 | 484 type = CODEC_TYPE_AUDIO; |
3305
129d36178a10
support dvd pcm 20/24 bits, patch by Lars T¸«£uber, lars.taeuber gmx net
bcoudurier
parents:
3270
diff
changeset
|
485 /* 16 bit form will be handled as CODEC_ID_PCM_S16BE */ |
129d36178a10
support dvd pcm 20/24 bits, patch by Lars T¸«£uber, lars.taeuber gmx net
bcoudurier
parents:
3270
diff
changeset
|
486 codec_id = CODEC_ID_PCM_DVD; |
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
|
487 } 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
|
488 type = CODEC_TYPE_AUDIO; |
4750 | 489 codec_id = CODEC_ID_TRUEHD; |
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
|
490 } 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
|
491 /* 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
|
492 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
|
493 codec_id = CODEC_ID_AC3; |
783
2e8b5a7d7e02
DVD subtitle parsing - show mpeg component IDs by default
bellard
parents:
767
diff
changeset
|
494 } else if (startcode >= 0x20 && startcode <= 0x3f) { |
2e8b5a7d7e02
DVD subtitle parsing - show mpeg component IDs by default
bellard
parents:
767
diff
changeset
|
495 type = CODEC_TYPE_SUBTITLE; |
2e8b5a7d7e02
DVD subtitle parsing - show mpeg component IDs by default
bellard
parents:
767
diff
changeset
|
496 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
|
497 } 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
|
498 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
|
499 codec_id = CODEC_ID_VC1; |
4450
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
500 } else if (startcode == 0x1bd) { |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
501 // check dvd audio substream type |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
502 type = CODEC_TYPE_AUDIO; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
503 switch(dvdaudio_substream_type & 0xe0) { |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
504 case 0xa0: codec_id = CODEC_ID_PCM_DVD; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
505 break; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
506 case 0x80: if((dvdaudio_substream_type & 0xf8) == 0x88) |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
507 codec_id = CODEC_ID_DTS; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
508 else codec_id = CODEC_ID_AC3; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
509 break; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
510 default: av_log(s, AV_LOG_ERROR, "Unknown 0x1bd sub-stream\n"); |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
511 goto skip; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
512 } |
0 | 513 } else { |
514 skip: | |
515 /* skip packet */ | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
516 url_fskip(s->pb, len); |
0 | 517 goto redo; |
518 } | |
519 /* no stream found: add a new stream */ | |
520 st = av_new_stream(s, startcode); | |
885 | 521 if (!st) |
0 | 522 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
|
523 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
|
524 st->codec->codec_id = codec_id; |
310 | 525 if (codec_id != CODEC_ID_PCM_S16BE) |
2023 | 526 st->need_parsing = AVSTREAM_PARSE_FULL; |
0 | 527 found: |
708 | 528 if(st->discard >= AVDISCARD_ALL) |
652 | 529 goto skip; |
4450
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
530 if ((startcode >= 0xa0 && startcode <= 0xaf) || |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
531 (startcode == 0x1bd && ((dvdaudio_substream_type & 0xe0) == 0xa0))) { |
41 | 532 int b1, freq; |
533 | |
534 /* for LPCM, we just skip the header and consider it is raw | |
535 audio data */ | |
536 if (len <= 3) | |
537 goto skip; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
538 get_byte(s->pb); /* emphasis (1), muse(1), reserved(1), frame number(5) */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
539 b1 = get_byte(s->pb); /* quant (2), freq(2), reserved(1), channels(3) */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
540 get_byte(s->pb); /* dynamic range control (0x80 = off) */ |
41 | 541 len -= 3; |
542 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
|
543 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
|
544 st->codec->channels = 1 + (b1 & 7); |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3779
diff
changeset
|
545 st->codec->bits_per_coded_sample = 16 + ((b1 >> 6) & 3) * 4; |
3305
129d36178a10
support dvd pcm 20/24 bits, patch by Lars T¸«£uber, lars.taeuber gmx net
bcoudurier
parents:
3270
diff
changeset
|
546 st->codec->bit_rate = st->codec->channels * |
129d36178a10
support dvd pcm 20/24 bits, patch by Lars T¸«£uber, lars.taeuber gmx net
bcoudurier
parents:
3270
diff
changeset
|
547 st->codec->sample_rate * |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3779
diff
changeset
|
548 st->codec->bits_per_coded_sample; |
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3779
diff
changeset
|
549 if (st->codec->bits_per_coded_sample == 16) |
3305
129d36178a10
support dvd pcm 20/24 bits, patch by Lars T¸«£uber, lars.taeuber gmx net
bcoudurier
parents:
3270
diff
changeset
|
550 st->codec->codec_id = CODEC_ID_PCM_S16BE; |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3779
diff
changeset
|
551 else if (st->codec->bits_per_coded_sample == 28) |
3305
129d36178a10
support dvd pcm 20/24 bits, patch by Lars T¸«£uber, lars.taeuber gmx net
bcoudurier
parents:
3270
diff
changeset
|
552 return AVERROR(EINVAL); |
41 | 553 } |
0 | 554 av_new_packet(pkt, len); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
555 get_buffer(s->pb, pkt->data, pkt->size); |
0 | 556 pkt->pts = pts; |
310 | 557 pkt->dts = dts; |
0 | 558 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
|
559 #if 0 |
652 | 560 av_log(s, AV_LOG_DEBUG, "%d: pts=%0.3f dts=%0.3f size=%d\n", |
561 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
|
562 #endif |
482 | 563 |
0 | 564 return 0; |
565 } | |
566 | |
885 | 567 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
|
568 int64_t *ppos, int64_t pos_limit) |
310 | 569 { |
570 int len, startcode; | |
571 int64_t pos, pts, dts; | |
572 | |
573 pos = *ppos; | |
574 #ifdef DEBUG_SEEK | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
575 printf("read_dts: pos=0x%"PRIx64" next=%d -> ", pos, find_next); |
310 | 576 #endif |
3398
3fbe87561b73
Check return of url_fseek in mpeg timestamp reading code.
benoit
parents:
3305
diff
changeset
|
577 if (url_fseek(s->pb, pos, SEEK_SET) < 0) |
3fbe87561b73
Check return of url_fseek in mpeg timestamp reading code.
benoit
parents:
3305
diff
changeset
|
578 return AV_NOPTS_VALUE; |
3fbe87561b73
Check return of url_fseek in mpeg timestamp reading code.
benoit
parents:
3305
diff
changeset
|
579 |
310 | 580 for(;;) { |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
396
diff
changeset
|
581 len = mpegps_read_pes_header(s, &pos, &startcode, &pts, &dts); |
310 | 582 if (len < 0) { |
583 #ifdef DEBUG_SEEK | |
584 printf("none (ret=%d)\n", len); | |
585 #endif | |
586 return AV_NOPTS_VALUE; | |
587 } | |
885 | 588 if (startcode == s->streams[stream_index]->id && |
310 | 589 dts != AV_NOPTS_VALUE) { |
590 break; | |
591 } | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
592 url_fskip(s->pb, len); |
310 | 593 } |
594 #ifdef DEBUG_SEEK | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
595 printf("pos=0x%"PRIx64" dts=0x%"PRIx64" %0.3f\n", pos, dts, dts / 90000.0); |
310 | 596 #endif |
597 *ppos = pos; | |
463
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
452
diff
changeset
|
598 return dts; |
310 | 599 } |
600 | |
1167 | 601 AVInputFormat mpegps_demuxer = { |
0 | 602 "mpeg", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3398
diff
changeset
|
603 NULL_IF_CONFIG_SMALL("MPEG-PS format"), |
0 | 604 sizeof(MpegDemuxContext), |
605 mpegps_probe, | |
606 mpegps_read_header, | |
607 mpegps_read_packet, | |
3484 | 608 NULL, |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
396
diff
changeset
|
609 NULL, //mpegps_read_seek, |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
396
diff
changeset
|
610 mpegps_read_dts, |
3724
178cc6f9d5ec
Add flag to mark demuxers that can output discontinuous timestamps.
michael
parents:
3576
diff
changeset
|
611 .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT, |
0 | 612 }; |