annotate gui/util/bitmap.c @ 33131:aa753565a901

Revise Normalize(). Make loop variable match ImageSize type, rephrase #if condition positively.
author ib
date Tue, 05 Apr 2011 09:28:59 +0000
parents 4f60cd16ac04
children 6ac1b560e209
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
1 /*
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
2 * This file is part of MPlayer.
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
3 *
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
7 * (at your option) any later version.
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
8 *
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
12 * GNU General Public License for more details.
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
13 *
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
14 * You should have received a copy of the GNU General Public License along
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
17 */
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
18
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
19 #include <stdio.h>
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
20 #include <stdlib.h>
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
21 #include <string.h>
33130
4f60cd16ac04 Clean up and simplify fExist().
ib
parents: 33129
diff changeset
22 #include <unistd.h>
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
23
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
24 #include "bitmap.h"
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
25
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
26 #include "help_mp.h"
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
27 #include "libavcodec/avcodec.h"
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
28 #include "libavutil/intreadwrite.h"
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
29 #include "libvo/fastmemcpy.h"
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
30 #include "mp_msg.h"
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
31
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
32 static int pngRead(unsigned char *fname, txSample *bf)
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
33 {
33122
1d81476c0d1e Cosmetic: Rephrase some conditions and rename some variables.
ib
parents: 33121
diff changeset
34 FILE *file;
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
35 int decode_ok;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
36 void *data;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
37 int len;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
38 AVCodecContext *avctx;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
39 AVFrame *frame;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
40 AVPacket pkt;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
41
33122
1d81476c0d1e Cosmetic: Rephrase some conditions and rename some variables.
ib
parents: 33121
diff changeset
42 file = fopen(fname, "rb");
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
43
33122
1d81476c0d1e Cosmetic: Rephrase some conditions and rename some variables.
ib
parents: 33121
diff changeset
44 if (!file) {
33112
654dfdf176ac Revise debug messages.
ib
parents: 33053
diff changeset
45 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] open error: %s\n", fname);
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
46 return 1;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
47 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
48
33122
1d81476c0d1e Cosmetic: Rephrase some conditions and rename some variables.
ib
parents: 33121
diff changeset
49 fseek(file, 0, SEEK_END);
1d81476c0d1e Cosmetic: Rephrase some conditions and rename some variables.
ib
parents: 33121
diff changeset
50 len = ftell(file);
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
51
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
52 if (len > 50 * 1024 * 1024) {
33122
1d81476c0d1e Cosmetic: Rephrase some conditions and rename some variables.
ib
parents: 33121
diff changeset
53 fclose(file);
33112
654dfdf176ac Revise debug messages.
ib
parents: 33053
diff changeset
54 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] file too big: %s\n", fname);
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
55 return 2;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
56 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
57
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
58 data = av_malloc(len + FF_INPUT_BUFFER_PADDING_SIZE);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
59
33122
1d81476c0d1e Cosmetic: Rephrase some conditions and rename some variables.
ib
parents: 33121
diff changeset
60 fseek(file, 0, SEEK_SET);
1d81476c0d1e Cosmetic: Rephrase some conditions and rename some variables.
ib
parents: 33121
diff changeset
61 fread(data, len, 1, file);
1d81476c0d1e Cosmetic: Rephrase some conditions and rename some variables.
ib
parents: 33121
diff changeset
62 fclose(file);
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
63
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
64 avctx = avcodec_alloc_context();
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
65 frame = avcodec_alloc_frame();
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
66 avcodec_register_all();
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
67 avcodec_open(avctx, avcodec_find_decoder(CODEC_ID_PNG));
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
68 av_init_packet(&pkt);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
69 pkt.data = data;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
70 pkt.size = len;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
71 // HACK: make PNGs decode normally instead of as CorePNG delta frames
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
72 pkt.flags = AV_PKT_FLAG_KEY;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
73 avcodec_decode_video2(avctx, frame, &decode_ok, &pkt);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
74 memset(bf, 0, sizeof(*bf));
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
75
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
76 switch (avctx->pix_fmt) {
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
77 case PIX_FMT_GRAY8:
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
78 bf->BPP = 8;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
79 break;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
80
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
81 case PIX_FMT_GRAY16BE:
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
82 bf->BPP = 16;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
83 break;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
84
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
85 case PIX_FMT_RGB24:
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
86 bf->BPP = 24;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
87 break;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
88
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
89 case PIX_FMT_BGRA:
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
90 case PIX_FMT_ARGB:
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
91 bf->BPP = 32;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
92 break;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
93
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
94 default:
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
95 bf->BPP = 0;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
96 break;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
97 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
98
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
99 if (decode_ok && bf->BPP) {
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
100 int bpl;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
101
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
102 bf->Width = avctx->width;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
103 bf->Height = avctx->height;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
104 bpl = bf->Width * (bf->BPP / 8);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
105 bf->ImageSize = bpl * bf->Height;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
106 bf->Image = malloc(bf->ImageSize);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
107 memcpy_pic(bf->Image, frame->data[0], bpl, bf->Height, bpl, frame->linesize[0]);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
108 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
109
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
110 avcodec_close(avctx);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
111 av_freep(&frame);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
112 av_freep(&avctx);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
113 av_freep(&data);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
114
33112
654dfdf176ac Revise debug messages.
ib
parents: 33053
diff changeset
115 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] file: %s\n", fname);
654dfdf176ac Revise debug messages.
ib
parents: 33053
diff changeset
116 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] size: %lux%lu, color depth: %u\n", bf->Width, bf->Height, bf->BPP);
654dfdf176ac Revise debug messages.
ib
parents: 33053
diff changeset
117 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] image size: %lu\n", bf->ImageSize);
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
118
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
119 return !(decode_ok && bf->BPP);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
120 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
121
33121
7623be6c1f0e Rename conv24to32() Convert24to32().
ib
parents: 33120
diff changeset
122 static int Convert24to32(txSample *bf)
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
123 {
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
124 unsigned char *tmpImage;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
125 unsigned int i, c;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
126
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
127 if (bf->BPP == 24) {
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
128 tmpImage = bf->Image;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
129 bf->BPP = 32;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
130 bf->ImageSize = bf->Width * bf->Height * 4;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
131 bf->Image = calloc(1, bf->ImageSize);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
132
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
133 if (!bf->Image) {
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
134 free(tmpImage);
33112
654dfdf176ac Revise debug messages.
ib
parents: 33053
diff changeset
135 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] not enough memory: %lu\n", bf->ImageSize);
33121
7623be6c1f0e Rename conv24to32() Convert24to32().
ib
parents: 33120
diff changeset
136 return 0;
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
137 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
138
33112
654dfdf176ac Revise debug messages.
ib
parents: 33053
diff changeset
139 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 32 bpp conversion size: %lu\n", bf->ImageSize);
654dfdf176ac Revise debug messages.
ib
parents: 33053
diff changeset
140
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
141 for (c = 0, i = 0; c < bf->ImageSize; c += 4, i += 3)
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
142 *(uint32_t *)&bf->Image[c] = AV_RB24(&tmpImage[i]);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
143
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
144 free(tmpImage);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
145 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
146
33121
7623be6c1f0e Rename conv24to32() Convert24to32().
ib
parents: 33120
diff changeset
147 return 1;
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
148 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
149
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
150 static void Normalize(txSample *bf)
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
151 {
33131
aa753565a901 Revise Normalize().
ib
parents: 33130
diff changeset
152 unsigned long i;
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
153
33131
aa753565a901 Revise Normalize().
ib
parents: 33130
diff changeset
154 for (i = 0; i < bf->ImageSize; i += 4)
aa753565a901 Revise Normalize().
ib
parents: 33130
diff changeset
155 #if HAVE_BIGENDIAN
aa753565a901 Revise Normalize().
ib
parents: 33130
diff changeset
156 bf->Image[i] = 0;
aa753565a901 Revise Normalize().
ib
parents: 33130
diff changeset
157 #else
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
158 bf->Image[i + 3] = 0;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
159 #endif
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
160 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
161
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
162 static unsigned char *fExist(unsigned char *fname)
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
163 {
33130
4f60cd16ac04 Clean up and simplify fExist().
ib
parents: 33129
diff changeset
164 unsigned char *ext[] = { "png", "PNG" };
4f60cd16ac04 Clean up and simplify fExist().
ib
parents: 33129
diff changeset
165 static unsigned char buf[512];
4f60cd16ac04 Clean up and simplify fExist().
ib
parents: 33129
diff changeset
166 unsigned int i;
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
167
33130
4f60cd16ac04 Clean up and simplify fExist().
ib
parents: 33129
diff changeset
168 if (access(fname, R_OK) == 0)
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
169 return fname;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
170
33130
4f60cd16ac04 Clean up and simplify fExist().
ib
parents: 33129
diff changeset
171 for (i = 0; i < FF_ARRAY_ELEMS(ext); i++) {
4f60cd16ac04 Clean up and simplify fExist().
ib
parents: 33129
diff changeset
172 snprintf(buf, sizeof(buf), "%s.%s", fname, ext[i]);
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
173
33130
4f60cd16ac04 Clean up and simplify fExist().
ib
parents: 33129
diff changeset
174 if (access(buf, R_OK) == 0)
4f60cd16ac04 Clean up and simplify fExist().
ib
parents: 33129
diff changeset
175 return buf;
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
176 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
177
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
178 return NULL;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
179 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
180
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
181 int bpRead(char *fname, txSample *bf)
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
182 {
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
183 fname = fExist(fname);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
184
33122
1d81476c0d1e Cosmetic: Rephrase some conditions and rename some variables.
ib
parents: 33121
diff changeset
185 if (!fname)
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
186 return -2;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
187
33122
1d81476c0d1e Cosmetic: Rephrase some conditions and rename some variables.
ib
parents: 33121
diff changeset
188 if (pngRead(fname, bf) != 0) {
33112
654dfdf176ac Revise debug messages.
ib
parents: 33053
diff changeset
189 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] read error: %s\n", fname);
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
190 return -5;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
191 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
192
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
193 if (bf->BPP < 24) {
33112
654dfdf176ac Revise debug messages.
ib
parents: 33053
diff changeset
194 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] bpp too low: %u\n", bf->BPP);
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
195 return -1;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
196 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
197
33121
7623be6c1f0e Rename conv24to32() Convert24to32().
ib
parents: 33120
diff changeset
198 if (!Convert24to32(bf))
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
199 return -8;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
200
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
201 Normalize(bf);
33053
f64d41dac10b Cosmetic: Separate return statement with newline.
ib
parents: 33046
diff changeset
202
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
203 return 0;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
204 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
205
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
206 void bpFree(txSample *bf)
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
207 {
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
208 free(bf->Image);
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
209 memset(bf, 0, sizeof(*bf));
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
210 }
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
211
33129
5f3171d4d7a4 Define the transparent color as a macro.
ib
parents: 33128
diff changeset
212 int Convert32to1(txSample *in, txSample *out)
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
213 {
33118
ae464a957cd0 Move variable definitions at top of function.
ib
parents: 33117
diff changeset
214 uint32_t *buf;
ae464a957cd0 Move variable definitions at top of function.
ib
parents: 33117
diff changeset
215 unsigned long i;
ae464a957cd0 Move variable definitions at top of function.
ib
parents: 33117
diff changeset
216 int b = 0, c = 0;
ae464a957cd0 Move variable definitions at top of function.
ib
parents: 33117
diff changeset
217 unsigned char tmp = 0;
ae464a957cd0 Move variable definitions at top of function.
ib
parents: 33117
diff changeset
218 int shaped = 0;
ae464a957cd0 Move variable definitions at top of function.
ib
parents: 33117
diff changeset
219
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
220 out->Width = in->Width;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
221 out->Height = in->Height;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
222 out->BPP = 1;
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
223 out->ImageSize = (out->Width * out->Height + 7) / 8;
33118
ae464a957cd0 Move variable definitions at top of function.
ib
parents: 33117
diff changeset
224 out->Image = calloc(1, out->ImageSize);
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
225
33122
1d81476c0d1e Cosmetic: Rephrase some conditions and rename some variables.
ib
parents: 33121
diff changeset
226 if (!out->Image) {
33114
5ad451a5ebec Remove useless warning message.
ib
parents: 33113
diff changeset
227 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] not enough memory: %lu\n", out->ImageSize);
5ad451a5ebec Remove useless warning message.
ib
parents: 33113
diff changeset
228 return 0;
33125
9c178cf14a61 Get rid of else-block to improve readability.
ib
parents: 33122
diff changeset
229 }
9c178cf14a61 Get rid of else-block to improve readability.
ib
parents: 33122
diff changeset
230
33126
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
231 buf = (uint32_t *)in->Image;
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
232
33126
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
233 for (i = 0; i < out->Width * out->Height; i++) {
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
234 tmp >>= 1;
33119
8835e684a41d Move common pixel shifting statement
ib
parents: 33118
diff changeset
235
33129
5f3171d4d7a4 Define the transparent color as a macro.
ib
parents: 33128
diff changeset
236 if (buf[i] != TRANSPARENT)
33126
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
237 tmp |= 0x80;
33128
64d19aaf624a Revert r33214.
ib
parents: 33127
diff changeset
238 else {
64d19aaf624a Revert r33214.
ib
parents: 33127
diff changeset
239 buf[i] = 0;
33126
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
240 shaped = 1;
33128
64d19aaf624a Revert r33214.
ib
parents: 33127
diff changeset
241 }
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
242
33126
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
243 if (++b == 8) {
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
244 out->Image[c++] = tmp;
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
245 tmp = b = 0;
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
246 }
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
247 }
33112
654dfdf176ac Revise debug messages.
ib
parents: 33053
diff changeset
248
33126
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
249 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 1 bpp conversion size: %lu\n", out->ImageSize);
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
250
33126
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
251 if (b)
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
252 out->Image[c] = tmp;
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
253
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
254 if (!shaped)
a5dc70e2cda3 Cosmetic: Adjust indent.
ib
parents: 33125
diff changeset
255 bpFree(out);
33114
5ad451a5ebec Remove useless warning message.
ib
parents: 33113
diff changeset
256
5ad451a5ebec Remove useless warning message.
ib
parents: 33113
diff changeset
257 return 1;
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents:
diff changeset
258 }