annotate mpeg.c @ 5422:3e5fefc4b475 libavformat

Flip the comparission direction of vid+audio+priv1 and pspack, it appears to have been wrong. Fixes issue1571.
author michael
date Tue, 08 Dec 2009 12:19:30 +0000
parents a4a45f236eec
children beac179b6765
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
2176
50322a49fa2b split mpeg ps and variants muxer and demuxer, I'll clean more in a few minutes, lpcm freq tab is left static const in mpeg.h for now until we have more code in common
bcoudurier
parents: 2164
diff changeset
2 * MPEG1/2 demuxer
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 885
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 */
2176
50322a49fa2b split mpeg ps and variants muxer and demuxer, I'll clean more in a few minutes, lpcm freq tab is left static const in mpeg.h for now until we have more code in common
bcoudurier
parents: 2164
diff changeset
21
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22 #include "avformat.h"
2176
50322a49fa2b split mpeg ps and variants muxer and demuxer, I'll clean more in a few minutes, lpcm freq tab is left static const in mpeg.h for now until we have more code in common
bcoudurier
parents: 2164
diff changeset
23 #include "mpeg.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
25 //#define DEBUG_SEEK
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
27 #undef NDEBUG
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
28 #include <assert.h>
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
29
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
30 /*********************************************/
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31 /* demux code */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
32
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 #define MAX_SYNC_SIZE 100000
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53 static int mpegps_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 {
936
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
55 uint32_t code= -1;
2799
3850229bba07 make mpeg-ps probe less happy with random data
michael
parents: 2771
diff changeset
56 int sys=0, pspack=0, priv1=0, vid=0, audio=0, invalid=0;
539
78a8cbdad269 64bit and reading over the end of the array fixes
michael
parents: 537
diff changeset
57 int i;
1257
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
58 int score=0;
49
3e7e13e08b27 avoid too many false detections
bellard
parents: 41
diff changeset
59
936
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
60 for(i=0; i<p->buf_size; i++){
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
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
michael
parents: 2697
diff changeset
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
4ea69956d2e8 vertical align
michael
parents: 3724
diff changeset
68 else if((code & 0xf0) == VIDEO_ID && pes) vid++;
4ea69956d2e8 vertical align
michael
parents: 3724
diff changeset
69 else if((code & 0xe0) == AUDIO_ID && pes) audio++;
2799
3850229bba07 make mpeg-ps probe less happy with random data
michael
parents: 2771
diff changeset
70
3850229bba07 make mpeg-ps probe less happy with random data
michael
parents: 2771
diff changeset
71 else if((code & 0xf0) == VIDEO_ID && !pes) invalid++;
3850229bba07 make mpeg-ps probe less happy with random data
michael
parents: 2771
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 }
1257
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
75
2799
3850229bba07 make mpeg-ps probe less happy with random data
michael
parents: 2771
diff changeset
76 if(vid+audio > invalid) /* invalid VDR files nd short PES streams */
1257
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
77 score= AVPROBE_SCORE_MAX/4;
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
78
2311
aac77d24706f //more debug info
michael
parents: 2274
diff changeset
79 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, p->buf_size);
2799
3850229bba07 make mpeg-ps probe less happy with random data
michael
parents: 2771
diff changeset
80 if(sys>invalid && sys*9 <= pspack*10)
5190
4277da592002 Make mpeg_probe() pass probetest.
michael
parents: 5189
diff changeset
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
4277da592002 Make mpeg_probe() pass probetest.
michael
parents: 5189
diff changeset
83 return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
4277da592002 Make mpeg_probe() pass probetest.
michael
parents: 5189
diff changeset
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
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
86
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
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
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
89 return score;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
90 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
91
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
93 typedef struct MpegDemuxContext {
1332
7474cc6383d4 fix some signedness warnings
mru
parents: 1322
diff changeset
94 int32_t header_state;
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97 } MpegDemuxContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
98
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
99 static int mpegps_read_header(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
100 AVFormatParameters *ap)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
101 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
102 MpegDemuxContext *m = s->priv_data;
2728
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
103 const char *sofdec = "Sofdec";
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
104 int v, i = 0;
2718
1bbb4fa1cdcd correctly set audio codec when demuxing sofdec files
aurel
parents: 2698
diff changeset
105
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
106 m->header_state = 0xff;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
107 s->ctx_flags |= AVFMTCTX_NOHEADER;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
108
2728
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
109 m->sofdec = -1;
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
110 do {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
111 v = get_byte(s->pb);
2728
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
112 m->header_state = m->header_state << 8 | v;
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
113 m->sofdec++;
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
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
944c8edaf609 seek support
bellard
parents: 293
diff changeset
118 /* no need to do more */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
119 return 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
120 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
121
944c8edaf609 seek support
bellard
parents: 293
diff changeset
122 static int64_t get_pts(ByteIOContext *pb, int c)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
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
944c8edaf609 seek support
bellard
parents: 293
diff changeset
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
944c8edaf609 seek support
bellard
parents: 293
diff changeset
130 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
131
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
132 static int find_next_start_code(ByteIOContext *pb, int *size_ptr,
1332
7474cc6383d4 fix some signedness warnings
mru
parents: 1322
diff changeset
133 int32_t *header_state)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
134 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135 unsigned int state, v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136 int val, n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
137
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
138 state = *header_state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 n = *size_ptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
140 while (n > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141 if (url_feof(pb))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143 v = get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144 n--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
145 if (state == 0x000001) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
146 state = ((state << 8) | v) & 0xffffff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
147 val = state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
148 goto found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
149 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
150 state = ((state << 8) | v) & 0xffffff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
151 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
152 val = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
153 found:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
154 *header_state = state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
155 *size_ptr = n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
156 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
157 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
944c8edaf609 seek support
bellard
parents: 293
diff changeset
160 /* XXX: optimize */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
161 static int find_prev_start_code(ByteIOContext *pb, int *size_ptr)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
162 {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
163 int64_t pos, pos_start;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
164 int max_size, start_code;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
165
944c8edaf609 seek support
bellard
parents: 293
diff changeset
166 max_size = *size_ptr;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
167 pos_start = url_ftell(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
168
944c8edaf609 seek support
bellard
parents: 293
diff changeset
169 /* in order to go faster, we fill the buffer */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
170 pos = pos_start - 16386;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
171 if (pos < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
172 pos = 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
173 url_fseek(pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
174 get_byte(pb);
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 291
diff changeset
175
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
176 pos = pos_start;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
177 for(;;) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
178 pos--;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
179 if (pos < 0 || (pos_start - pos) >= max_size) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
180 start_code = -1;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
181 goto the_end;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
182 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
183 url_fseek(pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
184 start_code = get_be32(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
185 if ((start_code & 0xffffff00) == 0x100)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
186 break;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
187 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
188 the_end:
944c8edaf609 seek support
bellard
parents: 293
diff changeset
189 *size_ptr = pos_start - pos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
190 return start_code;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
191 }
683
095009fc2f35 kill warnings patch by (M¸«©ns Rullg¸«©rd <mru inprovide com>)
michael
parents: 674
diff changeset
192 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
193
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
194 /**
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
195 * Extracts stream types from a program stream map
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
196 * According to ISO/IEC 13818-1 ('MPEG-2 Systems') table 2-35
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
197 *
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
198 * @return number of bytes occupied by PSM in the bitstream
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
199 */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
200 static long mpegps_psm_parse(MpegDemuxContext *m, ByteIOContext *pb)
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
201 {
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
202 int psm_length, ps_info_length, es_map_length;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
203
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
204 psm_length = get_be16(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
205 get_byte(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
206 get_byte(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
207 ps_info_length = get_be16(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
208
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
209 /* skip program_stream_info */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
210 url_fskip(pb, ps_info_length);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
211 es_map_length = get_be16(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
212
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
213 /* at least one es available? */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
214 while (es_map_length >= 4){
3779
4ea69956d2e8 vertical align
michael
parents: 3724
diff changeset
215 unsigned char type = get_byte(pb);
4ea69956d2e8 vertical align
michael
parents: 3724
diff changeset
216 unsigned char es_id = get_byte(pb);
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
217 uint16_t es_info_length = get_be16(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
218 /* remember mapping from stream id to stream type */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
219 m->psm_es_type[es_id] = type;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
220 /* skip program_stream_info */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
221 url_fskip(pb, es_info_length);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
222 es_map_length -= 4 + es_info_length;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
223 }
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
224 get_be32(pb); /* crc32 */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
225 return 2 + psm_length;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
226 }
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
227
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
228 /* read the next PES header. Return its position in ppos
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
229 (if not NULL), and its start code, pts and dts.
944c8edaf609 seek support
bellard
parents: 293
diff changeset
230 */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
231 static int mpegps_read_pes_header(AVFormatContext *s,
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
234 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
235 MpegDemuxContext *m = s->priv_data;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 redo:
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
244 /* next start code (should be immediately after) */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
245 m->header_state = 0xff;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
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));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 if (startcode < 0)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2177
diff changeset
251 return AVERROR(EIO);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252 if (startcode == PACK_START_CODE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254 if (startcode == SYSTEM_HEADER_START_CODE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 goto redo;
2728
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
256 if (startcode == PADDING_STREAM) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
257 url_fskip(s->pb, get_be16(s->pb));
2728
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
258 goto redo;
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
259 }
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
260 if (startcode == PRIVATE_STREAM_2) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
261 len = get_be16(s->pb);
2728
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
262 if (!m->sofdec) {
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
263 while (len-- >= 6) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
264 if (get_byte(s->pb) == 'S') {
2728
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
265 uint8_t buf[5];
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
266 get_buffer(s->pb, buf, sizeof(buf));
2728
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
267 m->sofdec = !memcmp(buf, "ofdec", 5);
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
268 len -= sizeof(buf);
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
269 break;
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
270 }
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
271 }
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
272 m->sofdec -= !m->sofdec;
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
273 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
274 url_fskip(s->pb, len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276 }
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
277 if (startcode == PROGRAM_STREAM_MAP) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
278 mpegps_psm_parse(m, s->pb);
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
279 goto redo;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
280 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
281
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
282 /* find matching stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
283 if (!((startcode >= 0x1c0 && startcode <= 0x1df) ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
284 (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
285 (startcode == 0x1bd) || (startcode == 0x1fd)))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
286 goto redo;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
287 if (ppos) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
288 *ppos = url_ftell(s->pb) - 4;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
289 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
290 len = get_be16(s->pb);
1666
682ea2701149 cosmetic
michael
parents: 1665
diff changeset
291 pts =
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 dts = AV_NOPTS_VALUE;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
293 /* stuffing */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 for(;;) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
295 if (len < 1)
1664
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
296 goto error_redo;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
297 c = get_byte(s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 /* XXX: for mpeg1, should test only bit 7 */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
300 if (c != 0xff)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
301 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
302 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
303 if ((c & 0xc0) == 0x40) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304 /* buffer scale & size */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
305 get_byte(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
306 c = get_byte(s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
307 len -= 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
308 }
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
309 if ((c & 0xe0) == 0x20) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
310 dts = pts = get_pts(s->pb, c);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
311 len -= 4;
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
312 if (c & 0x10){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
313 dts = get_pts(s->pb, -1);
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
314 len -= 5;
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
315 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
316 } else if ((c & 0xc0) == 0x80) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
317 /* mpeg 2 PES */
1126
8ba9a025a342 allow packets with non-zero PES_scrambling_control
mru
parents: 979
diff changeset
318 #if 0 /* some streams have this field set for no apparent reason */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
319 if ((c & 0x30) != 0) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
320 /* Encrypted multiplex not handled */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
321 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
322 }
1126
8ba9a025a342 allow packets with non-zero PES_scrambling_control
mru
parents: 979
diff changeset
323 #endif
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
324 flags = get_byte(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
325 header_len = get_byte(s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 len -= 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 if (header_len > len)
1664
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
328 goto error_redo;
1668
b609473bf4bb simplify
michael
parents: 1667
diff changeset
329 len -= header_len;
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
330 if (flags & 0x80) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
331 dts = pts = get_pts(s->pb, -1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
332 header_len -= 5;
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
333 if (flags & 0x40) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
334 dts = get_pts(s->pb, -1);
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
335 header_len -= 5;
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
336 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
337 }
3109
20e070d8706f Ignore flags after pts/dts if there are no bytes left.
michael
parents: 2934
diff changeset
338 if (flags & 0x3f && header_len == 0){
20e070d8706f Ignore flags after pts/dts if there are no bytes left.
michael
parents: 2934
diff changeset
339 flags &= 0xC0;
20e070d8706f Ignore flags after pts/dts if there are no bytes left.
michael
parents: 2934
diff changeset
340 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
341 }
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 if (flags & 0x01) { /* PES extension */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
343 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
344 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
345 /* 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
346 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
347 skip += skip & 0x9;
3270
567f8a365db0 Support invalid mpeg created by vdr
michael
parents: 3109
diff changeset
348 if (pes_ext & 0x40 || skip > header_len){
567f8a365db0 Support invalid mpeg created by vdr
michael
parents: 3109
diff changeset
349 av_log(s, AV_LOG_WARNING, "pes_ext %X is invalid\n", pes_ext);
567f8a365db0 Support invalid mpeg created by vdr
michael
parents: 3109
diff changeset
350 pes_ext=skip=0;
567f8a365db0 Support invalid mpeg created by vdr
michael
parents: 3109
diff changeset
351 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
352 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
353 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
354
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 if (pes_ext & 0x01) { /* PES extension 2 */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
356 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
357 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
358 if ((ext2_len & 0x7f) > 0) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
359 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
360 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
361 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
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 }
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
364 }
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 }
1668
b609473bf4bb simplify
michael
parents: 1667
diff changeset
366 if(header_len < 0)
b609473bf4bb simplify
michael
parents: 1667
diff changeset
367 goto error_redo;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
368 url_fskip(s->pb, header_len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
369 }
447
94aa265c18b9 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents: 437
diff changeset
370 else if( c!= 0xf )
94aa265c18b9 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents: 437
diff changeset
371 goto redo;
94aa265c18b9 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents: 437
diff changeset
372
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
373 if (startcode == PRIVATE_STREAM_1 && !m->psm_es_type[startcode & 0xff]) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
374 startcode = get_byte(s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
375 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
376 if (startcode >= 0x80 && startcode <= 0xcf) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
377 /* audio: skip header */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
378 get_byte(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
379 get_byte(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
380 get_byte(s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
381 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
382 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
383 /* MLP/TrueHD audio has a 4-byte header */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
384 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
385 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
386 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
387 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
388 }
1665
074b64b1fb61 reduce len checks, simplifies code
michael
parents: 1664
diff changeset
389 if(len<0)
074b64b1fb61 reduce len checks, simplifies code
michael
parents: 1664
diff changeset
390 goto error_redo;
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
391 if(dts != AV_NOPTS_VALUE && ppos){
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
392 int i;
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
393 for(i=0; i<s->nb_streams; i++){
2934
dadfe1a02cec Suppress runaway index on streamed input
mbardiaux
parents: 2932
diff changeset
394 if(startcode == s->streams[i]->id &&
dadfe1a02cec Suppress runaway index on streamed input
mbardiaux
parents: 2932
diff changeset
395 !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
396 ff_reduce_index(s, i);
979
d2e5dfdf4def add size to AVIndex
michael
parents: 940
diff changeset
397 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
398 }
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
399 }
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
400 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
401
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
402 *pstart_code = startcode;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
403 *ppts = pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
404 *pdts = dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
405 return len;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
406 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
407
944c8edaf609 seek support
bellard
parents: 293
diff changeset
408 static int mpegps_read_packet(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
409 AVPacket *pkt)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
410 {
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
411 MpegDemuxContext *m = s->priv_data;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
412 AVStream *st;
3967
4fd67f05bad9 Use enum typers instead of int.
benoit
parents: 3908
diff changeset
413 int len, startcode, i, es_type;
4fd67f05bad9 Use enum typers instead of int.
benoit
parents: 3908
diff changeset
414 enum CodecID codec_id = CODEC_ID_NONE;
4fd67f05bad9 Use enum typers instead of int.
benoit
parents: 3908
diff changeset
415 enum CodecType type;
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
416 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
417 uint8_t av_uninit(dvdaudio_substream_type);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
418
944c8edaf609 seek support
bellard
parents: 293
diff changeset
419 redo:
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
420 len = mpegps_read_pes_header(s, &dummy_pos, &startcode, &pts, &dts);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
421 if (len < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
422 return len;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
423
4450
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
424 if(startcode == 0x1bd) {
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
425 dvdaudio_substream_type = get_byte(s->pb);
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
426 url_fskip(s->pb, 3);
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
427 len -= 4;
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
428 }
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
429
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
430 /* now find stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
431 for(i=0;i<s->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
432 st = s->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
433 if (st->id == startcode)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
434 goto found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
435 }
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
436
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
437 es_type = m->psm_es_type[startcode & 0xff];
4450
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
438 if(es_type > 0 && es_type != STREAM_TYPE_PRIVATE_DATA){
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
439 if(es_type == STREAM_TYPE_VIDEO_MPEG1){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
440 codec_id = CODEC_ID_MPEG2VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
441 type = CODEC_TYPE_VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
442 } else if(es_type == STREAM_TYPE_VIDEO_MPEG2){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
443 codec_id = CODEC_ID_MPEG2VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
444 type = CODEC_TYPE_VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
445 } else if(es_type == STREAM_TYPE_AUDIO_MPEG1 ||
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
446 es_type == STREAM_TYPE_AUDIO_MPEG2){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
447 codec_id = CODEC_ID_MP3;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
448 type = CODEC_TYPE_AUDIO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
449 } else if(es_type == STREAM_TYPE_AUDIO_AAC){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
450 codec_id = CODEC_ID_AAC;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
451 type = CODEC_TYPE_AUDIO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
452 } else if(es_type == STREAM_TYPE_VIDEO_MPEG4){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
453 codec_id = CODEC_ID_MPEG4;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
454 type = CODEC_TYPE_VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
455 } else if(es_type == STREAM_TYPE_VIDEO_H264){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
456 codec_id = CODEC_ID_H264;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
457 type = CODEC_TYPE_VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
458 } else if(es_type == STREAM_TYPE_AUDIO_AC3){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
459 codec_id = CODEC_ID_AC3;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
460 type = CODEC_TYPE_AUDIO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
461 } else {
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
462 goto skip;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
463 }
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
464 } else if (startcode >= 0x1e0 && startcode <= 0x1ef) {
1146
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
465 static const unsigned char avs_seqh[4] = { 0, 0, 1, 0xb0 };
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
466 unsigned char buf[8];
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
467 get_buffer(s->pb, buf, 8);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
468 url_fseek(s->pb, -8, SEEK_CUR);
1146
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
469 if(!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1))
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
470 codec_id = CODEC_ID_CAVS;
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
471 else
3576
270e9f324405 Use CODEC_ID_PROBE when the mpeg-ps demuxer does not know exactly which
michael
parents: 3484
diff changeset
472 codec_id = CODEC_ID_PROBE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
473 type = CODEC_TYPE_VIDEO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
474 } else if (startcode >= 0x1c0 && startcode <= 0x1df) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
475 type = CODEC_TYPE_AUDIO;
2728
e00622d9d3c9 Improve Sofdec file detection
mru
parents: 2727
diff changeset
476 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
477 } else if (startcode >= 0x80 && startcode <= 0x87) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
478 type = CODEC_TYPE_AUDIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
479 codec_id = CODEC_ID_AC3;
3779
4ea69956d2e8 vertical align
michael
parents: 3724
diff changeset
480 } 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
481 ||( 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
482 /* 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
483 type = CODEC_TYPE_AUDIO;
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
484 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
485 } else if (startcode >= 0xa0 && startcode <= 0xaf) {
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
486 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
487 /* 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
488 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
489 } 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
490 type = CODEC_TYPE_AUDIO;
4750
8c8a4e946d5c Split TrueHD decoder from MLP
ramiro
parents: 4648
diff changeset
491 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
492 } 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
493 /* 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
494 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
495 codec_id = CODEC_ID_AC3;
783
2e8b5a7d7e02 DVD subtitle parsing - show mpeg component IDs by default
bellard
parents: 767
diff changeset
496 } else if (startcode >= 0x20 && startcode <= 0x3f) {
2e8b5a7d7e02 DVD subtitle parsing - show mpeg component IDs by default
bellard
parents: 767
diff changeset
497 type = CODEC_TYPE_SUBTITLE;
2e8b5a7d7e02 DVD subtitle parsing - show mpeg component IDs by default
bellard
parents: 767
diff changeset
498 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
499 } 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
500 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
501 codec_id = CODEC_ID_VC1;
4450
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
502 } else if (startcode == 0x1bd) {
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
503 // check dvd audio substream type
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
504 type = CODEC_TYPE_AUDIO;
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
505 switch(dvdaudio_substream_type & 0xe0) {
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
506 case 0xa0: codec_id = CODEC_ID_PCM_DVD;
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
507 break;
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
508 case 0x80: if((dvdaudio_substream_type & 0xf8) == 0x88)
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
509 codec_id = CODEC_ID_DTS;
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
510 else codec_id = CODEC_ID_AC3;
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
511 break;
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
512 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
513 goto skip;
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
514 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516 skip:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
517 /* skip packet */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
518 url_fskip(s->pb, len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
519 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
520 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
521 /* no stream found: add a new stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
522 st = av_new_stream(s, startcode);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
523 if (!st)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
524 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
525 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
526 st->codec->codec_id = codec_id;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
527 if (codec_id != CODEC_ID_PCM_S16BE)
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2001
diff changeset
528 st->need_parsing = AVSTREAM_PARSE_FULL;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
529 found:
708
d79164865a7c more fine grained discarding of packets
michael
parents: 698
diff changeset
530 if(st->discard >= AVDISCARD_ALL)
652
b47948262721 support discarding uninterresting packets
michael
parents: 628
diff changeset
531 goto skip;
4450
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
532 if ((startcode >= 0xa0 && startcode <= 0xaf) ||
8f1038d1ee6d Allow demuxing of audio substreams stored as 0x06 type.
benoit
parents: 4424
diff changeset
533 (startcode == 0x1bd && ((dvdaudio_substream_type & 0xe0) == 0xa0))) {
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
534 int b1, freq;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
535
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
536 /* for LPCM, we just skip the header and consider it is raw
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
537 audio data */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
538 if (len <= 3)
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
539 goto skip;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
540 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
541 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
542 get_byte(s->pb); /* dynamic range control (0x80 = off) */
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
543 len -= 3;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
544 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
545 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
546 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
547 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
548 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
549 st->codec->sample_rate *
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3779
diff changeset
550 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
551 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
552 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
553 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
554 return AVERROR(EINVAL);
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
555 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
556 av_new_packet(pkt, len);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
557 get_buffer(s->pb, pkt->data, pkt->size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
558 pkt->pts = pts;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
559 pkt->dts = dts;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
560 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
561 #if 0
652
b47948262721 support discarding uninterresting packets
michael
parents: 628
diff changeset
562 av_log(s, AV_LOG_DEBUG, "%d: pts=%0.3f dts=%0.3f size=%d\n",
b47948262721 support discarding uninterresting packets
michael
parents: 628
diff changeset
563 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
564 #endif
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 475
diff changeset
565
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
566 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
567 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
568
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
569 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
570 int64_t *ppos, int64_t pos_limit)
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
571 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
572 int len, startcode;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
573 int64_t pos, pts, dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
574
944c8edaf609 seek support
bellard
parents: 293
diff changeset
575 pos = *ppos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
576 #ifdef DEBUG_SEEK
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
577 printf("read_dts: pos=0x%"PRIx64" next=%d -> ", pos, find_next);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
578 #endif
3398
3fbe87561b73 Check return of url_fseek in mpeg timestamp reading code.
benoit
parents: 3305
diff changeset
579 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
580 return AV_NOPTS_VALUE;
3fbe87561b73 Check return of url_fseek in mpeg timestamp reading code.
benoit
parents: 3305
diff changeset
581
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
582 for(;;) {
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
583 len = mpegps_read_pes_header(s, &pos, &startcode, &pts, &dts);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
584 if (len < 0) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
585 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
586 printf("none (ret=%d)\n", len);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
587 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
588 return AV_NOPTS_VALUE;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
589 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
590 if (startcode == s->streams[stream_index]->id &&
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
591 dts != AV_NOPTS_VALUE) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
592 break;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
593 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2728
diff changeset
594 url_fskip(s->pb, len);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
595 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
596 #ifdef DEBUG_SEEK
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
597 printf("pos=0x%"PRIx64" dts=0x%"PRIx64" %0.3f\n", pos, dts, dts / 90000.0);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
598 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
599 *ppos = pos;
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 452
diff changeset
600 return dts;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
601 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
602
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1146
diff changeset
603 AVInputFormat mpegps_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
604 "mpeg",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3398
diff changeset
605 NULL_IF_CONFIG_SMALL("MPEG-PS format"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
606 sizeof(MpegDemuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
607 mpegps_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
608 mpegps_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
609 mpegps_read_packet,
3484
31a0f3b99ef7 remove useless close funcs
bcoudurier
parents: 3424
diff changeset
610 NULL,
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
611 NULL, //mpegps_read_seek,
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
612 mpegps_read_dts,
3724
178cc6f9d5ec Add flag to mark demuxers that can output discontinuous timestamps.
michael
parents: 3576
diff changeset
613 .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
614 };