annotate xl.c @ 2342:8b6668325ff8 libavcodec

porting png support from -f image to -f image2
author michael
date Tue, 09 Nov 2004 23:31:46 +0000
parents 1180a04d64c5
children f67b63ed036d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
1 /*
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
2 * Miro VideoXL codec
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
3 * Copyright (c) 2004 Konstantin Shishkov
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
4 *
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
9 *
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
13 * Lesser General Public License for more details.
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
14 *
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
18 *
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
19 */
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
20
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
21 /**
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
22 * @file xl.c
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
23 * Miro VideoXL codec.
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
24 */
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
25
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
26 #include "avcodec.h"
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
27 #include "mpegvideo.h"
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
28
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
29 typedef struct VideoXLContext{
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
30 AVCodecContext *avctx;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
31 AVFrame pic;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
32 } VideoXLContext;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
33
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
34 const int xl_table[32] = {
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
35 0, 1, 2, 3, 4, 5, 6, 7,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
36 8, 9, 12, 15, 20, 25, 34, 46,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
37 64, 82, 94, 103, 108, 113, 116, 119,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
38 120, 121, 122, 123, 124, 125, 126, 127};
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
39
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
40 static int decode_frame(AVCodecContext *avctx,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
41 void *data, int *data_size,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
42 uint8_t *buf, int buf_size)
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
43 {
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
44 VideoXLContext * const a = avctx->priv_data;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
45 AVFrame * const p= (AVFrame*)&a->pic;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
46 uint8_t *Y, *U, *V;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
47 int i, j;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
48 int stride;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
49 uint32_t val;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
50 int y0, y1, y2, y3, c0, c1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
51
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
52
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
53 /* special case for last picture */
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
54 if (buf_size == 0) {
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
55 return 0;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
56 }
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
57
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
58 if(p->data[0])
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
59 avctx->release_buffer(avctx, p);
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
60
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
61 p->reference = 0;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
62 if(avctx->get_buffer(avctx, p) < 0){
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
63 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
64 return -1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
65 }
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
66 p->pict_type= I_TYPE;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
67 p->key_frame= 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
68
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
69 Y = a->pic.data[0];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
70 U = a->pic.data[1];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
71 V = a->pic.data[2];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
72
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
73 stride = avctx->width - 4;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
74 for (i = 0; i < avctx->height; i++) {
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
75 /* lines are stored in reversed order */
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
76 buf += stride;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
77
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
78 for (j = 0; j < avctx->width; j += 4) {
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
79 /* value is stored in LE dword with word swapped */
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
80 val = LE_32(buf);
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
81 buf -= 4;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
82 val = ((val >> 16) & 0xFFFF) | ((val & 0xFFFF) << 16);
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
83
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
84 if(!j)
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
85 y0 = (val & 0x1F) << 2;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
86 else
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
87 y0 = y3 + xl_table[val & 0x1F];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
88 val >>= 5;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
89 y1 = y0 + xl_table[val & 0x1F];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
90 val >>= 5;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
91 y2 = y1 + xl_table[val & 0x1F];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
92 val >>= 6; /* align to word */
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
93 y3 = y2 + xl_table[val & 0x1F];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
94 val >>= 5;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
95 if(!j)
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
96 c0 = (val & 0x1F) << 2;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
97 else
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
98 c0 += xl_table[val & 0x1F];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
99 val >>= 5;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
100 if(!j)
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
101 c1 = (val & 0x1F) << 2;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
102 else
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
103 c1 += xl_table[val & 0x1F];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
104
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
105 Y[j + 0] = y0 << 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
106 Y[j + 1] = y1 << 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
107 Y[j + 2] = y2 << 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
108 Y[j + 3] = y3 << 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
109
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
110 U[j >> 2] = c0 << 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
111 V[j >> 2] = c1 << 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
112 }
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
113
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
114 buf += avctx->width + 4;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
115 Y += a->pic.linesize[0];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
116 U += a->pic.linesize[1];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
117 V += a->pic.linesize[2];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
118 }
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
119
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
120 *data_size = sizeof(AVFrame);
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
121 *(AVFrame*)data = a->pic;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
122
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
123 return buf_size;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
124 }
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
125
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
126 static int decode_init(AVCodecContext *avctx){
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
127 // VideoXLContext * const a = avctx->priv_data;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
128
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
129 avctx->pix_fmt= PIX_FMT_YUV411P;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
130
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
131 return 0;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
132 }
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
133
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
134 AVCodec xl_decoder = {
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
135 "xl",
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
136 CODEC_TYPE_VIDEO,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
137 CODEC_ID_VIXL,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
138 sizeof(VideoXLContext),
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
139 decode_init,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
140 NULL,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
141 NULL,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
142 decode_frame,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
143 CODEC_CAP_DR1,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
144 };