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