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