annotate rmdec.c @ 2412:a19cdec5d552 libavformat

Remove commented code (payload header extension)
author lucabe
date Wed, 29 Aug 2007 10:42:13 +0000
parents 8f90908f3c31
children 5faceca0b5d6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
2103
95139f2053a9 split rm muxer and demuxer in their own files
aurel
parents: 2024
diff changeset
2 * "Real" compatible demuxer.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
3 * Copyright (c) 2000, 2001 Fabrice Bellard.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1350
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1350
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21 #include "avformat.h"
2103
95139f2053a9 split rm muxer and demuxer in their own files
aurel
parents: 2024
diff changeset
22 #include "rm.h"
2189
da71207a7cf1 use new string functions
mru
parents: 2105
diff changeset
23 #include "avstring.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
25 static inline void get_strl(ByteIOContext *pb, char *buf, int buf_size, int len)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26 {
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
27 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
28 char *q, r;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
29
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
30 q = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31 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
32 r = get_byte(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 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
34 *q++ = r;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
35 }
2290
572f7077ba40 Fix get_str/get_str8() to also work if the target string is not long enough to
diego
parents: 2274
diff changeset
36 if (buf_size > 0) *q = '\0';
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
37 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
38
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
39 static void get_str16(ByteIOContext *pb, char *buf, int buf_size)
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
40 {
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
41 get_strl(pb, buf, buf_size, get_be16(pb));
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
42 }
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
43
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44 static void get_str8(ByteIOContext *pb, char *buf, int buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
45 {
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
46 get_strl(pb, buf, buf_size, get_byte(pb));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
47 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
48
1106
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
49 static int rm_read_audio_stream_info(AVFormatContext *s, AVStream *st,
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
50 int read_all)
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
51 {
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
52 RMContext *rm = s->priv_data;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
53 ByteIOContext *pb = &s->pb;
886
7ed1351f8c7e Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents: 885
diff changeset
54 char buf[256];
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
55 uint32_t version;
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
56 int i;
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
57
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
58 /* ra type header */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
59 version = get_be32(pb); /* version */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
60 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
61 int64_t startpos = url_ftell(pb);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
62 /* very old version */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
63 for(i = 0; i < 14; i++)
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
64 get_byte(pb);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
65 get_str8(pb, s->title, sizeof(s->title));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
66 get_str8(pb, s->author, sizeof(s->author));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
67 get_str8(pb, s->copyright, sizeof(s->copyright));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
68 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
69 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
70 // fourcc (should always be "lpcJ")
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
71 get_byte(pb);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
72 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
73 }
7ed1351f8c7e Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents: 885
diff changeset
74 // 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
75 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
76 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
77 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
78 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
79 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
80 st->codec->codec_id = CODEC_ID_RA_144;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
81 } else {
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
82 int flavor, sub_packet_h, coded_framesize, sub_packet_size;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
83 /* old version (4) */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
84 get_be32(pb); /* .ra4 */
687
561f27e36bc4 ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents: 652
diff changeset
85 get_be32(pb); /* data size */
561f27e36bc4 ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents: 652
diff changeset
86 get_be16(pb); /* version2 */
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
87 get_be32(pb); /* header size */
687
561f27e36bc4 ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents: 652
diff changeset
88 flavor= get_be16(pb); /* add codec info / flavor */
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
89 rm->coded_framesize = coded_framesize = get_be32(pb); /* coded frame size */
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
90 get_be32(pb); /* ??? */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
91 get_be32(pb); /* ??? */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
92 get_be32(pb); /* ??? */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
93 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
94 st->codec->block_align= get_be16(pb); /* frame size */
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
95 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
96 get_be16(pb); /* ??? */
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
97 if (((version >> 16) & 0xff) == 5) {
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
98 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
99 st->codec->sample_rate = get_be16(pb);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
100 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
101 st->codec->channels = get_be16(pb);
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
102 if (((version >> 16) & 0xff) == 5) {
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
103 get_be32(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
104 buf[0] = get_byte(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
105 buf[1] = get_byte(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
106 buf[2] = get_byte(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
107 buf[3] = get_byte(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
108 buf[4] = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
109 } else {
1441
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
110 get_str8(pb, buf, sizeof(buf)); /* desc */
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
111 get_str8(pb, buf, sizeof(buf)); /* desc */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
112 }
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->codec_type = CODEC_TYPE_AUDIO;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
114 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
115 st->codec->codec_id = CODEC_ID_AC3;
687
561f27e36bc4 ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents: 652
diff changeset
116 } 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
117 st->codec->codec_id = CODEC_ID_RA_288;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
118 st->codec->extradata_size= 0;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
119 rm->audio_framesize = st->codec->block_align;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
120 st->codec->block_align = coded_framesize;
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
121
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
122 if(rm->audio_framesize >= UINT_MAX / sub_packet_h){
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
123 av_log(s, AV_LOG_ERROR, "rm->audio_framesize * sub_packet_h too large\n");
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
124 return -1;
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
125 }
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
126
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
127 rm->audiobuf = av_malloc(rm->audio_framesize * sub_packet_h);
2024
8b400be65542 Atrac3 decoder.
banan
parents: 2001
diff changeset
128 } else if ((!strcmp(buf, "cook")) || (!strcmp(buf, "atrc"))) {
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
129 int codecdata_length, i;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
130 get_be16(pb); get_byte(pb);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
131 if (((version >> 16) & 0xff) == 5)
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
132 get_byte(pb);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
133 codecdata_length = get_be32(pb);
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
134 if(codecdata_length + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
135 av_log(s, AV_LOG_ERROR, "codecdata_length too large\n");
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
136 return -1;
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
137 }
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
138
2024
8b400be65542 Atrac3 decoder.
banan
parents: 2001
diff changeset
139 if (!strcmp(buf, "cook")) st->codec->codec_id = CODEC_ID_COOK;
8b400be65542 Atrac3 decoder.
banan
parents: 2001
diff changeset
140 else st->codec->codec_id = CODEC_ID_ATRAC3;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
141 st->codec->extradata_size= codecdata_length;
884
2ece9c9dd94c malloc padding to avoid reading past the malloc()ed area.
henry
parents: 879
diff changeset
142 st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
143 for(i = 0; i < codecdata_length; i++)
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
144 ((uint8_t*)st->codec->extradata)[i] = get_byte(pb);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
145 rm->audio_framesize = st->codec->block_align;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
146 st->codec->block_align = rm->sub_packet_size;
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
147
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
148 if(rm->audio_framesize >= UINT_MAX / sub_packet_h){
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
149 av_log(s, AV_LOG_ERROR, "rm->audio_framesize * sub_packet_h too large\n");
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
150 return -1;
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
151 }
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
152
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
153 rm->audiobuf = av_malloc(rm->audio_framesize * sub_packet_h);
1105
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
154 } else if (!strcmp(buf, "raac") || !strcmp(buf, "racp")) {
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
155 int codecdata_length, i;
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
156 get_be16(pb); get_byte(pb);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
157 if (((version >> 16) & 0xff) == 5)
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
158 get_byte(pb);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
159 st->codec->codec_id = CODEC_ID_AAC;
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
160 codecdata_length = get_be32(pb);
1106
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
161 if(codecdata_length + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
162 av_log(s, AV_LOG_ERROR, "codecdata_length too large\n");
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
163 return -1;
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
164 }
1105
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
165 if (codecdata_length >= 1) {
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
166 st->codec->extradata_size = codecdata_length - 1;
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
167 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
168 get_byte(pb);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
169 for(i = 0; i < st->codec->extradata_size; i++)
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
170 ((uint8_t*)st->codec->extradata)[i] = get_byte(pb);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
171 }
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
172 } 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
173 st->codec->codec_id = CODEC_ID_NONE;
2189
da71207a7cf1 use new string functions
mru
parents: 2105
diff changeset
174 av_strlcpy(st->codec->codec_name, buf, sizeof(st->codec->codec_name));
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
175 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
176 if (read_all) {
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
177 get_byte(pb);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
178 get_byte(pb);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
179 get_byte(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
180
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
181 get_str8(pb, s->title, sizeof(s->title));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
182 get_str8(pb, s->author, sizeof(s->author));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
183 get_str8(pb, s->copyright, sizeof(s->copyright));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
184 get_str8(pb, s->comment, sizeof(s->comment));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
185 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
186 }
1106
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
187 return 0;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
188 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
189
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
190 static int rm_read_header_old(AVFormatContext *s, AVFormatParameters *ap)
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
191 {
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
192 RMContext *rm = s->priv_data;
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
193 AVStream *st;
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
195 rm->old_format = 1;
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
196 st = av_new_stream(s, 0);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
197 if (!st)
1106
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
198 return -1;
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
199 return rm_read_audio_stream_info(s, st, 1);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
200 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
201
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
202 static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
203 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
204 RMContext *rm = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
205 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
206 ByteIOContext *pb = &s->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
207 unsigned int tag, v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
208 int tag_size, size, codec_data_size, i;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 33
diff changeset
209 int64_t codec_pos;
1350
f77cf5a063a8 Remove unused variables and the corresponding warnings along with them.
diego
parents: 1344
diff changeset
210 unsigned int start_time, duration;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
211 char buf[128];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212 int flags = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
214 tag = get_le32(pb);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
215 if (tag == MKTAG('.', 'r', 'a', 0xfd)) {
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
216 /* very old .ra format */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
217 return rm_read_header_old(s, ap);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
218 } else if (tag != MKTAG('.', 'R', 'M', 'F')) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2237
diff changeset
219 return AVERROR(EIO);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
220 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
221
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
222 get_be32(pb); /* header size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
223 get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
224 get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
225 get_be32(pb); /* number of headers */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
226
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
227 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
228 if (url_feof(pb))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
229 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
230 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
231 tag_size = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
232 get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
233 #if 0
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
234 printf("tag=%c%c%c%c (%08x) size=%d\n",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
235 (tag) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 (tag >> 8) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
237 (tag >> 16) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
238 (tag >> 24) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 tag,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
240 tag_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
241 #endif
736
82c34355e466 fixing broken_rv20_1mb_.rm
michael
parents: 708
diff changeset
242 if (tag_size < 10 && tag != MKTAG('D', 'A', 'T', 'A'))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 switch(tag) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 case MKTAG('P', 'R', 'O', 'P'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 /* file header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247 get_be32(pb); /* max bit rate */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248 get_be32(pb); /* avg bit rate */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249 get_be32(pb); /* max packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 get_be32(pb); /* avg packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
251 get_be32(pb); /* nb packets */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252 get_be32(pb); /* duration */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 get_be32(pb); /* preroll */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254 get_be32(pb); /* index offset */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 get_be32(pb); /* data offset */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 get_be16(pb); /* nb streams */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257 flags = get_be16(pb); /* flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
259 case MKTAG('C', 'O', 'N', 'T'):
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
260 get_str16(pb, s->title, sizeof(s->title));
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
261 get_str16(pb, s->author, sizeof(s->author));
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
262 get_str16(pb, s->copyright, sizeof(s->copyright));
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
263 get_str16(pb, s->comment, sizeof(s->comment));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
264 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 case MKTAG('M', 'D', 'P', 'R'):
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 85
diff changeset
266 st = av_new_stream(s, 0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 if (!st)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 st->id = get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 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
271 st->codec->bit_rate = get_be32(pb); /* bit rate */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272 get_be32(pb); /* max packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273 get_be32(pb); /* avg packet size */
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 85
diff changeset
274 start_time = get_be32(pb); /* start time */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 get_be32(pb); /* preroll */
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 85
diff changeset
276 duration = get_be32(pb); /* duration */
743
af4e24d6310c switch to native time bases
michael
parents: 736
diff changeset
277 st->start_time = start_time;
af4e24d6310c switch to native time bases
michael
parents: 736
diff changeset
278 st->duration = duration;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
279 get_str8(pb, buf, sizeof(buf)); /* desc */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
280 get_str8(pb, buf, sizeof(buf)); /* mimetype */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
281 codec_data_size = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
282 codec_pos = 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
283 st->codec->codec_type = CODEC_TYPE_DATA;
607
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
284 av_set_pts_info(st, 64, 1, 1000);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
285
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
286 v = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
287 if (v == MKTAG(0xfd, 'a', 'r', '.')) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 /* ra type header */
1106
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
289 if (rm_read_audio_stream_info(s, st, 0))
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
290 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291 } else {
604
ed2709c1f49c next try at fixing rv20 decoding
michael
parents: 593
diff changeset
292 int fps, fps2;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
293 if (get_le32(pb) != MKTAG('V', 'I', 'D', 'O')) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 fail1:
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
295 av_log(st->codec, AV_LOG_ERROR, "Unsupported video codec\n");
593
a1f354e84965 skip unknown streams instead of failing
michael
parents: 592
diff changeset
296 goto skip;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
298 st->codec->codec_tag = get_le32(pb);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
299 // av_log(NULL, AV_LOG_DEBUG, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0'));
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
300 if ( st->codec->codec_tag != MKTAG('R', 'V', '1', '0')
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
301 && st->codec->codec_tag != MKTAG('R', 'V', '2', '0')
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
302 && st->codec->codec_tag != MKTAG('R', 'V', '3', '0')
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
303 && st->codec->codec_tag != MKTAG('R', 'V', '4', '0'))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304 goto fail1;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
305 st->codec->width = get_be16(pb);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
306 st->codec->height = get_be16(pb);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
307 st->codec->time_base.num= 1;
604
ed2709c1f49c next try at fixing rv20 decoding
michael
parents: 593
diff changeset
308 fps= 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
309 st->codec->codec_type = CODEC_TYPE_VIDEO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
310 get_be32(pb);
604
ed2709c1f49c next try at fixing rv20 decoding
michael
parents: 593
diff changeset
311 fps2= get_be16(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
312 get_be16(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
313
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
314 st->codec->extradata_size= codec_data_size - (url_ftell(pb) - codec_pos);
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
315
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
316 if(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)st->codec->extradata_size){
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
317 //check is redundant as get_buffer() will catch this
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
318 av_log(s, AV_LOG_ERROR, "st->codec->extradata_size too large\n");
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
319 return -1;
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
320 }
884
2ece9c9dd94c malloc padding to avoid reading past the malloc()ed area.
henry
parents: 879
diff changeset
321 st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
322 get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
323
604
ed2709c1f49c next try at fixing rv20 decoding
michael
parents: 593
diff changeset
324 // av_log(NULL, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
325 st->codec->time_base.den = fps * st->codec->time_base.num;
1344
770363b669aa dont set sub_id as its completly redundant and silly
michael
parents: 1169
diff changeset
326 switch(((uint8_t*)st->codec->extradata)[4]>>4){
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
327 case 1: st->codec->codec_id = CODEC_ID_RV10; break;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
328 case 2: st->codec->codec_id = CODEC_ID_RV20; break;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
329 case 3: st->codec->codec_id = CODEC_ID_RV30; break;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
330 case 4: st->codec->codec_id = CODEC_ID_RV40; break;
638
5188094c6ec4 RV30/RV40 demuxing (untested)
michael
parents: 632
diff changeset
331 default: goto fail1;
5188094c6ec4 RV30/RV40 demuxing (untested)
michael
parents: 632
diff changeset
332 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
333 }
593
a1f354e84965 skip unknown streams instead of failing
michael
parents: 592
diff changeset
334 skip:
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
335 /* skip codec info */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
336 size = url_ftell(pb) - codec_pos;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
337 url_fskip(pb, codec_data_size - size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
338 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
339 case MKTAG('D', 'A', 'T', 'A'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
340 goto header_end;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
341 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
342 /* unknown tag: skip it */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343 url_fskip(pb, tag_size - 10);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
345 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
346 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
347 header_end:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
348 rm->nb_packets = get_be32(pb); /* number of packets */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
349 if (!rm->nb_packets && (flags & 4))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 rm->nb_packets = 3600 * 25;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351 get_be32(pb); /* next data header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
352 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354 fail:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
355 for(i=0;i<s->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
356 av_free(s->streams[i]);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
357 }
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2237
diff changeset
358 return AVERROR(EIO);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
359 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
360
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
361 static int get_num(ByteIOContext *pb, int *len)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
362 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
363 int n, n1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
364
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
365 n = get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
366 (*len)-=2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
367 if (n >= 0x4000) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
368 return n - 0x4000;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
369 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
370 n1 = get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
371 (*len)-=2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
372 return (n << 16) | n1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
373 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
374 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
375
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
376 /* multiple of 20 bytes for ra144 (ugly) */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
377 #define RAW_PACKET_SIZE 1000
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
378
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
379 static int sync(AVFormatContext *s, int64_t *timestamp, int *flags, int *stream_index, int64_t *pos){
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
380 RMContext *rm = s->priv_data;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
381 ByteIOContext *pb = &s->pb;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
382 int len, num, res, i;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
383 AVStream *st;
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
384 uint32_t state=0xFFFFFFFF;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
385
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
386 while(!url_feof(pb)){
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
387 *pos= url_ftell(pb);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
388 if(rm->remaining_len > 0){
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
389 num= rm->current_stream;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
390 len= rm->remaining_len;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
391 *timestamp = AV_NOPTS_VALUE;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
392 *flags= 0;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
393 }else{
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
394 state= (state<<8) + get_byte(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
395
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
396 if(state == MKBETAG('I', 'N', 'D', 'X')){
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
397 len = get_be16(pb) - 6;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
398 if(len<0)
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
399 continue;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
400 goto skip;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
401 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
402
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
403 if(state > (unsigned)0xFFFF || state < 12)
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
404 continue;
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
405 len=state;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
406 state= 0xFFFFFFFF;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
407
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
408 num = get_be16(pb);
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
409 *timestamp = get_be32(pb);
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
410 res= get_byte(pb); /* reserved */
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
411 *flags = get_byte(pb); /* flags */
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
412
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
413
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
414 len -= 12;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
415 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
416 for(i=0;i<s->nb_streams;i++) {
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
417 st = s->streams[i];
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
418 if (num == st->id)
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
419 break;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
420 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
421 if (i == s->nb_streams) {
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
422 skip:
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
423 /* skip packet if unknown number */
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
424 url_fskip(pb, len);
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
425 rm->remaining_len -= len;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
426 continue;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
427 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
428 *stream_index= i;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
429
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
430 return len;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
431 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
432 return -1;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
433 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
434
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
435 static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
436 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
437 RMContext *rm = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
438 ByteIOContext *pb = &s->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
439 AVStream *st;
2105
f42ab3fae0ec use FFSWAP()
aurel
parents: 2104
diff changeset
440 int i, len, j;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
441 int64_t timestamp, pos;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 33
diff changeset
442 uint8_t *ptr;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
443 int flags;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
444
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
445 if (rm->audio_pkt_cnt) {
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
446 // If there are queued audio packet return them first
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
447 st = s->streams[rm->audio_stream_num];
1105
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
448 if (st->codec->codec_id == CODEC_ID_AAC)
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
449 av_get_packet(pb, pkt, rm->sub_packet_lengths[rm->sub_packet_cnt - rm->audio_pkt_cnt]);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
450 else {
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
451 av_new_packet(pkt, st->codec->block_align);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
452 memcpy(pkt->data, rm->audiobuf + st->codec->block_align *
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
453 (rm->sub_packet_h * rm->audio_framesize / st->codec->block_align - rm->audio_pkt_cnt),
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
454 st->codec->block_align);
1105
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
455 }
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
456 rm->audio_pkt_cnt--;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
457 pkt->flags = 0;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
458 pkt->stream_index = rm->audio_stream_num;
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
459 } else if (rm->old_format) {
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
460 st = s->streams[0];
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
461 if (st->codec->codec_id == CODEC_ID_RA_288) {
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
462 int x, y;
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
463
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
464 for (y = 0; y < rm->sub_packet_h; y++)
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
465 for (x = 0; x < rm->sub_packet_h/2; x++)
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
466 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
467 return AVERROR(EIO);
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
468 rm->audio_stream_num = 0;
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
469 rm->audio_pkt_cnt = rm->sub_packet_h * rm->audio_framesize / st->codec->block_align - 1;
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
470 // Release first audio packet
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
471 av_new_packet(pkt, st->codec->block_align);
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
472 memcpy(pkt->data, rm->audiobuf, st->codec->block_align);
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
473 pkt->flags |= PKT_FLAG_KEY; // Mark first packet as keyframe
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
474 pkt->stream_index = 0;
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
475 } else {
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
476 /* just read raw bytes */
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
477 len = RAW_PACKET_SIZE;
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
478 len= av_get_packet(pb, pkt, len);
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
479 pkt->stream_index = 0;
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
480 if (len <= 0) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2237
diff changeset
481 return AVERROR(EIO);
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
482 }
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
483 pkt->size = len;
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
484 }
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
485 } else {
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
486 int seq=1;
652
b47948262721 support discarding uninterresting packets
michael
parents: 638
diff changeset
487 resync:
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
488 len=sync(s, &timestamp, &flags, &i, &pos);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
489 if(len<0)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2237
diff changeset
490 return AVERROR(EIO);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
491 st = s->streams[i];
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
492
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
493 if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
609
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
494 int h, pic_num, len2, pos;
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
495
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
496 h= get_byte(pb); len--;
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
497 if(!(h & 0x40)){
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
498 seq = get_byte(pb); len--;
609
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
499 }
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
500
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
501 if((h & 0xc0) == 0x40){
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
502 len2= pos= 0;
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
503 }else{
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
504 len2 = get_num(pb, &len);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
505 pos = get_num(pb, &len);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
506 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
507 /* picture number */
609
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
508 pic_num= get_byte(pb); len--;
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
509 rm->remaining_len= len;
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
510 rm->current_stream= st->id;
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
511
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
512 // av_log(NULL, AV_LOG_DEBUG, "%X len:%d pos:%d len2:%d pic_num:%d\n",h, len, pos, len2, pic_num);
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
513 if(len2 && len2<len)
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
514 len=len2;
2f0de265bc5e various demuxer fixes
michael
parents: 608
diff changeset
515 rm->remaining_len-= len;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
516 av_get_packet(pb, pkt, len);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
517
1970
a27976be3394 Do not return invalid pointer for non-audio or video streams.
rtogni
parents: 1443
diff changeset
518 } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
519 if ((st->codec->codec_id == CODEC_ID_RA_288) ||
2024
8b400be65542 Atrac3 decoder.
banan
parents: 2001
diff changeset
520 (st->codec->codec_id == CODEC_ID_COOK) ||
8b400be65542 Atrac3 decoder.
banan
parents: 2001
diff changeset
521 (st->codec->codec_id == CODEC_ID_ATRAC3)) {
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
522 int x;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
523 int sps = rm->sub_packet_size;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
524 int cfs = rm->coded_framesize;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
525 int h = rm->sub_packet_h;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
526 int y = rm->sub_packet_cnt;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
527 int w = rm->audio_framesize;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
528
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
529 if (flags & 2)
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
530 y = rm->sub_packet_cnt = 0;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
531 if (!y)
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
532 rm->audiotimestamp = timestamp;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
533
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
534 switch(st->codec->codec_id) {
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
535 case CODEC_ID_RA_288:
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
536 for (x = 0; x < h/2; x++)
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
537 get_buffer(pb, rm->audiobuf+x*2*w+y*cfs, cfs);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
538 break;
2024
8b400be65542 Atrac3 decoder.
banan
parents: 2001
diff changeset
539 case CODEC_ID_ATRAC3:
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
540 case CODEC_ID_COOK:
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
541 for (x = 0; x < w/sps; x++)
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
542 get_buffer(pb, rm->audiobuf+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
543 break;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
544 }
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
545
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
546 if (++(rm->sub_packet_cnt) < h)
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
547 goto resync;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
548 else {
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
549 rm->sub_packet_cnt = 0;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
550 rm->audio_stream_num = i;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
551 rm->audio_pkt_cnt = h * w / st->codec->block_align - 1;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
552 // Release first audio packet
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
553 av_new_packet(pkt, st->codec->block_align);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
554 memcpy(pkt->data, rm->audiobuf, st->codec->block_align);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
555 timestamp = rm->audiotimestamp;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
556 flags = 2; // Mark first packet as keyframe
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
557 }
1105
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
558 } else if (st->codec->codec_id == CODEC_ID_AAC) {
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
559 int x;
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
560 rm->audio_stream_num = i;
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
561 rm->sub_packet_cnt = (get_be16(pb) & 0xf0) >> 4;
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
562 if (rm->sub_packet_cnt) {
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
563 for (x = 0; x < rm->sub_packet_cnt; x++)
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
564 rm->sub_packet_lengths[x] = get_be16(pb);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
565 // Release first audio packet
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
566 rm->audio_pkt_cnt = rm->sub_packet_cnt - 1;
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
567 av_get_packet(pb, pkt, rm->sub_packet_lengths[0]);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
568 flags = 2; // Mark first packet as keyframe
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
569 }
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
570 } else
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
571 av_get_packet(pb, pkt, len);
1970
a27976be3394 Do not return invalid pointer for non-audio or video streams.
rtogni
parents: 1443
diff changeset
572
a27976be3394 Do not return invalid pointer for non-audio or video streams.
rtogni
parents: 1443
diff changeset
573 } else
a27976be3394 Do not return invalid pointer for non-audio or video streams.
rtogni
parents: 1443
diff changeset
574 av_get_packet(pb, pkt, len);
652
b47948262721 support discarding uninterresting packets
michael
parents: 638
diff changeset
575
708
d79164865a7c more fine grained discarding of packets
michael
parents: 688
diff changeset
576 if( (st->discard >= AVDISCARD_NONKEY && !(flags&2))
d79164865a7c more fine grained discarding of packets
michael
parents: 688
diff changeset
577 || st->discard >= AVDISCARD_ALL){
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
578 av_free_packet(pkt);
652
b47948262721 support discarding uninterresting packets
michael
parents: 638
diff changeset
579 goto resync;
b47948262721 support discarding uninterresting packets
michael
parents: 638
diff changeset
580 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
581
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
582 pkt->stream_index = i;
607
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
583
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
584 #if 0
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
585 if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
586 if(st->codec->codec_id == CODEC_ID_RV20){
607
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
587 int seq= 128*(pkt->data[2]&0x7F) + (pkt->data[3]>>1);
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
588 av_log(NULL, AV_LOG_DEBUG, "%d %"PRId64" %d\n", timestamp, timestamp*512LL/25, seq);
607
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
589
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
590 seq |= (timestamp&~0x3FFF);
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
591 if(seq - timestamp > 0x2000) seq -= 0x4000;
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
592 if(seq - timestamp < -0x2000) seq += 0x4000;
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
593 }
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
594 }
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
595 #endif
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
596 pkt->pts= timestamp;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
597 if(flags&2){
607
fce9fc3a0f17 timestamp fix
michael
parents: 604
diff changeset
598 pkt->flags |= PKT_FLAG_KEY;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
599 if((seq&0x7F) == 1)
979
d2e5dfdf4def add size to AVIndex
michael
parents: 896
diff changeset
600 av_add_index_entry(st, pos, timestamp, 0, 0, AVINDEX_KEYFRAME);
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
601 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
602 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
603
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
604 /* for AC3, needs to swap bytes */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
605 if (st->codec->codec_id == CODEC_ID_AC3) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
606 ptr = pkt->data;
2237
db097a051c65 avoid uninitialised variable warning and clarify code
mru
parents: 2189
diff changeset
607 for(j=0;j<pkt->size;j+=2) {
2105
f42ab3fae0ec use FFSWAP()
aurel
parents: 2104
diff changeset
608 FFSWAP(int, ptr[0], ptr[1]);
2104
ebf61cad0b61 cosmetics: indentation
aurel
parents: 2103
diff changeset
609 ptr += 2;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
610 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
611 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
612 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
613 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
614
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
615 static int rm_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
616 {
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
617 RMContext *rm = s->priv_data;
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
618
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
619 av_free(rm->audiobuf);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
620 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
621 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
622
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
623 static int rm_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
624 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
625 /* check file header */
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
626 if ((p->buf[0] == '.' && p->buf[1] == 'R' &&
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
627 p->buf[2] == 'M' && p->buf[3] == 'F' &&
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
628 p->buf[4] == 0 && p->buf[5] == 0) ||
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
629 (p->buf[0] == '.' && p->buf[1] == 'r' &&
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
630 p->buf[2] == 'a' && p->buf[3] == 0xfd))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
631 return AVPROBE_SCORE_MAX;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
632 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
633 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
634 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
635
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
636 static int64_t rm_read_dts(AVFormatContext *s, int stream_index,
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
637 int64_t *ppos, int64_t pos_limit)
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
638 {
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
639 RMContext *rm = s->priv_data;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
640 int64_t pos, dts;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
641 int stream_index2, flags, len, h;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
642
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
643 pos = *ppos;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
644
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
645 if(rm->old_format)
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
646 return AV_NOPTS_VALUE;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
647
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
648 url_fseek(&s->pb, pos, SEEK_SET);
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
649 rm->remaining_len=0;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
650 for(;;){
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
651 int seq=1;
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
652 AVStream *st;
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
653
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
654 len=sync(s, &dts, &flags, &stream_index2, &pos);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
655 if(len<0)
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
656 return AV_NOPTS_VALUE;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
657
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
658 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
659 if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
660 h= get_byte(&s->pb); len--;
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
661 if(!(h & 0x40)){
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
662 seq = get_byte(&s->pb); len--;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
663 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
664 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
665
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
666 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
667 // av_log(s, AV_LOG_DEBUG, "%d %d-%d %"PRId64" %d\n", flags, stream_index2, stream_index, dts, seq);
979
d2e5dfdf4def add size to AVIndex
michael
parents: 896
diff changeset
668 av_add_index_entry(st, pos, dts, 0, 0, AVINDEX_KEYFRAME);
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
669 if(stream_index2 == stream_index)
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
670 break;
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
671 }
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
672
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
673 url_fskip(&s->pb, len);
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
674 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
675 *ppos = pos;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
676 return dts;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
677 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
678
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
679 AVInputFormat rm_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
680 "rm",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
681 "rm format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
682 sizeof(RMContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
683 rm_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
684 rm_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
685 rm_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
686 rm_read_close,
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
687 NULL,
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
688 rm_read_dts,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
689 };