Mercurial > libavcodec.hg
annotate bmp.c @ 11352:6e0af2cfdcfe libavcodec
Do MC and IDCT in coding (hilbert) order
This increases the slice size to 64 pixels, due to having to decode an
entire chroma superblock row per slice.
This can be up to 6% slower depending on clip and CPU, but is necessary
for future optimizations that gain significantly more than was lost.
author | conrad |
---|---|
date | Wed, 03 Mar 2010 23:27:40 +0000 |
parents | 3b0a2384ff9f |
children | 8a4984c5cacc |
rev | line source |
---|---|
2949 | 1 /* |
4415
f792b146869b
Segregate code common to BMP decoder and future encoder
diego
parents:
4394
diff
changeset
|
2 * BMP image format decoder |
2949 | 3 * Copyright (c) 2005 Mans Rullgard |
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 |
2949 | 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. |
2949 | 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, |
2949 | 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 |
2949 | 20 */ |
21 | |
22 #include "avcodec.h" | |
4439
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
23 #include "bytestream.h" |
4415
f792b146869b
Segregate code common to BMP decoder and future encoder
diego
parents:
4394
diff
changeset
|
24 #include "bmp.h" |
7910 | 25 #include "msrledec.h" |
2949 | 26 |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6265
diff
changeset
|
27 static av_cold int bmp_decode_init(AVCodecContext *avctx){ |
2949 | 28 BMPContext *s = avctx->priv_data; |
29 | |
30 avcodec_get_frame_defaults((AVFrame*)&s->picture); | |
31 avctx->coded_frame = (AVFrame*)&s->picture; | |
32 | |
33 return 0; | |
34 } | |
35 | |
2967 | 36 static int bmp_decode_frame(AVCodecContext *avctx, |
2949 | 37 void *data, int *data_size, |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9261
diff
changeset
|
38 AVPacket *avpkt) |
2949 | 39 { |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9261
diff
changeset
|
40 const uint8_t *buf = avpkt->data; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9261
diff
changeset
|
41 int buf_size = avpkt->size; |
2949 | 42 BMPContext *s = avctx->priv_data; |
43 AVFrame *picture = data; | |
44 AVFrame *p = &s->picture; | |
45 unsigned int fsize, hsize; | |
46 int width, height; | |
47 unsigned int depth; | |
4393 | 48 BiCompression comp; |
2949 | 49 unsigned int ihsize; |
50 int i, j, n, linesize; | |
51 uint32_t rgb[3]; | |
52 uint8_t *ptr; | |
53 int dsize; | |
6265 | 54 const uint8_t *buf0 = buf; |
2949 | 55 |
56 if(buf_size < 14){ | |
57 av_log(avctx, AV_LOG_ERROR, "buf size too small (%d)\n", buf_size); | |
58 return -1; | |
59 } | |
60 | |
4439
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
61 if(bytestream_get_byte(&buf) != 'B' || |
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
62 bytestream_get_byte(&buf) != 'M') { |
2949 | 63 av_log(avctx, AV_LOG_ERROR, "bad magic number\n"); |
64 return -1; | |
65 } | |
66 | |
4439
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
67 fsize = bytestream_get_le32(&buf); |
2949 | 68 if(buf_size < fsize){ |
8945
3ce78c919959
Make BMP decoder try to decode files with incorrect filesize field value
kostya
parents:
8720
diff
changeset
|
69 av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d), trying to decode anyway\n", |
2949 | 70 buf_size, fsize); |
8945
3ce78c919959
Make BMP decoder try to decode files with incorrect filesize field value
kostya
parents:
8720
diff
changeset
|
71 fsize = buf_size; |
2949 | 72 } |
73 | |
4439
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
74 buf += 2; /* reserved1 */ |
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
75 buf += 2; /* reserved2 */ |
2949 | 76 |
4439
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
77 hsize = bytestream_get_le32(&buf); /* header size */ |
8204
507854688c43
Some BMP files have file size declared in the header equal to headers size
kostya
parents:
8203
diff
changeset
|
78 ihsize = bytestream_get_le32(&buf); /* more header size */ |
507854688c43
Some BMP files have file size declared in the header equal to headers size
kostya
parents:
8203
diff
changeset
|
79 if(ihsize + 14 > hsize){ |
507854688c43
Some BMP files have file size declared in the header equal to headers size
kostya
parents:
8203
diff
changeset
|
80 av_log(avctx, AV_LOG_ERROR, "invalid header size %d\n", hsize); |
507854688c43
Some BMP files have file size declared in the header equal to headers size
kostya
parents:
8203
diff
changeset
|
81 return -1; |
507854688c43
Some BMP files have file size declared in the header equal to headers size
kostya
parents:
8203
diff
changeset
|
82 } |
507854688c43
Some BMP files have file size declared in the header equal to headers size
kostya
parents:
8203
diff
changeset
|
83 |
507854688c43
Some BMP files have file size declared in the header equal to headers size
kostya
parents:
8203
diff
changeset
|
84 /* sometimes file size is set to some headers size, set a real size in that case */ |
507854688c43
Some BMP files have file size declared in the header equal to headers size
kostya
parents:
8203
diff
changeset
|
85 if(fsize == 14 || fsize == ihsize + 14) |
507854688c43
Some BMP files have file size declared in the header equal to headers size
kostya
parents:
8203
diff
changeset
|
86 fsize = buf_size - 2; |
507854688c43
Some BMP files have file size declared in the header equal to headers size
kostya
parents:
8203
diff
changeset
|
87 |
2949 | 88 if(fsize <= hsize){ |
8203
3b90f93d97a6
Give more meaningful message on BMP header parsing error
kostya
parents:
8202
diff
changeset
|
89 av_log(avctx, AV_LOG_ERROR, "declared file size is less than header size (%d < %d)\n", |
2949 | 90 fsize, hsize); |
91 return -1; | |
92 } | |
93 | |
8202 | 94 switch(ihsize){ |
95 case 40: // windib v3 | |
96 case 64: // OS/2 v2 | |
97 case 108: // windib v4 | |
98 case 124: // windib v5 | |
6595 | 99 width = bytestream_get_le32(&buf); |
100 height = bytestream_get_le32(&buf); | |
8202 | 101 break; |
102 case 12: // OS/2 v1 | |
6594 | 103 width = bytestream_get_le16(&buf); |
104 height = bytestream_get_le16(&buf); | |
8202 | 105 break; |
106 default: | |
7887 | 107 av_log(avctx, AV_LOG_ERROR, "unsupported BMP file, patch welcome\n"); |
6594 | 108 return -1; |
109 } | |
2949 | 110 |
4439
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
111 if(bytestream_get_le16(&buf) != 1){ /* planes */ |
2949 | 112 av_log(avctx, AV_LOG_ERROR, "invalid BMP header\n"); |
113 return -1; | |
114 } | |
115 | |
4439
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
116 depth = bytestream_get_le16(&buf); |
2949 | 117 |
6594 | 118 if(ihsize == 40) |
4439
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
119 comp = bytestream_get_le32(&buf); |
2949 | 120 else |
121 comp = BMP_RGB; | |
122 | |
7910 | 123 if(comp != BMP_RGB && comp != BMP_BITFIELDS && comp != BMP_RLE4 && comp != BMP_RLE8){ |
2949 | 124 av_log(avctx, AV_LOG_ERROR, "BMP coding %d not supported\n", comp); |
125 return -1; | |
126 } | |
127 | |
128 if(comp == BMP_BITFIELDS){ | |
4439
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
129 buf += 20; |
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
130 rgb[0] = bytestream_get_le32(&buf); |
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
131 rgb[1] = bytestream_get_le32(&buf); |
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
132 rgb[2] = bytestream_get_le32(&buf); |
2949 | 133 } |
134 | |
135 avctx->width = width; | |
136 avctx->height = height > 0? height: -height; | |
137 | |
138 avctx->pix_fmt = PIX_FMT_NONE; | |
139 | |
140 switch(depth){ | |
141 case 32: | |
142 if(comp == BMP_BITFIELDS){ | |
143 rgb[0] = (rgb[0] >> 15) & 3; | |
144 rgb[1] = (rgb[1] >> 15) & 3; | |
145 rgb[2] = (rgb[2] >> 15) & 3; | |
146 | |
147 if(rgb[0] + rgb[1] + rgb[2] != 3 || | |
148 rgb[0] == rgb[1] || rgb[0] == rgb[2] || rgb[1] == rgb[2]){ | |
149 break; | |
150 } | |
151 } else { | |
152 rgb[0] = 2; | |
153 rgb[1] = 1; | |
154 rgb[2] = 0; | |
155 } | |
156 | |
157 avctx->pix_fmt = PIX_FMT_BGR24; | |
158 break; | |
159 case 24: | |
160 avctx->pix_fmt = PIX_FMT_BGR24; | |
161 break; | |
162 case 16: | |
163 if(comp == BMP_RGB) | |
164 avctx->pix_fmt = PIX_FMT_RGB555; | |
7909
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
165 if(comp == BMP_BITFIELDS) |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
166 avctx->pix_fmt = rgb[1] == 0x07E0 ? PIX_FMT_RGB565 : PIX_FMT_RGB555; |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
167 break; |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
168 case 8: |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
169 if(hsize - ihsize - 14 > 0) |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
170 avctx->pix_fmt = PIX_FMT_PAL8; |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
171 else |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
172 avctx->pix_fmt = PIX_FMT_GRAY8; |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
173 break; |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
174 case 4: |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
175 if(hsize - ihsize - 14 > 0){ |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
176 avctx->pix_fmt = PIX_FMT_PAL8; |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
177 }else{ |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
178 av_log(avctx, AV_LOG_ERROR, "Unknown palette for 16-colour BMP\n"); |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
179 return -1; |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
180 } |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
181 break; |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
182 case 1: |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
183 avctx->pix_fmt = PIX_FMT_MONOBLACK; |
2949 | 184 break; |
185 default: | |
186 av_log(avctx, AV_LOG_ERROR, "depth %d not supported\n", depth); | |
187 return -1; | |
188 } | |
189 | |
190 if(avctx->pix_fmt == PIX_FMT_NONE){ | |
191 av_log(avctx, AV_LOG_ERROR, "unsupported pixel format\n"); | |
192 return -1; | |
193 } | |
194 | |
4432
a848b652f0ac
Fix segfault in bmp decoder. Patch by Michel Bardiaux mbardiaux mediaxim dot be.
takis
parents:
4415
diff
changeset
|
195 if(p->data[0]) |
a848b652f0ac
Fix segfault in bmp decoder. Patch by Michel Bardiaux mbardiaux mediaxim dot be.
takis
parents:
4415
diff
changeset
|
196 avctx->release_buffer(avctx, p); |
a848b652f0ac
Fix segfault in bmp decoder. Patch by Michel Bardiaux mbardiaux mediaxim dot be.
takis
parents:
4415
diff
changeset
|
197 |
2949 | 198 p->reference = 0; |
199 if(avctx->get_buffer(avctx, p) < 0){ | |
200 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); | |
201 return -1; | |
202 } | |
203 p->pict_type = FF_I_TYPE; | |
204 p->key_frame = 1; | |
205 | |
4439
3af19e140d67
Make BMP decoder use bytestream. Patch by Michel Bardiaux
takis
parents:
4432
diff
changeset
|
206 buf = buf0 + hsize; |
2949 | 207 dsize = buf_size - hsize; |
208 | |
4109 | 209 /* Line size in file multiple of 4 */ |
7908 | 210 n = ((avctx->width * depth) / 8 + 3) & ~3; |
2949 | 211 |
7910 | 212 if(n * avctx->height > dsize && comp != BMP_RLE4 && comp != BMP_RLE8){ |
2949 | 213 av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n", |
214 dsize, n * avctx->height); | |
215 return -1; | |
216 } | |
217 | |
7910 | 218 // RLE may skip decoding some picture areas, so blank picture before decoding |
219 if(comp == BMP_RLE4 || comp == BMP_RLE8) | |
220 memset(p->data[0], 0, avctx->height * p->linesize[0]); | |
221 | |
7909
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
222 if(depth == 4 || depth == 8) |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
223 memset(p->data[1], 0, 1024); |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
224 |
2949 | 225 if(height > 0){ |
226 ptr = p->data[0] + (avctx->height - 1) * p->linesize[0]; | |
227 linesize = -p->linesize[0]; | |
228 } else { | |
229 ptr = p->data[0]; | |
230 linesize = p->linesize[0]; | |
231 } | |
232 | |
7909
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
233 if(avctx->pix_fmt == PIX_FMT_PAL8){ |
10257
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
234 int colors = 1 << depth; |
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
235 if(ihsize >= 36){ |
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
236 int t; |
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
237 buf = buf0 + 46; |
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
238 t = bytestream_get_le32(&buf); |
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
239 if(t < 0 || t > (1 << depth)){ |
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
240 av_log(avctx, AV_LOG_ERROR, "Incorrect number of colors - %X for bitdepth %d\n", t, depth); |
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
241 }else if(t){ |
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
242 colors = t; |
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
243 } |
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
244 } |
7909
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
245 buf = buf0 + 14 + ihsize; //palette location |
10257
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
246 if((hsize-ihsize-14) < (colors << 2)){ // OS/2 bitmap, 3 bytes per palette entry |
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
247 for(i = 0; i < colors; i++) |
7909
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
248 ((uint32_t*)p->data[1])[i] = bytestream_get_le24(&buf); |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
249 }else{ |
10257
af449680f6ee
Take into account real number of colours when reading BMP palette.
kostya
parents:
9798
diff
changeset
|
250 for(i = 0; i < colors; i++) |
7909
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
251 ((uint32_t*)p->data[1])[i] = bytestream_get_le32(&buf); |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
252 } |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
253 buf = buf0 + hsize; |
9fd3f57e4c16
Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP
kostya
parents:
7908
diff
changeset
|
254 } |
7910 | 255 if(comp == BMP_RLE4 || comp == BMP_RLE8){ |
10335
3b0a2384ff9f
Make BMP decoder produce flipped picture with RLE compression.
kostya
parents:
10257
diff
changeset
|
256 if(height < 0){ |
3b0a2384ff9f
Make BMP decoder produce flipped picture with RLE compression.
kostya
parents:
10257
diff
changeset
|
257 p->data[0] += p->linesize[0] * (avctx->height - 1); |
3b0a2384ff9f
Make BMP decoder produce flipped picture with RLE compression.
kostya
parents:
10257
diff
changeset
|
258 p->linesize[0] = -p->linesize[0]; |
3b0a2384ff9f
Make BMP decoder produce flipped picture with RLE compression.
kostya
parents:
10257
diff
changeset
|
259 } |
8720
052c676c433b
Silence useless compiler warning when passing AVFrame* instead of AVPicture*
kostya
parents:
8204
diff
changeset
|
260 ff_msrle_decode(avctx, (AVPicture*)p, depth, buf, dsize); |
10335
3b0a2384ff9f
Make BMP decoder produce flipped picture with RLE compression.
kostya
parents:
10257
diff
changeset
|
261 if(height < 0){ |
3b0a2384ff9f
Make BMP decoder produce flipped picture with RLE compression.
kostya
parents:
10257
diff
changeset
|
262 p->data[0] += p->linesize[0] * (avctx->height - 1); |
3b0a2384ff9f
Make BMP decoder produce flipped picture with RLE compression.
kostya
parents:
10257
diff
changeset
|
263 p->linesize[0] = -p->linesize[0]; |
3b0a2384ff9f
Make BMP decoder produce flipped picture with RLE compression.
kostya
parents:
10257
diff
changeset
|
264 } |
7910 | 265 }else{ |
7911 | 266 switch(depth){ |
267 case 1: | |
9261
931bb51f060e
Merge some cases for reading raw data with different bit depths in BMP
kostya
parents:
8945
diff
changeset
|
268 case 8: |
931bb51f060e
Merge some cases for reading raw data with different bit depths in BMP
kostya
parents:
8945
diff
changeset
|
269 case 24: |
7911 | 270 for(i = 0; i < avctx->height; i++){ |
271 memcpy(ptr, buf, n); | |
272 buf += n; | |
273 ptr += linesize; | |
274 } | |
275 break; | |
276 case 4: | |
277 for(i = 0; i < avctx->height; i++){ | |
278 int j; | |
279 for(j = 0; j < n; j++){ | |
280 ptr[j*2+0] = (buf[j] >> 4) & 0xF; | |
281 ptr[j*2+1] = buf[j] & 0xF; | |
282 } | |
283 buf += n; | |
284 ptr += linesize; | |
285 } | |
286 break; | |
287 case 16: | |
288 for(i = 0; i < avctx->height; i++){ | |
289 const uint16_t *src = (const uint16_t *) buf; | |
290 uint16_t *dst = (uint16_t *) ptr; | |
291 | |
292 for(j = 0; j < avctx->width; j++) | |
293 *dst++ = le2me_16(*src++); | |
294 | |
295 buf += n; | |
296 ptr += linesize; | |
297 } | |
298 break; | |
299 case 32: | |
300 for(i = 0; i < avctx->height; i++){ | |
301 const uint8_t *src = buf; | |
302 uint8_t *dst = ptr; | |
303 | |
304 for(j = 0; j < avctx->width; j++){ | |
305 dst[0] = src[rgb[2]]; | |
306 dst[1] = src[rgb[1]]; | |
307 dst[2] = src[rgb[0]]; | |
308 dst += 3; | |
309 src += 4; | |
310 } | |
311 | |
312 buf += n; | |
313 ptr += linesize; | |
314 } | |
315 break; | |
316 default: | |
317 av_log(avctx, AV_LOG_ERROR, "BMP decoder is broken\n"); | |
318 return -1; | |
2949 | 319 } |
7910 | 320 } |
2949 | 321 |
322 *picture = s->picture; | |
323 *data_size = sizeof(AVPicture); | |
324 | |
325 return buf_size; | |
326 } | |
327 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6265
diff
changeset
|
328 static av_cold int bmp_decode_end(AVCodecContext *avctx) |
4455
8ecfb7ecbb53
Add decode_end method to bmp decoder. Patch by Michel Bardiaux,
takis
parents:
4445
diff
changeset
|
329 { |
8ecfb7ecbb53
Add decode_end method to bmp decoder. Patch by Michel Bardiaux,
takis
parents:
4445
diff
changeset
|
330 BMPContext* c = avctx->priv_data; |
8ecfb7ecbb53
Add decode_end method to bmp decoder. Patch by Michel Bardiaux,
takis
parents:
4445
diff
changeset
|
331 |
8ecfb7ecbb53
Add decode_end method to bmp decoder. Patch by Michel Bardiaux,
takis
parents:
4445
diff
changeset
|
332 if (c->picture.data[0]) |
8ecfb7ecbb53
Add decode_end method to bmp decoder. Patch by Michel Bardiaux,
takis
parents:
4445
diff
changeset
|
333 avctx->release_buffer(avctx, &c->picture); |
8ecfb7ecbb53
Add decode_end method to bmp decoder. Patch by Michel Bardiaux,
takis
parents:
4445
diff
changeset
|
334 |
8ecfb7ecbb53
Add decode_end method to bmp decoder. Patch by Michel Bardiaux,
takis
parents:
4445
diff
changeset
|
335 return 0; |
8ecfb7ecbb53
Add decode_end method to bmp decoder. Patch by Michel Bardiaux,
takis
parents:
4445
diff
changeset
|
336 } |
8ecfb7ecbb53
Add decode_end method to bmp decoder. Patch by Michel Bardiaux,
takis
parents:
4445
diff
changeset
|
337 |
2949 | 338 AVCodec bmp_decoder = { |
339 "bmp", | |
340 CODEC_TYPE_VIDEO, | |
341 CODEC_ID_BMP, | |
342 sizeof(BMPContext), | |
343 bmp_decode_init, | |
344 NULL, | |
4455
8ecfb7ecbb53
Add decode_end method to bmp decoder. Patch by Michel Bardiaux,
takis
parents:
4445
diff
changeset
|
345 bmp_decode_end, |
6722 | 346 bmp_decode_frame, |
9798 | 347 CODEC_CAP_DR1, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6722
diff
changeset
|
348 .long_name = NULL_IF_CONFIG_SMALL("BMP image"), |
2949 | 349 }; |