Mercurial > libavcodec.hg
annotate ws-snd1.c @ 12494:94eaea836bf4 libavcodec
Check avctx width/height more thoroughly (e.g. all values 0 except width would
have been accepted before).
Also do not fail if they are invalid but instead override them to 0.
This allows decoding e.g. MPEG video when only the container values are corrupted.
For encoding a value of 0,0 of course makes no sense, but was allowed
through before and will be caught by an extra check in the encode function.
author | reimar |
---|---|
date | Wed, 15 Sep 2010 04:46:55 +0000 |
parents | 7915312dd862 |
children |
rev | line source |
---|---|
2585 | 1 /* |
2 * Westwood SNDx codecs | |
3 * Copyright (c) 2005 Konstantin Shishkov | |
4 * | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
5 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
6 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
2585 | 8 * modify it under the terms of the GNU Lesser General Public |
9 * License as published by the Free Software Foundation; either | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
2585 | 11 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
2585 | 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 | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2967
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2585 | 20 */ |
8573
2acf0ae7b041
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents:
7451
diff
changeset
|
21 |
12434
7915312dd862
Include stdint.h instead of inttypes.h, it is enough for what this file need.
vitor
parents:
12433
diff
changeset
|
22 #include <stdint.h> |
8573
2acf0ae7b041
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents:
7451
diff
changeset
|
23 #include "libavutil/intreadwrite.h" |
2585 | 24 #include "avcodec.h" |
25 | |
26 /** | |
11644
7dd2a45249a9
Remove explicit filename from Doxygen @file commands.
diego
parents:
11560
diff
changeset
|
27 * @file |
2585 | 28 * Westwood SNDx codecs. |
29 * | |
30 * Reference documents about VQA format and its audio codecs | |
31 * can be found here: | |
32 * http://www.multimedia.cx | |
33 */ | |
34 | |
12433 | 35 static const int8_t ws_adpcm_2bit[] = { -2, -1, 0, 1}; |
36 static const int8_t ws_adpcm_4bit[] = { | |
2585 | 37 -9, -8, -6, -5, -4, -3, -2, -1, |
38 0, 1, 2, 3, 4, 5, 6, 8 }; | |
39 | |
40 #define CLIP8(a) if(a>127)a=127;if(a<-128)a=-128; | |
41 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6299
diff
changeset
|
42 static av_cold int ws_snd_decode_init(AVCodecContext * avctx) |
2585 | 43 { |
44 // WSSNDContext *c = avctx->priv_data; | |
2967 | 45 |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7040
diff
changeset
|
46 avctx->sample_fmt = SAMPLE_FMT_S16; |
2585 | 47 return 0; |
48 } | |
49 | |
50 static int ws_snd_decode_frame(AVCodecContext *avctx, | |
51 void *data, int *data_size, | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
52 AVPacket *avpkt) |
2585 | 53 { |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
54 const uint8_t *buf = avpkt->data; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
55 int buf_size = avpkt->size; |
2585 | 56 // WSSNDContext *c = avctx->priv_data; |
2967 | 57 |
2585 | 58 int in_size, out_size; |
59 int sample = 0; | |
60 int i; | |
61 short *samples = data; | |
2967 | 62 |
2585 | 63 if (!buf_size) |
64 return 0; | |
65 | |
4364 | 66 out_size = AV_RL16(&buf[0]); |
2585 | 67 *data_size = out_size * 2; |
4364 | 68 in_size = AV_RL16(&buf[2]); |
2585 | 69 buf += 4; |
2967 | 70 |
5674
ca944f1db2b3
Add checks on input/output buffers size for some audio decoders
kostya
parents:
4364
diff
changeset
|
71 if (out_size > *data_size) { |
ca944f1db2b3
Add checks on input/output buffers size for some audio decoders
kostya
parents:
4364
diff
changeset
|
72 av_log(avctx, AV_LOG_ERROR, "Frame is too large to fit in buffer\n"); |
ca944f1db2b3
Add checks on input/output buffers size for some audio decoders
kostya
parents:
4364
diff
changeset
|
73 return -1; |
ca944f1db2b3
Add checks on input/output buffers size for some audio decoders
kostya
parents:
4364
diff
changeset
|
74 } |
ca944f1db2b3
Add checks on input/output buffers size for some audio decoders
kostya
parents:
4364
diff
changeset
|
75 if (in_size > buf_size) { |
ca944f1db2b3
Add checks on input/output buffers size for some audio decoders
kostya
parents:
4364
diff
changeset
|
76 av_log(avctx, AV_LOG_ERROR, "Frame data is larger than input buffer\n"); |
ca944f1db2b3
Add checks on input/output buffers size for some audio decoders
kostya
parents:
4364
diff
changeset
|
77 return -1; |
ca944f1db2b3
Add checks on input/output buffers size for some audio decoders
kostya
parents:
4364
diff
changeset
|
78 } |
2585 | 79 if (in_size == out_size) { |
80 for (i = 0; i < out_size; i++) | |
81 *samples++ = (*buf++ - 0x80) << 8; | |
82 return buf_size; | |
83 } | |
2967 | 84 |
2585 | 85 while (out_size > 0) { |
86 int code; | |
87 uint8_t count; | |
88 code = (*buf) >> 6; | |
89 count = (*buf) & 0x3F; | |
90 buf++; | |
91 switch(code) { | |
92 case 0: /* ADPCM 2-bit */ | |
93 for (count++; count > 0; count--) { | |
94 code = *buf++; | |
95 sample += ws_adpcm_2bit[code & 0x3]; | |
96 CLIP8(sample); | |
97 *samples++ = sample << 8; | |
98 sample += ws_adpcm_2bit[(code >> 2) & 0x3]; | |
99 CLIP8(sample); | |
100 *samples++ = sample << 8; | |
101 sample += ws_adpcm_2bit[(code >> 4) & 0x3]; | |
102 CLIP8(sample); | |
103 *samples++ = sample << 8; | |
104 sample += ws_adpcm_2bit[(code >> 6) & 0x3]; | |
105 CLIP8(sample); | |
106 *samples++ = sample << 8; | |
107 out_size -= 4; | |
108 } | |
109 break; | |
110 case 1: /* ADPCM 4-bit */ | |
111 for (count++; count > 0; count--) { | |
112 code = *buf++; | |
113 sample += ws_adpcm_4bit[code & 0xF]; | |
114 CLIP8(sample); | |
115 *samples++ = sample << 8; | |
116 sample += ws_adpcm_4bit[code >> 4]; | |
117 CLIP8(sample); | |
118 *samples++ = sample << 8; | |
119 out_size -= 2; | |
120 } | |
121 break; | |
122 case 2: /* no compression */ | |
123 if (count & 0x20) { /* big delta */ | |
12433 | 124 int8_t t; |
2585 | 125 t = count; |
126 t <<= 3; | |
127 sample += t >> 3; | |
128 *samples++ = sample << 8; | |
129 out_size--; | |
130 } else { /* copy */ | |
131 for (count++; count > 0; count--) { | |
132 *samples++ = (*buf++ - 0x80) << 8; | |
133 out_size--; | |
134 } | |
135 sample = buf[-1] - 0x80; | |
136 } | |
137 break; | |
138 default: /* run */ | |
139 for(count++; count > 0; count--) { | |
140 *samples++ = sample << 8; | |
141 out_size--; | |
142 } | |
143 } | |
144 } | |
2967 | 145 |
2585 | 146 return buf_size; |
147 } | |
148 | |
149 AVCodec ws_snd1_decoder = { | |
150 "ws_snd1", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
9355
diff
changeset
|
151 AVMEDIA_TYPE_AUDIO, |
2585 | 152 CODEC_ID_WESTWOOD_SND1, |
4019 | 153 0, |
2585 | 154 ws_snd_decode_init, |
155 NULL, | |
156 NULL, | |
157 ws_snd_decode_frame, | |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6717
diff
changeset
|
158 .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"), |
2585 | 159 }; |