Mercurial > libavformat.hg
annotate rmdec.c @ 4105:8f778b7c07d0 libavformat
oggflac: fix bitstream reader usage
author | mru |
---|---|
date | Sun, 14 Dec 2008 17:30:18 +0000 |
parents | f8a743bd2df8 |
children | 9ca077eb2eb2 |
rev | line source |
---|---|
0 | 1 /* |
2103 | 2 * "Real" compatible demuxer. |
0 | 3 * Copyright (c) 2000, 2001 Fabrice Bellard. |
4 * | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1350
diff
changeset
|
5 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1350
diff
changeset
|
6 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1350
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:
1350
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:
1350
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:
1350
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:
888
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 20 */ |
3286 | 21 |
22 #include "libavutil/avstring.h" | |
0 | 23 #include "avformat.h" |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
24 |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
25 typedef struct { |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
26 int nb_packets; |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
27 int old_format; |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
28 int current_stream; |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
29 int remaining_len; |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
30 uint8_t *videobuf; ///< place to store merged video frame |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
31 int videobufsize; ///< current assembled frame size |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
32 int videobufpos; ///< position for the next slice in the video buffer |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
33 int curpic_num; ///< picture number of current frame |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
34 int cur_slice, slices; |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
35 int64_t pktpos; ///< first slice position in file |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
36 /// Audio descrambling matrix parameters |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
37 uint8_t *audiobuf; ///< place to store reordered audio data |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
38 int64_t audiotimestamp; ///< Audio packet timestamp |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
39 int sub_packet_cnt; // Subpacket counter, used while reading |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
40 int sub_packet_size, sub_packet_h, coded_framesize; ///< Descrambling parameters from container |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
41 int audio_stream_num; ///< Stream number for audio packets |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
42 int audio_pkt_cnt; ///< Output packet counter |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
43 int audio_framesize; /// Audio frame size from container |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
44 int sub_packet_lengths[16]; /// Length of each aac subpacket |
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
45 } RMDemuxContext; |
0 | 46 |
2291 | 47 static inline void get_strl(ByteIOContext *pb, char *buf, int buf_size, int len) |
0 | 48 { |
2291 | 49 int i; |
2290
572f7077ba40
Fix get_str/get_str8() to also work if the target string is not long enough to
diego
parents:
2274
diff
changeset
|
50 char *q, r; |
0 | 51 |
52 q = buf; | |
53 for(i=0;i<len;i++) { | |
2290
572f7077ba40
Fix get_str/get_str8() to also work if the target string is not long enough to
diego
parents:
2274
diff
changeset
|
54 r = get_byte(pb); |
0 | 55 if (i < buf_size - 1) |
2290
572f7077ba40
Fix get_str/get_str8() to also work if the target string is not long enough to
diego
parents:
2274
diff
changeset
|
56 *q++ = r; |
0 | 57 } |
2290
572f7077ba40
Fix get_str/get_str8() to also work if the target string is not long enough to
diego
parents:
2274
diff
changeset
|
58 if (buf_size > 0) *q = '\0'; |
0 | 59 } |
60 | |
2291 | 61 static void get_str16(ByteIOContext *pb, char *buf, int buf_size) |
62 { | |
63 get_strl(pb, buf, buf_size, get_be16(pb)); | |
64 } | |
65 | |
0 | 66 static void get_str8(ByteIOContext *pb, char *buf, int buf_size) |
67 { | |
2291 | 68 get_strl(pb, buf, buf_size, get_byte(pb)); |
0 | 69 } |
70 | |
4036
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
71 static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb, |
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
72 AVStream *st, int read_all) |
194 | 73 { |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
74 RMDemuxContext *rm = s->priv_data; |
886
7ed1351f8c7e
Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents:
885
diff
changeset
|
75 char buf[256]; |
194 | 76 uint32_t version; |
77 int i; | |
78 | |
79 /* ra type header */ | |
80 version = get_be32(pb); /* version */ | |
81 if (((version >> 16) & 0xff) == 3) { | |
886
7ed1351f8c7e
Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents:
885
diff
changeset
|
82 int64_t startpos = url_ftell(pb); |
194 | 83 /* very old version */ |
84 for(i = 0; i < 14; i++) | |
85 get_byte(pb); | |
86 get_str8(pb, s->title, sizeof(s->title)); | |
87 get_str8(pb, s->author, sizeof(s->author)); | |
88 get_str8(pb, s->copyright, sizeof(s->copyright)); | |
89 get_str8(pb, s->comment, sizeof(s->comment)); | |
886
7ed1351f8c7e
Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents:
885
diff
changeset
|
90 if ((startpos + (version & 0xffff)) >= url_ftell(pb) + 2) { |
4075 | 91 // fourcc (should always be "lpcJ") |
92 get_byte(pb); | |
93 get_str8(pb, buf, sizeof(buf)); | |
886
7ed1351f8c7e
Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents:
885
diff
changeset
|
94 } |
7ed1351f8c7e
Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents:
885
diff
changeset
|
95 // Skip extra header crap (this should never happen) |
7ed1351f8c7e
Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents:
885
diff
changeset
|
96 if ((startpos + (version & 0xffff)) > url_ftell(pb)) |
7ed1351f8c7e
Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents:
885
diff
changeset
|
97 url_fskip(pb, (version & 0xffff) + startpos - url_ftell(pb)); |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
98 st->codec->sample_rate = 8000; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
99 st->codec->channels = 1; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
100 st->codec->codec_type = CODEC_TYPE_AUDIO; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
101 st->codec->codec_id = CODEC_ID_RA_144; |
194 | 102 } else { |
879 | 103 int flavor, sub_packet_h, coded_framesize, sub_packet_size; |
194 | 104 /* old version (4) */ |
105 get_be32(pb); /* .ra4 */ | |
687
561f27e36bc4
ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents:
652
diff
changeset
|
106 get_be32(pb); /* data size */ |
561f27e36bc4
ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents:
652
diff
changeset
|
107 get_be16(pb); /* version2 */ |
194 | 108 get_be32(pb); /* header size */ |
687
561f27e36bc4
ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents:
652
diff
changeset
|
109 flavor= get_be16(pb); /* add codec info / flavor */ |
879 | 110 rm->coded_framesize = coded_framesize = get_be32(pb); /* coded frame size */ |
194 | 111 get_be32(pb); /* ??? */ |
112 get_be32(pb); /* ??? */ | |
113 get_be32(pb); /* ??? */ | |
885 | 114 rm->sub_packet_h = sub_packet_h = get_be16(pb); /* 1 */ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
115 st->codec->block_align= get_be16(pb); /* frame size */ |
879 | 116 rm->sub_packet_size = sub_packet_size = get_be16(pb); /* sub packet size */ |
687
561f27e36bc4
ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents:
652
diff
changeset
|
117 get_be16(pb); /* ??? */ |
879 | 118 if (((version >> 16) & 0xff) == 5) { |
119 get_be16(pb); get_be16(pb); get_be16(pb); } | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
120 st->codec->sample_rate = get_be16(pb); |
194 | 121 get_be32(pb); |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
122 st->codec->channels = get_be16(pb); |
879 | 123 if (((version >> 16) & 0xff) == 5) { |
124 get_be32(pb); | |
887 | 125 buf[0] = get_byte(pb); |
126 buf[1] = get_byte(pb); | |
127 buf[2] = get_byte(pb); | |
128 buf[3] = get_byte(pb); | |
129 buf[4] = 0; | |
130 } else { | |
1441
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1415
diff
changeset
|
131 get_str8(pb, buf, sizeof(buf)); /* desc */ |
ad3b03b7b142
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
1415
diff
changeset
|
132 get_str8(pb, buf, sizeof(buf)); /* desc */ |
887 | 133 } |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
134 st->codec->codec_type = CODEC_TYPE_AUDIO; |
194 | 135 if (!strcmp(buf, "dnet")) { |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
136 st->codec->codec_id = CODEC_ID_AC3; |
2585
ecd8a9aa182d
dnet audio needs avparser to work with the lavc ac3 decoder.
rtogni
parents:
2532
diff
changeset
|
137 st->need_parsing = AVSTREAM_PARSE_FULL; |
687
561f27e36bc4
ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents:
652
diff
changeset
|
138 } else if (!strcmp(buf, "28_8")) { |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
139 st->codec->codec_id = CODEC_ID_RA_288; |
879 | 140 st->codec->extradata_size= 0; |
141 rm->audio_framesize = st->codec->block_align; | |
142 st->codec->block_align = coded_framesize; | |
1079 | 143 |
144 if(rm->audio_framesize >= UINT_MAX / sub_packet_h){ | |
145 av_log(s, AV_LOG_ERROR, "rm->audio_framesize * sub_packet_h too large\n"); | |
146 return -1; | |
147 } | |
148 | |
879 | 149 rm->audiobuf = av_malloc(rm->audio_framesize * sub_packet_h); |
3945 | 150 } else if ((!strcmp(buf, "cook")) || (!strcmp(buf, "atrc")) || (!strcmp(buf, "sipr"))) { |
879 | 151 int codecdata_length, i; |
152 get_be16(pb); get_byte(pb); | |
153 if (((version >> 16) & 0xff) == 5) | |
154 get_byte(pb); | |
155 codecdata_length = get_be32(pb); | |
1079 | 156 if(codecdata_length + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){ |
157 av_log(s, AV_LOG_ERROR, "codecdata_length too large\n"); | |
158 return -1; | |
159 } | |
160 | |
4014
2e7994e45100
Check sub_packet_size against 0 to avoid div by zero later.
michael
parents:
3945
diff
changeset
|
161 if(sub_packet_size <= 0){ |
2e7994e45100
Check sub_packet_size against 0 to avoid div by zero later.
michael
parents:
3945
diff
changeset
|
162 av_log(s, AV_LOG_ERROR, "sub_packet_size is invalid\n"); |
2e7994e45100
Check sub_packet_size against 0 to avoid div by zero later.
michael
parents:
3945
diff
changeset
|
163 return -1; |
2e7994e45100
Check sub_packet_size against 0 to avoid div by zero later.
michael
parents:
3945
diff
changeset
|
164 } |
2e7994e45100
Check sub_packet_size against 0 to avoid div by zero later.
michael
parents:
3945
diff
changeset
|
165 |
2024 | 166 if (!strcmp(buf, "cook")) st->codec->codec_id = CODEC_ID_COOK; |
3945 | 167 else if (!strcmp(buf, "sipr")) st->codec->codec_id = CODEC_ID_SIPR; |
2024 | 168 else st->codec->codec_id = CODEC_ID_ATRAC3; |
879 | 169 st->codec->extradata_size= codecdata_length; |
884
2ece9c9dd94c
malloc padding to avoid reading past the malloc()ed area.
henry
parents:
879
diff
changeset
|
170 st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
879 | 171 for(i = 0; i < codecdata_length; i++) |
172 ((uint8_t*)st->codec->extradata)[i] = get_byte(pb); | |
173 rm->audio_framesize = st->codec->block_align; | |
174 st->codec->block_align = rm->sub_packet_size; | |
1079 | 175 |
176 if(rm->audio_framesize >= UINT_MAX / sub_packet_h){ | |
177 av_log(s, AV_LOG_ERROR, "rm->audio_framesize * sub_packet_h too large\n"); | |
178 return -1; | |
179 } | |
180 | |
879 | 181 rm->audiobuf = av_malloc(rm->audio_framesize * sub_packet_h); |
1105 | 182 } else if (!strcmp(buf, "raac") || !strcmp(buf, "racp")) { |
183 int codecdata_length, i; | |
184 get_be16(pb); get_byte(pb); | |
185 if (((version >> 16) & 0xff) == 5) | |
186 get_byte(pb); | |
187 st->codec->codec_id = CODEC_ID_AAC; | |
188 codecdata_length = get_be32(pb); | |
1106 | 189 if(codecdata_length + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){ |
190 av_log(s, AV_LOG_ERROR, "codecdata_length too large\n"); | |
191 return -1; | |
192 } | |
1105 | 193 if (codecdata_length >= 1) { |
194 st->codec->extradata_size = codecdata_length - 1; | |
195 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
196 get_byte(pb); | |
197 for(i = 0; i < st->codec->extradata_size; i++) | |
198 ((uint8_t*)st->codec->extradata)[i] = get_byte(pb); | |
199 } | |
194 | 200 } else { |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
201 st->codec->codec_id = CODEC_ID_NONE; |
2189 | 202 av_strlcpy(st->codec->codec_name, buf, sizeof(st->codec->codec_name)); |
194 | 203 } |
204 if (read_all) { | |
205 get_byte(pb); | |
206 get_byte(pb); | |
207 get_byte(pb); | |
885 | 208 |
194 | 209 get_str8(pb, s->title, sizeof(s->title)); |
210 get_str8(pb, s->author, sizeof(s->author)); | |
211 get_str8(pb, s->copyright, sizeof(s->copyright)); | |
212 get_str8(pb, s->comment, sizeof(s->comment)); | |
213 } | |
214 } | |
1106 | 215 return 0; |
194 | 216 } |
217 | |
2889 | 218 int |
4036
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
219 ff_rm_read_mdpr_codecdata (AVFormatContext *s, ByteIOContext *pb, |
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
220 AVStream *st, int codec_data_size) |
2707
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
221 { |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
222 unsigned int v; |
3873
9a589ae59655
Use chunk-size in function calling mdpr_read_codecdata() rather than in the
rbultje
parents:
3497
diff
changeset
|
223 int size; |
2707
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
224 int64_t codec_pos; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
225 |
3874
d50c5556cb82
Move av_set_pts_info() inside the mdpr_read_codecdata() call, so that it is
rbultje
parents:
3873
diff
changeset
|
226 av_set_pts_info(st, 64, 1, 1000); |
2707
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
227 codec_pos = url_ftell(pb); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
228 v = get_be32(pb); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
229 if (v == MKTAG(0xfd, 'a', 'r', '.')) { |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
230 /* ra type header */ |
4036
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
231 if (rm_read_audio_stream_info(s, pb, st, 0)) |
2707
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
232 return -1; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
233 } else { |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
234 int fps, fps2; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
235 if (get_le32(pb) != MKTAG('V', 'I', 'D', 'O')) { |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
236 fail1: |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
237 av_log(st->codec, AV_LOG_ERROR, "Unsupported video codec\n"); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
238 goto skip; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
239 } |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
240 st->codec->codec_tag = get_le32(pb); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
241 // av_log(NULL, AV_LOG_DEBUG, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0')); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
242 if ( st->codec->codec_tag != MKTAG('R', 'V', '1', '0') |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
243 && st->codec->codec_tag != MKTAG('R', 'V', '2', '0') |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
244 && st->codec->codec_tag != MKTAG('R', 'V', '3', '0') |
3930 | 245 && st->codec->codec_tag != MKTAG('R', 'V', '4', '0') |
246 && st->codec->codec_tag != MKTAG('R', 'V', 'T', 'R')) | |
2707
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
247 goto fail1; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
248 st->codec->width = get_be16(pb); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
249 st->codec->height = get_be16(pb); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
250 st->codec->time_base.num= 1; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
251 fps= get_be16(pb); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
252 st->codec->codec_type = CODEC_TYPE_VIDEO; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
253 get_be32(pb); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
254 fps2= get_be16(pb); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
255 get_be16(pb); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
256 |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
257 st->codec->extradata_size= codec_data_size - (url_ftell(pb) - codec_pos); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
258 |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
259 if(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)st->codec->extradata_size){ |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
260 //check is redundant as get_buffer() will catch this |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
261 av_log(s, AV_LOG_ERROR, "st->codec->extradata_size too large\n"); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
262 return -1; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
263 } |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
264 st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
3410
18239c59049b
Check whether the memory allocation for extradata succeeded. Fixes issue 472.
takis
parents:
3286
diff
changeset
|
265 if (!st->codec->extradata) |
18239c59049b
Check whether the memory allocation for extradata succeeded. Fixes issue 472.
takis
parents:
3286
diff
changeset
|
266 return AVERROR(ENOMEM); |
2707
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
267 get_buffer(pb, st->codec->extradata, st->codec->extradata_size); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
268 |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
269 // av_log(NULL, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
270 st->codec->time_base.den = fps * st->codec->time_base.num; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
271 switch(((uint8_t*)st->codec->extradata)[4]>>4){ |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
272 case 1: st->codec->codec_id = CODEC_ID_RV10; break; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
273 case 2: st->codec->codec_id = CODEC_ID_RV20; break; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
274 case 3: st->codec->codec_id = CODEC_ID_RV30; break; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
275 case 4: st->codec->codec_id = CODEC_ID_RV40; break; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
276 default: goto fail1; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
277 } |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
278 } |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
279 |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
280 skip: |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
281 /* skip codec info */ |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
282 size = url_ftell(pb) - codec_pos; |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
283 url_fskip(pb, codec_data_size - size); |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
284 |
2719
6469205c08e4
Change ff_rm_read_mdpr_codecdata to get back to old behavior.
benoit
parents:
2707
diff
changeset
|
285 return 0; |
2707
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
286 } |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
287 |
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
288 |
194 | 289 static int rm_read_header_old(AVFormatContext *s, AVFormatParameters *ap) |
290 { | |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
291 RMDemuxContext *rm = s->priv_data; |
194 | 292 AVStream *st; |
293 | |
294 rm->old_format = 1; | |
295 st = av_new_stream(s, 0); | |
296 if (!st) | |
1106 | 297 return -1; |
4036
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
298 return rm_read_audio_stream_info(s, s->pb, st, 1); |
194 | 299 } |
300 | |
0 | 301 static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap) |
302 { | |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
303 RMDemuxContext *rm = s->priv_data; |
0 | 304 AVStream *st; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2770
diff
changeset
|
305 ByteIOContext *pb = s->pb; |
2707
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
306 unsigned int tag; |
3497 | 307 int tag_size; |
1350
f77cf5a063a8
Remove unused variables and the corresponding warnings along with them.
diego
parents:
1344
diff
changeset
|
308 unsigned int start_time, duration; |
0 | 309 char buf[128]; |
310 int flags = 0; | |
311 | |
194 | 312 tag = get_le32(pb); |
313 if (tag == MKTAG('.', 'r', 'a', 0xfd)) { | |
314 /* very old .ra format */ | |
315 return rm_read_header_old(s, ap); | |
316 } else if (tag != MKTAG('.', 'R', 'M', 'F')) { | |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2237
diff
changeset
|
317 return AVERROR(EIO); |
194 | 318 } |
0 | 319 |
320 get_be32(pb); /* header size */ | |
321 get_be16(pb); | |
322 get_be32(pb); | |
323 get_be32(pb); /* number of headers */ | |
885 | 324 |
0 | 325 for(;;) { |
326 if (url_feof(pb)) | |
3486 | 327 return -1; |
0 | 328 tag = get_le32(pb); |
329 tag_size = get_be32(pb); | |
330 get_be16(pb); | |
331 #if 0 | |
885 | 332 printf("tag=%c%c%c%c (%08x) size=%d\n", |
0 | 333 (tag) & 0xff, |
334 (tag >> 8) & 0xff, | |
335 (tag >> 16) & 0xff, | |
336 (tag >> 24) & 0xff, | |
337 tag, | |
338 tag_size); | |
339 #endif | |
736 | 340 if (tag_size < 10 && tag != MKTAG('D', 'A', 'T', 'A')) |
3486 | 341 return -1; |
0 | 342 switch(tag) { |
343 case MKTAG('P', 'R', 'O', 'P'): | |
344 /* file header */ | |
345 get_be32(pb); /* max bit rate */ | |
346 get_be32(pb); /* avg bit rate */ | |
347 get_be32(pb); /* max packet size */ | |
348 get_be32(pb); /* avg packet size */ | |
349 get_be32(pb); /* nb packets */ | |
350 get_be32(pb); /* duration */ | |
351 get_be32(pb); /* preroll */ | |
352 get_be32(pb); /* index offset */ | |
353 get_be32(pb); /* data offset */ | |
354 get_be16(pb); /* nb streams */ | |
355 flags = get_be16(pb); /* flags */ | |
356 break; | |
357 case MKTAG('C', 'O', 'N', 'T'): | |
2291 | 358 get_str16(pb, s->title, sizeof(s->title)); |
359 get_str16(pb, s->author, sizeof(s->author)); | |
360 get_str16(pb, s->copyright, sizeof(s->copyright)); | |
361 get_str16(pb, s->comment, sizeof(s->comment)); | |
0 | 362 break; |
363 case MKTAG('M', 'D', 'P', 'R'): | |
188
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
85
diff
changeset
|
364 st = av_new_stream(s, 0); |
0 | 365 if (!st) |
3486 | 366 return AVERROR(ENOMEM); |
0 | 367 st->id = get_be16(pb); |
368 get_be32(pb); /* max bit rate */ | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
369 st->codec->bit_rate = get_be32(pb); /* bit rate */ |
0 | 370 get_be32(pb); /* max packet size */ |
371 get_be32(pb); /* avg packet size */ | |
188
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
85
diff
changeset
|
372 start_time = get_be32(pb); /* start time */ |
0 | 373 get_be32(pb); /* preroll */ |
188
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
85
diff
changeset
|
374 duration = get_be32(pb); /* duration */ |
743 | 375 st->start_time = start_time; |
376 st->duration = duration; | |
0 | 377 get_str8(pb, buf, sizeof(buf)); /* desc */ |
378 get_str8(pb, buf, sizeof(buf)); /* mimetype */ | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
379 st->codec->codec_type = CODEC_TYPE_DATA; |
4036
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
380 if (ff_rm_read_mdpr_codecdata(s, s->pb, st, get_be32(pb)) < 0) |
2707
0199fcbb9d23
Split out the MDPR chunk reading into its own function.
benoit
parents:
2696
diff
changeset
|
381 return -1; |
0 | 382 break; |
383 case MKTAG('D', 'A', 'T', 'A'): | |
384 goto header_end; | |
385 default: | |
386 /* unknown tag: skip it */ | |
387 url_fskip(pb, tag_size - 10); | |
388 break; | |
389 } | |
390 } | |
391 header_end: | |
392 rm->nb_packets = get_be32(pb); /* number of packets */ | |
393 if (!rm->nb_packets && (flags & 4)) | |
394 rm->nb_packets = 3600 * 25; | |
395 get_be32(pb); /* next data header */ | |
2653 | 396 rm->curpic_num = -1; |
0 | 397 return 0; |
398 } | |
399 | |
400 static int get_num(ByteIOContext *pb, int *len) | |
401 { | |
402 int n, n1; | |
403 | |
404 n = get_be16(pb); | |
405 (*len)-=2; | |
2791
5d0fecceff17
Revert r10892, it's wrong and no longer needed to prevent crashes
rtogni
parents:
2771
diff
changeset
|
406 n &= 0x7FFF; |
0 | 407 if (n >= 0x4000) { |
408 return n - 0x4000; | |
409 } else { | |
410 n1 = get_be16(pb); | |
411 (*len)-=2; | |
412 return (n << 16) | n1; | |
413 } | |
414 } | |
415 | |
194 | 416 /* multiple of 20 bytes for ra144 (ugly) */ |
417 #define RAW_PACKET_SIZE 1000 | |
418 | |
613 | 419 static int sync(AVFormatContext *s, int64_t *timestamp, int *flags, int *stream_index, int64_t *pos){ |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
420 RMDemuxContext *rm = s->priv_data; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2770
diff
changeset
|
421 ByteIOContext *pb = s->pb; |
612 | 422 int len, num, res, i; |
423 AVStream *st; | |
632 | 424 uint32_t state=0xFFFFFFFF; |
612 | 425 |
426 while(!url_feof(pb)){ | |
3207 | 427 *pos= url_ftell(pb) - 3; |
612 | 428 if(rm->remaining_len > 0){ |
429 num= rm->current_stream; | |
430 len= rm->remaining_len; | |
431 *timestamp = AV_NOPTS_VALUE; | |
432 *flags= 0; | |
433 }else{ | |
632 | 434 state= (state<<8) + get_byte(pb); |
885 | 435 |
632 | 436 if(state == MKBETAG('I', 'N', 'D', 'X')){ |
437 len = get_be16(pb) - 6; | |
438 if(len<0) | |
439 continue; | |
440 goto skip; | |
441 } | |
885 | 442 |
632 | 443 if(state > (unsigned)0xFFFF || state < 12) |
612 | 444 continue; |
632 | 445 len=state; |
446 state= 0xFFFFFFFF; | |
447 | |
612 | 448 num = get_be16(pb); |
449 *timestamp = get_be32(pb); | |
450 res= get_byte(pb); /* reserved */ | |
451 *flags = get_byte(pb); /* flags */ | |
613 | 452 |
885 | 453 |
612 | 454 len -= 12; |
455 } | |
456 for(i=0;i<s->nb_streams;i++) { | |
457 st = s->streams[i]; | |
458 if (num == st->id) | |
459 break; | |
460 } | |
461 if (i == s->nb_streams) { | |
632 | 462 skip: |
612 | 463 /* skip packet if unknown number */ |
464 url_fskip(pb, len); | |
465 rm->remaining_len -= len; | |
466 continue; | |
467 } | |
468 *stream_index= i; | |
885 | 469 |
612 | 470 return len; |
471 } | |
472 return -1; | |
473 } | |
474 | |
4036
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
475 static int rm_assemble_video_frame(AVFormatContext *s, ByteIOContext *pb, |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
476 RMDemuxContext *rm, AVPacket *pkt, int len) |
2653 | 477 { |
478 int hdr, seq, pic_num, len2, pos; | |
479 int type; | |
480 | |
481 hdr = get_byte(pb); len--; | |
482 type = hdr >> 6; | |
483 switch(type){ | |
484 case 0: // slice | |
485 case 2: // last slice | |
486 seq = get_byte(pb); len--; | |
487 len2 = get_num(pb, &len); | |
488 pos = get_num(pb, &len); | |
489 pic_num = get_byte(pb); len--; | |
490 rm->remaining_len = len; | |
491 break; | |
492 case 1: //whole frame | |
493 seq = get_byte(pb); len--; | |
494 if(av_new_packet(pkt, len + 9) < 0) | |
495 return AVERROR(EIO); | |
496 pkt->data[0] = 0; | |
497 AV_WL32(pkt->data + 1, 1); | |
498 AV_WL32(pkt->data + 5, 0); | |
499 get_buffer(pb, pkt->data + 9, len); | |
500 rm->remaining_len = 0; | |
501 return 0; | |
502 case 3: //frame as a part of packet | |
503 len2 = get_num(pb, &len); | |
504 pos = get_num(pb, &len); | |
505 pic_num = get_byte(pb); len--; | |
506 rm->remaining_len = len - len2; | |
507 if(av_new_packet(pkt, len2 + 9) < 0) | |
508 return AVERROR(EIO); | |
509 pkt->data[0] = 0; | |
510 AV_WL32(pkt->data + 1, 1); | |
511 AV_WL32(pkt->data + 5, 0); | |
512 get_buffer(pb, pkt->data + 9, len2); | |
513 return 0; | |
514 } | |
515 //now we have to deal with single slice | |
516 | |
517 if((seq & 0x7F) == 1 || rm->curpic_num != pic_num){ | |
518 rm->slices = ((hdr & 0x3F) << 1) + 1; | |
2764 | 519 rm->videobufsize = len2 + 8*rm->slices + 1; |
2770
a7e42cf4b364
Replace realloc with free+malloc, the previous content of the buffer is
rtogni
parents:
2766
diff
changeset
|
520 av_free(rm->videobuf); |
a7e42cf4b364
Replace realloc with free+malloc, the previous content of the buffer is
rtogni
parents:
2766
diff
changeset
|
521 if(!(rm->videobuf = av_malloc(rm->videobufsize))) |
2763 | 522 return AVERROR(ENOMEM); |
2653 | 523 rm->videobufpos = 8*rm->slices + 1; |
524 rm->cur_slice = 0; | |
525 rm->curpic_num = pic_num; | |
2696 | 526 rm->pktpos = url_ftell(pb); |
2653 | 527 } |
2766 | 528 if(type == 2) |
2653 | 529 len = FFMIN(len, pos); |
530 | |
2754 | 531 if(++rm->cur_slice > rm->slices) |
2653 | 532 return 1; |
533 AV_WL32(rm->videobuf - 7 + 8*rm->cur_slice, 1); | |
534 AV_WL32(rm->videobuf - 3 + 8*rm->cur_slice, rm->videobufpos - 8*rm->slices - 1); | |
535 if(rm->videobufpos + len > rm->videobufsize) | |
536 return 1; | |
537 if (get_buffer(pb, rm->videobuf + rm->videobufpos, len) != len) | |
538 return AVERROR(EIO); | |
2808 | 539 rm->videobufpos += len; |
2653 | 540 rm->remaining_len-= len; |
541 | |
542 if(type == 2 || (rm->videobufpos) == rm->videobufsize){ | |
543 rm->videobuf[0] = rm->cur_slice-1; | |
2762
137eec75e3df
Optimize memory management to create an av_packet from multiple slices:
rtogni
parents:
2754
diff
changeset
|
544 if(av_new_packet(pkt, rm->videobufpos - 8*(rm->slices - rm->cur_slice)) < 0) |
2653 | 545 return AVERROR(ENOMEM); |
2762
137eec75e3df
Optimize memory management to create an av_packet from multiple slices:
rtogni
parents:
2754
diff
changeset
|
546 memcpy(pkt->data, rm->videobuf, 1 + 8*rm->cur_slice); |
2766 | 547 memcpy(pkt->data + 1 + 8*rm->cur_slice, rm->videobuf + 1 + 8*rm->slices, |
548 rm->videobufpos - 1 - 8*rm->slices); | |
2696 | 549 pkt->pts = AV_NOPTS_VALUE; |
550 pkt->pos = rm->pktpos; | |
2653 | 551 return 0; |
552 } | |
553 | |
554 return 1; | |
555 } | |
556 | |
2725 | 557 static inline void |
558 rm_ac3_swap_bytes (AVStream *st, AVPacket *pkt) | |
559 { | |
560 uint8_t *ptr; | |
561 int j; | |
562 | |
563 if (st->codec->codec_id == CODEC_ID_AC3) { | |
564 ptr = pkt->data; | |
565 for (j=0;j<pkt->size;j+=2) { | |
566 FFSWAP(int, ptr[0], ptr[1]); | |
567 ptr += 2; | |
568 } | |
569 } | |
570 } | |
571 | |
2889 | 572 int |
4036
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
573 ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb, |
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
574 AVStream *st, int len, AVPacket *pkt, |
2722
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
575 int *seq, int *flags, int64_t *timestamp) |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
576 { |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
577 RMDemuxContext *rm = s->priv_data; |
2722
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
578 |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
579 if (st->codec->codec_type == CODEC_TYPE_VIDEO) { |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
580 rm->current_stream= st->id; |
4036
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
581 if(rm_assemble_video_frame(s, pb, rm, pkt, len) == 1) |
2722
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
582 return -1; //got partial frame |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
583 } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) { |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
584 if ((st->codec->codec_id == CODEC_ID_RA_288) || |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
585 (st->codec->codec_id == CODEC_ID_COOK) || |
3945 | 586 (st->codec->codec_id == CODEC_ID_ATRAC3) || |
587 (st->codec->codec_id == CODEC_ID_SIPR)) { | |
2722
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
588 int x; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
589 int sps = rm->sub_packet_size; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
590 int cfs = rm->coded_framesize; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
591 int h = rm->sub_packet_h; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
592 int y = rm->sub_packet_cnt; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
593 int w = rm->audio_framesize; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
594 |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
595 if (*flags & 2) |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
596 y = rm->sub_packet_cnt = 0; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
597 if (!y) |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
598 rm->audiotimestamp = *timestamp; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
599 |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
600 switch(st->codec->codec_id) { |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
601 case CODEC_ID_RA_288: |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
602 for (x = 0; x < h/2; x++) |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
603 get_buffer(pb, rm->audiobuf+x*2*w+y*cfs, cfs); |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
604 break; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
605 case CODEC_ID_ATRAC3: |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
606 case CODEC_ID_COOK: |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
607 for (x = 0; x < w/sps; x++) |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
608 get_buffer(pb, rm->audiobuf+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps); |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
609 break; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
610 } |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
611 |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
612 if (++(rm->sub_packet_cnt) < h) |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
613 return -1; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
614 else { |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
615 rm->sub_packet_cnt = 0; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
616 rm->audio_stream_num = st->index; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
617 rm->audio_pkt_cnt = h * w / st->codec->block_align - 1; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
618 // Release first audio packet |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
619 av_new_packet(pkt, st->codec->block_align); |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
620 memcpy(pkt->data, rm->audiobuf, st->codec->block_align); |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
621 *timestamp = rm->audiotimestamp; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
622 *flags = 2; // Mark first packet as keyframe |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
623 } |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
624 } else if (st->codec->codec_id == CODEC_ID_AAC) { |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
625 int x; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
626 rm->audio_stream_num = st->index; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
627 rm->sub_packet_cnt = (get_be16(pb) & 0xf0) >> 4; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
628 if (rm->sub_packet_cnt) { |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
629 for (x = 0; x < rm->sub_packet_cnt; x++) |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
630 rm->sub_packet_lengths[x] = get_be16(pb); |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
631 // Release first audio packet |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
632 rm->audio_pkt_cnt = rm->sub_packet_cnt - 1; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
633 av_get_packet(pb, pkt, rm->sub_packet_lengths[0]); |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
634 *flags = 2; // Mark first packet as keyframe |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
635 } |
2940 | 636 } else { |
2722
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
637 av_get_packet(pb, pkt, len); |
2753
b55dad23bfcb
Move dnet-ac3 byte-swapping code close to audio packet read code
rtogni
parents:
2725
diff
changeset
|
638 rm_ac3_swap_bytes(st, pkt); |
2940 | 639 } |
2722
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
640 } else |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
641 av_get_packet(pb, pkt, len); |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
642 |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
643 if( (st->discard >= AVDISCARD_NONKEY && !(*flags&2)) |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
644 || st->discard >= AVDISCARD_ALL){ |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
645 av_free_packet(pkt); |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
646 return -1; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
647 } |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
648 |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
649 pkt->stream_index = st->index; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
650 |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
651 #if 0 |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
652 if (st->codec->codec_type == CODEC_TYPE_VIDEO) { |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
653 if(st->codec->codec_id == CODEC_ID_RV20){ |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
654 int seq= 128*(pkt->data[2]&0x7F) + (pkt->data[3]>>1); |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
655 av_log(NULL, AV_LOG_DEBUG, "%d %"PRId64" %d\n", *timestamp, *timestamp*512LL/25, seq); |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
656 |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
657 seq |= (*timestamp&~0x3FFF); |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
658 if(seq - *timestamp > 0x2000) seq -= 0x4000; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
659 if(seq - *timestamp < -0x2000) seq += 0x4000; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
660 } |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
661 } |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
662 #endif |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
663 |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
664 pkt->pts= *timestamp; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
665 if (*flags & 2) |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
666 pkt->flags |= PKT_FLAG_KEY; |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
667 |
4096
233ba738a68e
Don't access RMContext directly in rdt.c. Rather, use the return value of
rbultje
parents:
4075
diff
changeset
|
668 return st->codec->codec_type == CODEC_TYPE_AUDIO ? rm->audio_pkt_cnt : 0; |
2722
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
669 } |
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
670 |
2889 | 671 void |
4036
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
672 ff_rm_retrieve_cache (AVFormatContext *s, ByteIOContext *pb, |
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
673 AVStream *st, AVPacket *pkt) |
2724
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
674 { |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
675 RMDemuxContext *rm = s->priv_data; |
2724
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
676 |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
677 assert (rm->audio_pkt_cnt > 0); |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
678 |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
679 if (st->codec->codec_id == CODEC_ID_AAC) |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
680 av_get_packet(pb, pkt, rm->sub_packet_lengths[rm->sub_packet_cnt - rm->audio_pkt_cnt]); |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
681 else { |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
682 av_new_packet(pkt, st->codec->block_align); |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
683 memcpy(pkt->data, rm->audiobuf + st->codec->block_align * |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
684 (rm->sub_packet_h * rm->audio_framesize / st->codec->block_align - rm->audio_pkt_cnt), |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
685 st->codec->block_align); |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
686 } |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
687 rm->audio_pkt_cnt--; |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
688 pkt->flags = 0; |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
689 pkt->stream_index = st->index; |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
690 } |
1f752c3afdc8
Isolate caching of audio frames in its own function.
benoit
parents:
2723
diff
changeset
|
691 |
0 | 692 static int rm_read_packet(AVFormatContext *s, AVPacket *pkt) |
693 { | |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
694 RMDemuxContext *rm = s->priv_data; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2770
diff
changeset
|
695 ByteIOContext *pb = s->pb; |
0 | 696 AVStream *st; |
2725 | 697 int i, len; |
613 | 698 int64_t timestamp, pos; |
612 | 699 int flags; |
0 | 700 |
888 | 701 if (rm->audio_pkt_cnt) { |
879 | 702 // If there are queued audio packet return them first |
703 st = s->streams[rm->audio_stream_num]; | |
4036
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
704 ff_rm_retrieve_cache(s, s->pb, st, pkt); |
888 | 705 } else if (rm->old_format) { |
706 st = s->streams[0]; | |
707 if (st->codec->codec_id == CODEC_ID_RA_288) { | |
708 int x, y; | |
709 | |
710 for (y = 0; y < rm->sub_packet_h; y++) | |
711 for (x = 0; x < rm->sub_packet_h/2; x++) | |
712 if (get_buffer(pb, rm->audiobuf+x*2*rm->audio_framesize+y*rm->coded_framesize, rm->coded_framesize) <= 0) | |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2237
diff
changeset
|
713 return AVERROR(EIO); |
888 | 714 rm->audio_stream_num = 0; |
715 rm->audio_pkt_cnt = rm->sub_packet_h * rm->audio_framesize / st->codec->block_align - 1; | |
716 // Release first audio packet | |
717 av_new_packet(pkt, st->codec->block_align); | |
718 memcpy(pkt->data, rm->audiobuf, st->codec->block_align); | |
719 pkt->flags |= PKT_FLAG_KEY; // Mark first packet as keyframe | |
720 pkt->stream_index = 0; | |
721 } else { | |
722 /* just read raw bytes */ | |
723 len = RAW_PACKET_SIZE; | |
724 len= av_get_packet(pb, pkt, len); | |
725 pkt->stream_index = 0; | |
726 if (len <= 0) { | |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2237
diff
changeset
|
727 return AVERROR(EIO); |
888 | 728 } |
729 pkt->size = len; | |
730 } | |
2753
b55dad23bfcb
Move dnet-ac3 byte-swapping code close to audio packet read code
rtogni
parents:
2725
diff
changeset
|
731 rm_ac3_swap_bytes(st, pkt); |
194 | 732 } else { |
613 | 733 int seq=1; |
652 | 734 resync: |
613 | 735 len=sync(s, ×tamp, &flags, &i, &pos); |
612 | 736 if(len<0) |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2237
diff
changeset
|
737 return AVERROR(EIO); |
612 | 738 st = s->streams[i]; |
739 | |
4036
1349c277efbd
Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents:
4014
diff
changeset
|
740 if (ff_rm_parse_packet (s, s->pb, st, len, pkt, &seq, &flags, ×tamp) < 0) |
2722
65dcef6d93e1
Split out the packet parsing from the main function body in rmdec.c
benoit
parents:
2721
diff
changeset
|
741 goto resync; |
879 | 742 |
2937
f3070076d901
Remove some spaces to keep certain people's eyes from hurting.
diego
parents:
2904
diff
changeset
|
743 if((flags&2) && (seq&0x7F) == 1) |
2883 | 744 av_add_index_entry(st, pos, timestamp, 0, 0, AVINDEX_KEYFRAME); |
0 | 745 } |
746 | |
747 return 0; | |
748 } | |
749 | |
750 static int rm_read_close(AVFormatContext *s) | |
751 { | |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
752 RMDemuxContext *rm = s->priv_data; |
879 | 753 |
754 av_free(rm->audiobuf); | |
2653 | 755 av_free(rm->videobuf); |
0 | 756 return 0; |
757 } | |
758 | |
759 static int rm_probe(AVProbeData *p) | |
760 { | |
761 /* check file header */ | |
194 | 762 if ((p->buf[0] == '.' && p->buf[1] == 'R' && |
763 p->buf[2] == 'M' && p->buf[3] == 'F' && | |
764 p->buf[4] == 0 && p->buf[5] == 0) || | |
765 (p->buf[0] == '.' && p->buf[1] == 'r' && | |
766 p->buf[2] == 'a' && p->buf[3] == 0xfd)) | |
0 | 767 return AVPROBE_SCORE_MAX; |
768 else | |
769 return 0; | |
770 } | |
771 | |
885 | 772 static int64_t rm_read_dts(AVFormatContext *s, int stream_index, |
612 | 773 int64_t *ppos, int64_t pos_limit) |
774 { | |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
775 RMDemuxContext *rm = s->priv_data; |
612 | 776 int64_t pos, dts; |
613 | 777 int stream_index2, flags, len, h; |
612 | 778 |
779 pos = *ppos; | |
885 | 780 |
612 | 781 if(rm->old_format) |
782 return AV_NOPTS_VALUE; | |
783 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2770
diff
changeset
|
784 url_fseek(s->pb, pos, SEEK_SET); |
612 | 785 rm->remaining_len=0; |
786 for(;;){ | |
613 | 787 int seq=1; |
788 AVStream *st; | |
789 | |
790 len=sync(s, &dts, &flags, &stream_index2, &pos); | |
612 | 791 if(len<0) |
792 return AV_NOPTS_VALUE; | |
613 | 793 |
794 st = s->streams[stream_index2]; | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
795 if (st->codec->codec_type == CODEC_TYPE_VIDEO) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2770
diff
changeset
|
796 h= get_byte(s->pb); len--; |
613 | 797 if(!(h & 0x40)){ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2770
diff
changeset
|
798 seq = get_byte(s->pb); len--; |
612 | 799 } |
800 } | |
885 | 801 |
613 | 802 if((flags&2) && (seq&0x7F) == 1){ |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1441
diff
changeset
|
803 // av_log(s, AV_LOG_DEBUG, "%d %d-%d %"PRId64" %d\n", flags, stream_index2, stream_index, dts, seq); |
979 | 804 av_add_index_entry(st, pos, dts, 0, 0, AVINDEX_KEYFRAME); |
613 | 805 if(stream_index2 == stream_index) |
806 break; | |
807 } | |
808 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2770
diff
changeset
|
809 url_fskip(s->pb, len); |
612 | 810 } |
811 *ppos = pos; | |
812 return dts; | |
813 } | |
814 | |
1169 | 815 AVInputFormat rm_demuxer = { |
0 | 816 "rm", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3410
diff
changeset
|
817 NULL_IF_CONFIG_SMALL("RM format"), |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
818 sizeof(RMDemuxContext), |
0 | 819 rm_probe, |
820 rm_read_header, | |
821 rm_read_packet, | |
822 rm_read_close, | |
612 | 823 NULL, |
824 rm_read_dts, | |
0 | 825 }; |
3902
5f9bec099c69
Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents:
3874
diff
changeset
|
826 |
5f9bec099c69
Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents:
3874
diff
changeset
|
827 AVInputFormat rdt_demuxer = { |
5f9bec099c69
Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents:
3874
diff
changeset
|
828 "rdt", |
5f9bec099c69
Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents:
3874
diff
changeset
|
829 NULL_IF_CONFIG_SMALL("RDT demuxer"), |
4097
f8a743bd2df8
Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents:
4096
diff
changeset
|
830 sizeof(RMDemuxContext), |
3902
5f9bec099c69
Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents:
3874
diff
changeset
|
831 NULL, NULL, NULL, rm_read_close, NULL, NULL |
5f9bec099c69
Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents:
3874
diff
changeset
|
832 }; |