Mercurial > libavformat.hg
annotate mpeg.c @ 5792:2fb291f12e5f libavformat
Fix encoder metadata string langcode in mov muxer
author | bcoudurier |
---|---|
date | Tue, 09 Mar 2010 01:53:16 +0000 |
parents | 747753995dee |
children | 536e5527c1e0 |
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 | |
5423
beac179b6765
Also print the number of invalid packets in the debug output.
michael
parents:
5422
diff
changeset
|
79 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, invalid, 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 |
5422
3e5fefc4b475
Flip the comparission direction of vid+audio+priv1 and pspack, it appears to have
michael
parents:
5321
diff
changeset
|
82 if(pspack > invalid && (priv1+vid+audio)*10 >= pspack*9) |
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 |
5321
a4a45f236eec
Improve sofdec dectection to avoid false positives for MP2.
cehoyos
parents:
5190
diff
changeset
|
116 m->sofdec = (m->sofdec == 6) ? 1 : 0; |
a4a45f236eec
Improve sofdec dectection to avoid false positives for MP2.
cehoyos
parents:
5190
diff
changeset
|
117 |
310 | 118 /* no need to do more */ |
119 return 0; | |
120 } | |
121 | |
122 static int64_t get_pts(ByteIOContext *pb, int c) | |
123 { | |
2906
e5dfe3c96f3b
Move parsing of MPEG-PES timestamp to mpeg.h (as an inline function) so it
ivo
parents:
2886
diff
changeset
|
124 uint8_t buf[5]; |
310 | 125 |
2906
e5dfe3c96f3b
Move parsing of MPEG-PES timestamp to mpeg.h (as an inline function) so it
ivo
parents:
2886
diff
changeset
|
126 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
|
127 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
|
128 |
e5dfe3c96f3b
Move parsing of MPEG-PES timestamp to mpeg.h (as an inline function) so it
ivo
parents:
2886
diff
changeset
|
129 return ff_parse_pes_pts(buf); |
310 | 130 } |
131 | |
885 | 132 static int find_next_start_code(ByteIOContext *pb, int *size_ptr, |
1332 | 133 int32_t *header_state) |
0 | 134 { |
135 unsigned int state, v; | |
136 int val, n; | |
137 | |
138 state = *header_state; | |
139 n = *size_ptr; | |
140 while (n > 0) { | |
141 if (url_feof(pb)) | |
142 break; | |
143 v = get_byte(pb); | |
144 n--; | |
145 if (state == 0x000001) { | |
146 state = ((state << 8) | v) & 0xffffff; | |
147 val = state; | |
148 goto found; | |
149 } | |
150 state = ((state << 8) | v) & 0xffffff; | |
151 } | |
152 val = -1; | |
153 found: | |
154 *header_state = state; | |
155 *size_ptr = n; | |
156 return val; | |
157 } | |
158 | |
683
095009fc2f35
kill warnings patch by (M¸«©ns Rullg¸«©rd <mru inprovide com>)
michael
parents:
674
diff
changeset
|
159 #if 0 /* unused, remove? */ |
310 | 160 /* XXX: optimize */ |
161 static int find_prev_start_code(ByteIOContext *pb, int *size_ptr) | |
0 | 162 { |
310 | 163 int64_t pos, pos_start; |
164 int max_size, start_code; | |
165 | |
166 max_size = *size_ptr; | |
167 pos_start = url_ftell(pb); | |
168 | |
169 /* in order to go faster, we fill the buffer */ | |
170 pos = pos_start - 16386; | |
171 if (pos < 0) | |
172 pos = 0; | |
173 url_fseek(pb, pos, SEEK_SET); | |
174 get_byte(pb); | |
293
62cec412a186
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents:
291
diff
changeset
|
175 |
310 | 176 pos = pos_start; |
177 for(;;) { | |
178 pos--; | |
179 if (pos < 0 || (pos_start - pos) >= max_size) { | |
180 start_code = -1; | |
181 goto the_end; | |
182 } | |
183 url_fseek(pb, pos, SEEK_SET); | |
184 start_code = get_be32(pb); | |
185 if ((start_code & 0xffffff00) == 0x100) | |
186 break; | |
187 } | |
188 the_end: | |
189 *size_ptr = pos_start - pos; | |
190 return start_code; | |
0 | 191 } |
683
095009fc2f35
kill warnings patch by (M¸«©ns Rullg¸«©rd <mru inprovide com>)
michael
parents:
674
diff
changeset
|
192 #endif |
0 | 193 |
722 | 194 /** |
195 * Extracts stream types from a program stream map | |
196 * According to ISO/IEC 13818-1 ('MPEG-2 Systems') table 2-35 | |
885 | 197 * |
722 | 198 * @return number of bytes occupied by PSM in the bitstream |
199 */ | |
200 static long mpegps_psm_parse(MpegDemuxContext *m, ByteIOContext *pb) | |
201 { | |
202 int psm_length, ps_info_length, es_map_length; | |
203 | |
204 psm_length = get_be16(pb); | |
205 get_byte(pb); | |
206 get_byte(pb); | |
207 ps_info_length = get_be16(pb); | |
208 | |
209 /* skip program_stream_info */ | |
210 url_fskip(pb, ps_info_length); | |
211 es_map_length = get_be16(pb); | |
212 | |
213 /* at least one es available? */ | |
214 while (es_map_length >= 4){ | |
3779 | 215 unsigned char type = get_byte(pb); |
216 unsigned char es_id = get_byte(pb); | |
722 | 217 uint16_t es_info_length = get_be16(pb); |
218 /* remember mapping from stream id to stream type */ | |
219 m->psm_es_type[es_id] = type; | |
220 /* skip program_stream_info */ | |
221 url_fskip(pb, es_info_length); | |
222 es_map_length -= 4 + es_info_length; | |
223 } | |
224 get_be32(pb); /* crc32 */ | |
225 return 2 + psm_length; | |
226 } | |
227 | |
885 | 228 /* read the next PES header. Return its position in ppos |
310 | 229 (if not NULL), and its start code, pts and dts. |
230 */ | |
231 static int mpegps_read_pes_header(AVFormatContext *s, | |
885 | 232 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
|
233 int64_t *ppts, int64_t *pdts) |
0 | 234 { |
235 MpegDemuxContext *m = s->priv_data; | |
310 | 236 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
|
237 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
|
238 int64_t pts, dts; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
239 int64_t last_sync= url_ftell(s->pb); |
0 | 240 |
1664
5e7460a2f209
seperate redo (we dont handle this possibly valid packet) from
michael
parents:
1443
diff
changeset
|
241 error_redo: |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
242 url_fseek(s->pb, last_sync, SEEK_SET); |
0 | 243 redo: |
310 | 244 /* next start code (should be immediately after) */ |
245 m->header_state = 0xff; | |
246 size = MAX_SYNC_SIZE; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
247 startcode = find_next_start_code(s->pb, &size, &m->header_state); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
248 last_sync = url_ftell(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
249 //printf("startcode=%x pos=0x%"PRIx64"\n", startcode, url_ftell(s->pb)); |
5642
747753995dee
Dont give up after 100kb of zero bytes but returnd EAGAIN
michael
parents:
5621
diff
changeset
|
250 if (startcode < 0){ |
747753995dee
Dont give up after 100kb of zero bytes but returnd EAGAIN
michael
parents:
5621
diff
changeset
|
251 if(url_feof(s->pb)) |
747753995dee
Dont give up after 100kb of zero bytes but returnd EAGAIN
michael
parents:
5621
diff
changeset
|
252 return AVERROR_EOF; |
747753995dee
Dont give up after 100kb of zero bytes but returnd EAGAIN
michael
parents:
5621
diff
changeset
|
253 //FIXME we should remember header_state |
747753995dee
Dont give up after 100kb of zero bytes but returnd EAGAIN
michael
parents:
5621
diff
changeset
|
254 return AVERROR(EAGAIN); |
747753995dee
Dont give up after 100kb of zero bytes but returnd EAGAIN
michael
parents:
5621
diff
changeset
|
255 } |
747753995dee
Dont give up after 100kb of zero bytes but returnd EAGAIN
michael
parents:
5621
diff
changeset
|
256 |
0 | 257 if (startcode == PACK_START_CODE) |
258 goto redo; | |
259 if (startcode == SYSTEM_HEADER_START_CODE) | |
260 goto redo; | |
2728 | 261 if (startcode == PADDING_STREAM) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
262 url_fskip(s->pb, get_be16(s->pb)); |
2728 | 263 goto redo; |
264 } | |
265 if (startcode == PRIVATE_STREAM_2) { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
266 len = get_be16(s->pb); |
2728 | 267 if (!m->sofdec) { |
268 while (len-- >= 6) { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
269 if (get_byte(s->pb) == 'S') { |
2728 | 270 uint8_t buf[5]; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
271 get_buffer(s->pb, buf, sizeof(buf)); |
2728 | 272 m->sofdec = !memcmp(buf, "ofdec", 5); |
273 len -= sizeof(buf); | |
274 break; | |
275 } | |
276 } | |
277 m->sofdec -= !m->sofdec; | |
278 } | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
279 url_fskip(s->pb, len); |
0 | 280 goto redo; |
281 } | |
722 | 282 if (startcode == PROGRAM_STREAM_MAP) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
283 mpegps_psm_parse(m, s->pb); |
722 | 284 goto redo; |
285 } | |
885 | 286 |
0 | 287 /* find matching stream */ |
288 if (!((startcode >= 0x1c0 && startcode <= 0x1df) || | |
289 (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
|
290 (startcode == 0x1bd) || (startcode == 0x1fd))) |
0 | 291 goto redo; |
310 | 292 if (ppos) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
293 *ppos = url_ftell(s->pb) - 4; |
310 | 294 } |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
295 len = get_be16(s->pb); |
1666 | 296 pts = |
0 | 297 dts = AV_NOPTS_VALUE; |
298 /* stuffing */ | |
299 for(;;) { | |
310 | 300 if (len < 1) |
1664
5e7460a2f209
seperate redo (we dont handle this possibly valid packet) from
michael
parents:
1443
diff
changeset
|
301 goto error_redo; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
302 c = get_byte(s->pb); |
0 | 303 len--; |
304 /* XXX: for mpeg1, should test only bit 7 */ | |
885 | 305 if (c != 0xff) |
0 | 306 break; |
307 } | |
308 if ((c & 0xc0) == 0x40) { | |
309 /* buffer scale & size */ | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
310 get_byte(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
311 c = get_byte(s->pb); |
0 | 312 len -= 2; |
313 } | |
1667 | 314 if ((c & 0xe0) == 0x20) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
315 dts = pts = get_pts(s->pb, c); |
0 | 316 len -= 4; |
1667 | 317 if (c & 0x10){ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
318 dts = get_pts(s->pb, -1); |
1667 | 319 len -= 5; |
320 } | |
0 | 321 } else if ((c & 0xc0) == 0x80) { |
322 /* mpeg 2 PES */ | |
1126 | 323 #if 0 /* some streams have this field set for no apparent reason */ |
0 | 324 if ((c & 0x30) != 0) { |
310 | 325 /* Encrypted multiplex not handled */ |
326 goto redo; | |
0 | 327 } |
1126 | 328 #endif |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
329 flags = get_byte(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
330 header_len = get_byte(s->pb); |
0 | 331 len -= 2; |
332 if (header_len > len) | |
1664
5e7460a2f209
seperate redo (we dont handle this possibly valid packet) from
michael
parents:
1443
diff
changeset
|
333 goto error_redo; |
1668 | 334 len -= header_len; |
1667 | 335 if (flags & 0x80) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
336 dts = pts = get_pts(s->pb, -1); |
0 | 337 header_len -= 5; |
1667 | 338 if (flags & 0x40) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
339 dts = get_pts(s->pb, -1); |
1667 | 340 header_len -= 5; |
341 } | |
0 | 342 } |
3109
20e070d8706f
Ignore flags after pts/dts if there are no bytes left.
michael
parents:
2934
diff
changeset
|
343 if (flags & 0x3f && header_len == 0){ |
20e070d8706f
Ignore flags after pts/dts if there are no bytes left.
michael
parents:
2934
diff
changeset
|
344 flags &= 0xC0; |
20e070d8706f
Ignore flags after pts/dts if there are no bytes left.
michael
parents:
2934
diff
changeset
|
345 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
|
346 } |
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 (flags & 0x01) { /* PES extension */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
348 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
|
349 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
|
350 /* 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
|
351 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
|
352 skip += skip & 0x9; |
3270 | 353 if (pes_ext & 0x40 || skip > header_len){ |
354 av_log(s, AV_LOG_WARNING, "pes_ext %X is invalid\n", pes_ext); | |
355 pes_ext=skip=0; | |
356 } | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
357 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
|
358 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
|
359 |
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 if (pes_ext & 0x01) { /* PES extension 2 */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
361 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
|
362 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
|
363 if ((ext2_len & 0x7f) > 0) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
364 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
|
365 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
|
366 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
|
367 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
|
368 } |
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
|
369 } |
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
|
370 } |
1668 | 371 if(header_len < 0) |
372 goto error_redo; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
373 url_fskip(s->pb, header_len); |
0 | 374 } |
447
94aa265c18b9
Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents:
437
diff
changeset
|
375 else if( c!= 0xf ) |
94aa265c18b9
Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents:
437
diff
changeset
|
376 goto redo; |
94aa265c18b9
Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents:
437
diff
changeset
|
377 |
722 | 378 if (startcode == PRIVATE_STREAM_1 && !m->psm_es_type[startcode & 0xff]) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
379 startcode = get_byte(s->pb); |
0 | 380 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
|
381 if (startcode >= 0x80 && startcode <= 0xcf) { |
0 | 382 /* audio: skip header */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
383 get_byte(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
384 get_byte(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
385 get_byte(s->pb); |
0 | 386 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
|
387 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
|
388 /* MLP/TrueHD audio has a 4-byte header */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
389 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
|
390 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
|
391 } |
0 | 392 } |
393 } | |
1665 | 394 if(len<0) |
395 goto error_redo; | |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
337
diff
changeset
|
396 if(dts != AV_NOPTS_VALUE && ppos){ |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
337
diff
changeset
|
397 int i; |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
337
diff
changeset
|
398 for(i=0; i<s->nb_streams; i++){ |
2934 | 399 if(startcode == s->streams[i]->id && |
400 !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
|
401 ff_reduce_index(s, i); |
979 | 402 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
|
403 } |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
337
diff
changeset
|
404 } |
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
337
diff
changeset
|
405 } |
885 | 406 |
310 | 407 *pstart_code = startcode; |
408 *ppts = pts; | |
409 *pdts = dts; | |
410 return len; | |
411 } | |
412 | |
413 static int mpegps_read_packet(AVFormatContext *s, | |
414 AVPacket *pkt) | |
415 { | |
722 | 416 MpegDemuxContext *m = s->priv_data; |
310 | 417 AVStream *st; |
3967 | 418 int len, startcode, i, es_type; |
419 enum CodecID codec_id = CODEC_ID_NONE; | |
420 enum CodecType type; | |
346
e154eb1b7149
caching of timestamps for mpeg-ps so seeking is faster
michael
parents:
337
diff
changeset
|
421 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
|
422 uint8_t av_uninit(dvdaudio_substream_type); |
310 | 423 |
424 redo: | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
396
diff
changeset
|
425 len = mpegps_read_pes_header(s, &dummy_pos, &startcode, &pts, &dts); |
310 | 426 if (len < 0) |
427 return len; | |
885 | 428 |
4450
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
429 if(startcode == 0x1bd) { |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
430 dvdaudio_substream_type = get_byte(s->pb); |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
431 url_fskip(s->pb, 3); |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
432 len -= 4; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
433 } |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
434 |
0 | 435 /* now find stream */ |
436 for(i=0;i<s->nb_streams;i++) { | |
437 st = s->streams[i]; | |
438 if (st->id == startcode) | |
439 goto found; | |
440 } | |
722 | 441 |
442 es_type = m->psm_es_type[startcode & 0xff]; | |
4450
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
443 if(es_type > 0 && es_type != STREAM_TYPE_PRIVATE_DATA){ |
722 | 444 if(es_type == STREAM_TYPE_VIDEO_MPEG1){ |
445 codec_id = CODEC_ID_MPEG2VIDEO; | |
446 type = CODEC_TYPE_VIDEO; | |
447 } else if(es_type == STREAM_TYPE_VIDEO_MPEG2){ | |
448 codec_id = CODEC_ID_MPEG2VIDEO; | |
449 type = CODEC_TYPE_VIDEO; | |
450 } else if(es_type == STREAM_TYPE_AUDIO_MPEG1 || | |
451 es_type == STREAM_TYPE_AUDIO_MPEG2){ | |
452 codec_id = CODEC_ID_MP3; | |
453 type = CODEC_TYPE_AUDIO; | |
454 } else if(es_type == STREAM_TYPE_AUDIO_AAC){ | |
455 codec_id = CODEC_ID_AAC; | |
456 type = CODEC_TYPE_AUDIO; | |
457 } else if(es_type == STREAM_TYPE_VIDEO_MPEG4){ | |
458 codec_id = CODEC_ID_MPEG4; | |
459 type = CODEC_TYPE_VIDEO; | |
460 } else if(es_type == STREAM_TYPE_VIDEO_H264){ | |
461 codec_id = CODEC_ID_H264; | |
462 type = CODEC_TYPE_VIDEO; | |
463 } else if(es_type == STREAM_TYPE_AUDIO_AC3){ | |
464 codec_id = CODEC_ID_AC3; | |
465 type = CODEC_TYPE_AUDIO; | |
466 } else { | |
467 goto skip; | |
468 } | |
469 } else if (startcode >= 0x1e0 && startcode <= 0x1ef) { | |
1146 | 470 static const unsigned char avs_seqh[4] = { 0, 0, 1, 0xb0 }; |
471 unsigned char buf[8]; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
472 get_buffer(s->pb, buf, 8); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
473 url_fseek(s->pb, -8, SEEK_CUR); |
1146 | 474 if(!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1)) |
475 codec_id = CODEC_ID_CAVS; | |
476 else | |
3576
270e9f324405
Use CODEC_ID_PROBE when the mpeg-ps demuxer does not know exactly which
michael
parents:
3484
diff
changeset
|
477 codec_id = CODEC_ID_PROBE; |
0 | 478 type = CODEC_TYPE_VIDEO; |
479 } else if (startcode >= 0x1c0 && startcode <= 0x1df) { | |
480 type = CODEC_TYPE_AUDIO; | |
2728 | 481 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
|
482 } else if (startcode >= 0x80 && startcode <= 0x87) { |
0 | 483 type = CODEC_TYPE_AUDIO; |
484 codec_id = CODEC_ID_AC3; | |
3779 | 485 } 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
|
486 ||( 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
|
487 /* 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
|
488 type = CODEC_TYPE_AUDIO; |
112057e05179
libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents:
483
diff
changeset
|
489 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
|
490 } else if (startcode >= 0xa0 && startcode <= 0xaf) { |
41 | 491 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
|
492 /* 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
|
493 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
|
494 } 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
|
495 type = CODEC_TYPE_AUDIO; |
4750 | 496 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
|
497 } 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
|
498 /* 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
|
499 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
|
500 codec_id = CODEC_ID_AC3; |
783
2e8b5a7d7e02
DVD subtitle parsing - show mpeg component IDs by default
bellard
parents:
767
diff
changeset
|
501 } else if (startcode >= 0x20 && startcode <= 0x3f) { |
2e8b5a7d7e02
DVD subtitle parsing - show mpeg component IDs by default
bellard
parents:
767
diff
changeset
|
502 type = CODEC_TYPE_SUBTITLE; |
2e8b5a7d7e02
DVD subtitle parsing - show mpeg component IDs by default
bellard
parents:
767
diff
changeset
|
503 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
|
504 } 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
|
505 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
|
506 codec_id = CODEC_ID_VC1; |
4450
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
507 } else if (startcode == 0x1bd) { |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
508 // check dvd audio substream type |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
509 type = CODEC_TYPE_AUDIO; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
510 switch(dvdaudio_substream_type & 0xe0) { |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
511 case 0xa0: codec_id = CODEC_ID_PCM_DVD; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
512 break; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
513 case 0x80: if((dvdaudio_substream_type & 0xf8) == 0x88) |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
514 codec_id = CODEC_ID_DTS; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
515 else codec_id = CODEC_ID_AC3; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
516 break; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
517 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
|
518 goto skip; |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
519 } |
0 | 520 } else { |
521 skip: | |
522 /* skip packet */ | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
523 url_fskip(s->pb, len); |
0 | 524 goto redo; |
525 } | |
526 /* no stream found: add a new stream */ | |
527 st = av_new_stream(s, startcode); | |
885 | 528 if (!st) |
0 | 529 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
|
530 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
|
531 st->codec->codec_id = codec_id; |
310 | 532 if (codec_id != CODEC_ID_PCM_S16BE) |
2023 | 533 st->need_parsing = AVSTREAM_PARSE_FULL; |
0 | 534 found: |
708 | 535 if(st->discard >= AVDISCARD_ALL) |
652 | 536 goto skip; |
4450
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
537 if ((startcode >= 0xa0 && startcode <= 0xaf) || |
8f1038d1ee6d
Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents:
4424
diff
changeset
|
538 (startcode == 0x1bd && ((dvdaudio_substream_type & 0xe0) == 0xa0))) { |
41 | 539 int b1, freq; |
540 | |
541 /* for LPCM, we just skip the header and consider it is raw | |
542 audio data */ | |
543 if (len <= 3) | |
544 goto skip; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
545 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
|
546 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
|
547 get_byte(s->pb); /* dynamic range control (0x80 = off) */ |
41 | 548 len -= 3; |
549 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
|
550 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
|
551 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
|
552 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
|
553 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
|
554 st->codec->sample_rate * |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3779
diff
changeset
|
555 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
|
556 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
|
557 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
|
558 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
|
559 return AVERROR(EINVAL); |
41 | 560 } |
0 | 561 av_new_packet(pkt, len); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
562 get_buffer(s->pb, pkt->data, pkt->size); |
0 | 563 pkt->pts = pts; |
310 | 564 pkt->dts = dts; |
5621 | 565 pkt->pos = dummy_pos; |
0 | 566 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
|
567 #if 0 |
652 | 568 av_log(s, AV_LOG_DEBUG, "%d: pts=%0.3f dts=%0.3f size=%d\n", |
569 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
|
570 #endif |
482 | 571 |
0 | 572 return 0; |
573 } | |
574 | |
885 | 575 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
|
576 int64_t *ppos, int64_t pos_limit) |
310 | 577 { |
578 int len, startcode; | |
579 int64_t pos, pts, dts; | |
580 | |
581 pos = *ppos; | |
582 #ifdef DEBUG_SEEK | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
583 printf("read_dts: pos=0x%"PRIx64" next=%d -> ", pos, find_next); |
310 | 584 #endif |
3398
3fbe87561b73
Check return of url_fseek in mpeg timestamp reading code.
benoit
parents:
3305
diff
changeset
|
585 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
|
586 return AV_NOPTS_VALUE; |
3fbe87561b73
Check return of url_fseek in mpeg timestamp reading code.
benoit
parents:
3305
diff
changeset
|
587 |
310 | 588 for(;;) { |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
396
diff
changeset
|
589 len = mpegps_read_pes_header(s, &pos, &startcode, &pts, &dts); |
310 | 590 if (len < 0) { |
591 #ifdef DEBUG_SEEK | |
592 printf("none (ret=%d)\n", len); | |
593 #endif | |
594 return AV_NOPTS_VALUE; | |
595 } | |
885 | 596 if (startcode == s->streams[stream_index]->id && |
310 | 597 dts != AV_NOPTS_VALUE) { |
598 break; | |
599 } | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2728
diff
changeset
|
600 url_fskip(s->pb, len); |
310 | 601 } |
602 #ifdef DEBUG_SEEK | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
603 printf("pos=0x%"PRIx64" dts=0x%"PRIx64" %0.3f\n", pos, dts, dts / 90000.0); |
310 | 604 #endif |
605 *ppos = pos; | |
463
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
452
diff
changeset
|
606 return dts; |
310 | 607 } |
608 | |
1167 | 609 AVInputFormat mpegps_demuxer = { |
0 | 610 "mpeg", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3398
diff
changeset
|
611 NULL_IF_CONFIG_SMALL("MPEG-PS format"), |
0 | 612 sizeof(MpegDemuxContext), |
613 mpegps_probe, | |
614 mpegps_read_header, | |
615 mpegps_read_packet, | |
3484 | 616 NULL, |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
396
diff
changeset
|
617 NULL, //mpegps_read_seek, |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
396
diff
changeset
|
618 mpegps_read_dts, |
3724
178cc6f9d5ec
Add flag to mark demuxers that can output discontinuous timestamps.
michael
parents:
3576
diff
changeset
|
619 .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT, |
0 | 620 }; |