Mercurial > libavcodec.hg
annotate lclenc.c @ 9760:14b65c693625 libavcodec
Remove another useless ()
author | reimar |
---|---|
date | Sun, 31 May 2009 10:05:21 +0000 |
parents | 77920505b11d |
children | c0af0d67bb8f |
rev | line source |
---|---|
1743 | 1 /* |
2 * LCL (LossLess Codec Library) Codec | |
3 * Copyright (c) 2002-2004 Roberto Togni | |
4 * | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
5 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
6 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
1743 | 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:
3777
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
1743 | 11 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3777
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
1743 | 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:
3777
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:
2979
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1743 | 20 */ |
21 | |
22 /** | |
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8673
diff
changeset
|
23 * @file libavcodec/lclenc.c |
1743 | 24 * LCL (LossLess Codec Library) Video Codec |
25 * Decoder for MSZH and ZLIB codecs | |
26 * Experimental encoder for ZLIB RGB24 | |
27 * | |
28 * Fourcc: MSZH, ZLIB | |
29 * | |
30 * Original Win32 dll: | |
31 * Ver2.23 By Kenji Oshima 2000.09.20 | |
32 * avimszh.dll, avizlib.dll | |
33 * | |
34 * A description of the decoding algorithm can be found here: | |
35 * http://www.pcisys.net/~melanson/codecs | |
36 * | |
37 * Supports: BGR24 (RGB 24bpp) | |
38 * | |
39 */ | |
40 | |
41 #include <stdio.h> | |
42 #include <stdlib.h> | |
43 | |
4962
f99e40a7155b
Remove redundant #inclusion of common.h, avcodec.h already #includes it.
diego
parents:
4827
diff
changeset
|
44 #include "avcodec.h" |
9411
4cb7c65fc775
Split bitstream.h, put the bitstream writer stuff in the new file
stefano
parents:
8718
diff
changeset
|
45 #include "put_bits.h" |
5294 | 46 #include "lcl.h" |
1743 | 47 |
48 #include <zlib.h> | |
49 | |
50 /* | |
51 * Decoder context | |
52 */ | |
5294 | 53 typedef struct LclEncContext { |
1743 | 54 |
9744 | 55 AVCodecContext *avctx; |
56 AVFrame pic; | |
1743 | 57 |
58 // Image type | |
59 int imgtype; | |
60 // Compression type | |
61 int compression; | |
62 // Flags | |
63 int flags; | |
64 z_stream zstream; | |
5294 | 65 } LclEncContext; |
1743 | 66 |
67 /* | |
68 * | |
69 * Encode a frame | |
70 * | |
71 */ | |
72 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ | |
5294 | 73 LclEncContext *c = avctx->priv_data; |
1743 | 74 AVFrame *pict = data; |
75 AVFrame * const p = &c->pic; | |
76 int i; | |
77 int zret; // Zlib return code | |
78 | |
79 *p = *pict; | |
80 p->pict_type= FF_I_TYPE; | |
81 p->key_frame= 1; | |
2967 | 82 |
1743 | 83 if(avctx->pix_fmt != PIX_FMT_BGR24){ |
84 av_log(avctx, AV_LOG_ERROR, "Format not supported!\n"); | |
85 return -1; | |
86 } | |
87 | |
9745 | 88 zret = deflateReset(&c->zstream); |
1743 | 89 if (zret != Z_OK) { |
90 av_log(avctx, AV_LOG_ERROR, "Deflate reset error: %d\n", zret); | |
91 return -1; | |
92 } | |
9746
e8421cfcc381
lclenc.c: compress directly into output buffer instead of using a pointless
reimar
parents:
9745
diff
changeset
|
93 c->zstream.next_out = buf; |
e8421cfcc381
lclenc.c: compress directly into output buffer instead of using a pointless
reimar
parents:
9745
diff
changeset
|
94 c->zstream.avail_out = buf_size; |
1743 | 95 |
2250
902caf560c43
Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents:
2248
diff
changeset
|
96 for(i = avctx->height - 1; i >= 0; i--) { |
902caf560c43
Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents:
2248
diff
changeset
|
97 c->zstream.next_in = p->data[0]+p->linesize[0]*i; |
902caf560c43
Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents:
2248
diff
changeset
|
98 c->zstream.avail_in = avctx->width*3; |
9745 | 99 zret = deflate(&c->zstream, Z_NO_FLUSH); |
2250
902caf560c43
Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents:
2248
diff
changeset
|
100 if (zret != Z_OK) { |
2979 | 101 av_log(avctx, AV_LOG_ERROR, "Deflate error: %d\n", zret); |
102 return -1; | |
2250
902caf560c43
Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents:
2248
diff
changeset
|
103 } |
902caf560c43
Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents:
2248
diff
changeset
|
104 } |
9745 | 105 zret = deflate(&c->zstream, Z_FINISH); |
2250
902caf560c43
Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents:
2248
diff
changeset
|
106 if (zret != Z_STREAM_END) { |
1743 | 107 av_log(avctx, AV_LOG_ERROR, "Deflate error: %d\n", zret); |
108 return -1; | |
109 } | |
110 | |
111 return c->zstream.total_out; | |
112 } | |
113 | |
114 /* | |
115 * | |
116 * Init lcl encoder | |
117 * | |
118 */ | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
5294
diff
changeset
|
119 static av_cold int encode_init(AVCodecContext *avctx) |
1743 | 120 { |
5294 | 121 LclEncContext *c = avctx->priv_data; |
1743 | 122 int zret; // Zlib return code |
123 | |
124 c->avctx= avctx; | |
2967 | 125 |
1743 | 126 assert(avctx->width && avctx->height); |
2967 | 127 |
1743 | 128 avctx->extradata= av_mallocz(8); |
129 avctx->coded_frame= &c->pic; | |
130 | |
131 // Will be user settable someday | |
132 c->compression = 6; | |
133 c->flags = 0; | |
134 | |
135 switch(avctx->pix_fmt){ | |
136 case PIX_FMT_BGR24: | |
137 c->imgtype = IMGTYPE_RGB24; | |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7068
diff
changeset
|
138 avctx->bits_per_coded_sample= 24; |
1743 | 139 break; |
140 default: | |
7068
6497251e2fde
Improve an lclenc.c error message in case of unsupported input pixel
stefano
parents:
7040
diff
changeset
|
141 av_log(avctx, AV_LOG_ERROR, "Input pixel format %s not supported\n", avcodec_get_pix_fmt_name(avctx->pix_fmt)); |
1743 | 142 return -1; |
143 } | |
144 | |
9747
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
145 avctx->extradata[0]= 4; |
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
146 avctx->extradata[1]= 0; |
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
147 avctx->extradata[2]= 0; |
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
148 avctx->extradata[3]= 0; |
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
149 avctx->extradata[4]= c->imgtype; |
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
150 avctx->extradata[5]= c->compression; |
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
151 avctx->extradata[6]= c->flags; |
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
152 avctx->extradata[7]= CODEC_ZLIB; |
1743 | 153 c->avctx->extradata_size= 8; |
2967 | 154 |
1743 | 155 c->zstream.zalloc = Z_NULL; |
156 c->zstream.zfree = Z_NULL; | |
157 c->zstream.opaque = Z_NULL; | |
9745 | 158 zret = deflateInit(&c->zstream, c->compression); |
1743 | 159 if (zret != Z_OK) { |
160 av_log(avctx, AV_LOG_ERROR, "Deflate init error: %d\n", zret); | |
161 return 1; | |
162 } | |
163 | |
164 return 0; | |
165 } | |
166 | |
167 /* | |
168 * | |
169 * Uninit lcl encoder | |
170 * | |
171 */ | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
5294
diff
changeset
|
172 static av_cold int encode_end(AVCodecContext *avctx) |
1743 | 173 { |
5294 | 174 LclEncContext *c = avctx->priv_data; |
1743 | 175 |
176 av_freep(&avctx->extradata); | |
9745 | 177 deflateEnd(&c->zstream); |
2967 | 178 |
1743 | 179 return 0; |
180 } | |
181 | |
182 AVCodec zlib_encoder = { | |
183 "zlib", | |
184 CODEC_TYPE_VIDEO, | |
185 CODEC_ID_ZLIB, | |
5294 | 186 sizeof(LclEncContext), |
1743 | 187 encode_init, |
188 encode_frame, | |
189 encode_end, | |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6712
diff
changeset
|
190 .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), |
1743 | 191 }; |