annotate 8bps.c @ 1743:fa06a4a448f7 libavcodec

Fix for older version of zlib
author rtognimp
date Tue, 13 Jan 2004 19:46:37 +0000
parents 639972344c6f
children 82af834636c2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1608
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
1 /*
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
2 * Quicktime Planar RGB (8BPS) Video Decoder
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
3 * Copyright (C) 2003 Roberto Togni
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
4 *
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
9 *
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
13 * Lesser General Public License for more details.
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
14 *
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
18 *
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
19 */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
20
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
21 /**
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
22 * @file 8bps.c
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
23 * QT 8BPS Video Decoder by Roberto Togni <rtogni at bresciaonline dot it>
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
24 * For more information about the 8BPS format, visit:
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
25 * http://www.pcisys.net/~melanson/codecs/
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
26 *
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
27 * Supports: PAL8 (RGB 8bpp, paletted)
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
28 * : BGR24 (RGB 24bpp) (can also output it as RGBA32)
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
29 * : RGBA32 (RGB 32bpp, 4th plane is probably alpha and it's ignored)
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
30 *
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
31 */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
32
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
33 #include <stdio.h>
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
34 #include <stdlib.h>
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
35
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
36 #include "common.h"
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
37 #include "avcodec.h"
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
38
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
39
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
40 const enum PixelFormat pixfmt_rgb24[] = {PIX_FMT_BGR24, PIX_FMT_RGBA32, -1};
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
41
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
42 /*
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
43 * Decoder context
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
44 */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
45 typedef struct EightBpsContext {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
46
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
47 AVCodecContext *avctx;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
48 AVFrame pic;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
49
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
50 unsigned char planes;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
51 unsigned char planemap[4];
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
52 } EightBpsContext;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
53
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
54
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
55 /*
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
56 *
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
57 * Decode a frame
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
58 *
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
59 */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
60 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
61 {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
62 EightBpsContext * const c = (EightBpsContext *)avctx->priv_data;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
63 unsigned char *encoded = (unsigned char *)buf;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
64 unsigned char *pixptr;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
65 unsigned int height = avctx->height; // Real image height
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
66 unsigned int dlen, p, row;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
67 unsigned char *lp, *dp;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
68 unsigned char count;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
69 unsigned int px_inc;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
70 unsigned int planes = c->planes;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
71 unsigned char *planemap = c->planemap;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
72
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
73
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
74 /* no supplementary picture */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
75 if (buf_size == 0)
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
76 return 0;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
77
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
78 if(c->pic.data[0])
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
79 avctx->release_buffer(avctx, &c->pic);
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
80
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
81 c->pic.reference = 0;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
82 c->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
83 if(avctx->get_buffer(avctx, &c->pic) < 0){
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
84 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
85 return -1;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
86 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
87
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
88 /* Set data pointer after line lengths */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
89 dp = encoded + planes * (height << 1);
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
90
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
91 /* Ignore alpha plane, don't know what to do with it */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
92 if (planes == 4)
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
93 planes--;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
94
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
95 px_inc = planes + (avctx->pix_fmt == PIX_FMT_RGBA32);
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
96
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
97 for (p = 0; p < planes; p++) {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
98 /* Lines length pointer for this plane */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
99 lp = encoded + p * (height << 1);
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
100
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
101 /* Decode a plane */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
102 for(row = 0; row < height; row++) {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
103 pixptr = c->pic.data[0] + row * c->pic.linesize[0] + planemap[p];
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
104 dlen = be2me_16(*(unsigned short *)(lp+row*2));
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
105 /* Decode a row of this plane */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
106 while(dlen > 0) {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
107 if ((count = *dp++) <= 127) {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
108 count++;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
109 dlen -= count + 1;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
110 while(count--) {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
111 *pixptr = *dp++;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
112 pixptr += px_inc;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
113 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
114 } else {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
115 count = 257 - count;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
116 while(count--) {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
117 *pixptr = *dp;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
118 pixptr += px_inc;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
119 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
120 dp++;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
121 dlen -= 2;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
122 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
123 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
124 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
125 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
126
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
127 if (avctx->palctrl) {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
128 memcpy (c->pic.data[1], avctx->palctrl->palette, AVPALETTE_SIZE);
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
129 if (avctx->palctrl->palette_changed) {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
130 c->pic.palette_has_changed = 1;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
131 avctx->palctrl->palette_changed = 0;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
132 } else
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
133 c->pic.palette_has_changed = 0;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
134 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
135
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
136 *data_size = sizeof(AVFrame);
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
137 *(AVFrame*)data = c->pic;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
138
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
139 /* always report that the buffer was completely consumed */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
140 return buf_size;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
141 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
142
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
143
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
144 /*
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
145 *
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
146 * Init 8BPS decoder
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
147 *
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
148 */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
149 static int decode_init(AVCodecContext *avctx)
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
150 {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
151 EightBpsContext * const c = (EightBpsContext *)avctx->priv_data;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
152
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
153 c->avctx = avctx;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
154 avctx->has_b_frames = 0;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
155
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
156 c->pic.data[0] = NULL;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
157
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
158 switch (avctx->bits_per_sample) {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
159 case 8:
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
160 avctx->pix_fmt = PIX_FMT_PAL8;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
161 c->planes = 1;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
162 c->planemap[0] = 0; // 1st plane is palette indexes
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
163 if (avctx->palctrl == NULL) {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
164 av_log(avctx, AV_LOG_ERROR, "Error: PAL8 format but no palette from demuxer.\n");
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
165 return -1;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
166 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
167 break;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
168 case 24:
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
169 avctx->pix_fmt = avctx->get_format(avctx, pixfmt_rgb24);
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
170 c->planes = 3;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
171 c->planemap[0] = 2; // 1st plane is red
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
172 c->planemap[1] = 1; // 2nd plane is green
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
173 c->planemap[2] = 0; // 3rd plane is blue
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
174 break;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
175 case 32:
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
176 avctx->pix_fmt = PIX_FMT_RGBA32;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
177 c->planes = 4;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
178 #ifdef WORDS_BIGENDIAN
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
179 c->planemap[0] = 1; // 1st plane is red
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
180 c->planemap[1] = 2; // 2nd plane is green
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
181 c->planemap[2] = 3; // 3rd plane is blue
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
182 c->planemap[3] = 0; // 4th plane is alpha???
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
183 #else
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
184 c->planemap[0] = 2; // 1st plane is red
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
185 c->planemap[1] = 1; // 2nd plane is green
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
186 c->planemap[2] = 0; // 3rd plane is blue
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
187 c->planemap[3] = 3; // 4th plane is alpha???
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
188 #endif
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
189 break;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
190 default:
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
191 av_log(avctx, AV_LOG_ERROR, "Error: Unsupported color depth: %u.\n", avctx->bits_per_sample);
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
192 return -1;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
193 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
194
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
195 return 0;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
196 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
197
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
198
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
199
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
200
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
201 /*
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
202 *
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
203 * Uninit 8BPS decoder
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
204 *
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
205 */
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
206 static int decode_end(AVCodecContext *avctx)
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
207 {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
208 EightBpsContext * const c = (EightBpsContext *)avctx->priv_data;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
209
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
210 if (c->pic.data[0])
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
211 avctx->release_buffer(avctx, &c->pic);
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
212
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
213 return 0;
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
214 }
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
215
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
216
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
217
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
218 AVCodec eightbps_decoder = {
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
219 "8bps",
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
220 CODEC_TYPE_VIDEO,
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
221 CODEC_ID_8BPS,
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
222 sizeof(EightBpsContext),
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
223 decode_init,
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
224 NULL,
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
225 decode_end,
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
226 decode_frame,
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
227 CODEC_CAP_DR1,
639972344c6f 8BPS decoder
rtognimp
parents:
diff changeset
228 };