Mercurial > libavcodec.hg
annotate lclenc.c @ 12530:63edd10ad4bc libavcodec tip
Try to fix crashes introduced by r25218
r25218 made assumptions about the existence of past reference frames that
weren't necessarily true.
| author | darkshikari |
|---|---|
| date | Tue, 28 Sep 2010 09:06:22 +0000 |
| parents | 7dd2a45249a9 |
| children |
| 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 /** | |
|
11644
7dd2a45249a9
Remove explicit filename from Doxygen @file commands.
diego
parents:
11560
diff
changeset
|
23 * @file |
| 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" |
| 5294 | 45 #include "lcl.h" |
| 1743 | 46 |
| 47 #include <zlib.h> | |
| 48 | |
| 49 /* | |
| 50 * Decoder context | |
| 51 */ | |
| 5294 | 52 typedef struct LclEncContext { |
| 1743 | 53 |
| 9744 | 54 AVCodecContext *avctx; |
| 55 AVFrame pic; | |
| 1743 | 56 |
| 57 // Image type | |
| 58 int imgtype; | |
| 59 // Compression type | |
| 60 int compression; | |
| 61 // Flags | |
| 62 int flags; | |
| 63 z_stream zstream; | |
| 5294 | 64 } LclEncContext; |
| 1743 | 65 |
| 66 /* | |
| 67 * | |
| 68 * Encode a frame | |
| 69 * | |
| 70 */ | |
| 71 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ | |
| 5294 | 72 LclEncContext *c = avctx->priv_data; |
| 1743 | 73 AVFrame *pict = data; |
| 74 AVFrame * const p = &c->pic; | |
| 75 int i; | |
| 76 int zret; // Zlib return code | |
| 77 | |
| 78 *p = *pict; | |
| 79 p->pict_type= FF_I_TYPE; | |
| 80 p->key_frame= 1; | |
| 2967 | 81 |
| 1743 | 82 if(avctx->pix_fmt != PIX_FMT_BGR24){ |
| 83 av_log(avctx, AV_LOG_ERROR, "Format not supported!\n"); | |
| 84 return -1; | |
| 85 } | |
| 86 | |
| 9745 | 87 zret = deflateReset(&c->zstream); |
| 1743 | 88 if (zret != Z_OK) { |
| 89 av_log(avctx, AV_LOG_ERROR, "Deflate reset error: %d\n", zret); | |
| 90 return -1; | |
| 91 } | |
|
9746
e8421cfcc381
lclenc.c: compress directly into output buffer instead of using a pointless
reimar
parents:
9745
diff
changeset
|
92 c->zstream.next_out = buf; |
|
e8421cfcc381
lclenc.c: compress directly into output buffer instead of using a pointless
reimar
parents:
9745
diff
changeset
|
93 c->zstream.avail_out = buf_size; |
| 1743 | 94 |
|
2250
902caf560c43
Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents:
2248
diff
changeset
|
95 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
|
96 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
|
97 c->zstream.avail_in = avctx->width*3; |
| 9745 | 98 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
|
99 if (zret != Z_OK) { |
| 2979 | 100 av_log(avctx, AV_LOG_ERROR, "Deflate error: %d\n", zret); |
| 101 return -1; | |
|
2250
902caf560c43
Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents:
2248
diff
changeset
|
102 } |
|
902caf560c43
Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents:
2248
diff
changeset
|
103 } |
| 9745 | 104 zret = deflate(&c->zstream, Z_FINISH); |
|
2250
902caf560c43
Zlib encoder: fix image orientation (was flipped), 100l in deflate error
rtognimp
parents:
2248
diff
changeset
|
105 if (zret != Z_STREAM_END) { |
| 1743 | 106 av_log(avctx, AV_LOG_ERROR, "Deflate error: %d\n", zret); |
| 107 return -1; | |
| 108 } | |
| 109 | |
| 110 return c->zstream.total_out; | |
| 111 } | |
| 112 | |
| 113 /* | |
| 114 * | |
| 115 * Init lcl encoder | |
| 116 * | |
| 117 */ | |
|
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
5294
diff
changeset
|
118 static av_cold int encode_init(AVCodecContext *avctx) |
| 1743 | 119 { |
| 5294 | 120 LclEncContext *c = avctx->priv_data; |
| 1743 | 121 int zret; // Zlib return code |
| 122 | |
| 123 c->avctx= avctx; | |
| 2967 | 124 |
| 1743 | 125 assert(avctx->width && avctx->height); |
| 2967 | 126 |
| 1743 | 127 avctx->extradata= av_mallocz(8); |
| 128 avctx->coded_frame= &c->pic; | |
| 129 | |
| 130 // Will be user settable someday | |
| 131 c->compression = 6; | |
| 132 c->flags = 0; | |
| 133 | |
| 134 switch(avctx->pix_fmt){ | |
| 135 case PIX_FMT_BGR24: | |
| 136 c->imgtype = IMGTYPE_RGB24; | |
|
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7068
diff
changeset
|
137 avctx->bits_per_coded_sample= 24; |
| 1743 | 138 break; |
| 139 default: | |
|
7068
6497251e2fde
Improve an lclenc.c error message in case of unsupported input pixel
stefano
parents:
7040
diff
changeset
|
140 av_log(avctx, AV_LOG_ERROR, "Input pixel format %s not supported\n", avcodec_get_pix_fmt_name(avctx->pix_fmt)); |
| 1743 | 141 return -1; |
| 142 } | |
| 143 | |
|
9747
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
144 avctx->extradata[0]= 4; |
|
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
145 avctx->extradata[1]= 0; |
|
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
146 avctx->extradata[2]= 0; |
|
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
147 avctx->extradata[3]= 0; |
|
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
148 avctx->extradata[4]= c->imgtype; |
|
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
149 avctx->extradata[5]= c->compression; |
|
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
150 avctx->extradata[6]= c->flags; |
|
9db25052df0e
Remove useless casts, extradata is already "uint8_t *"
reimar
parents:
9746
diff
changeset
|
151 avctx->extradata[7]= CODEC_ZLIB; |
| 1743 | 152 c->avctx->extradata_size= 8; |
| 2967 | 153 |
| 1743 | 154 c->zstream.zalloc = Z_NULL; |
| 155 c->zstream.zfree = Z_NULL; | |
| 156 c->zstream.opaque = Z_NULL; | |
| 9745 | 157 zret = deflateInit(&c->zstream, c->compression); |
| 1743 | 158 if (zret != Z_OK) { |
| 159 av_log(avctx, AV_LOG_ERROR, "Deflate init error: %d\n", zret); | |
| 160 return 1; | |
| 161 } | |
| 162 | |
| 163 return 0; | |
| 164 } | |
| 165 | |
| 166 /* | |
| 167 * | |
| 168 * Uninit lcl encoder | |
| 169 * | |
| 170 */ | |
|
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
5294
diff
changeset
|
171 static av_cold int encode_end(AVCodecContext *avctx) |
| 1743 | 172 { |
| 5294 | 173 LclEncContext *c = avctx->priv_data; |
| 1743 | 174 |
| 175 av_freep(&avctx->extradata); | |
| 9745 | 176 deflateEnd(&c->zstream); |
| 2967 | 177 |
| 1743 | 178 return 0; |
| 179 } | |
| 180 | |
| 181 AVCodec zlib_encoder = { | |
| 182 "zlib", | |
|
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
9768
diff
changeset
|
183 AVMEDIA_TYPE_VIDEO, |
| 1743 | 184 CODEC_ID_ZLIB, |
| 5294 | 185 sizeof(LclEncContext), |
| 1743 | 186 encode_init, |
| 187 encode_frame, | |
| 188 encode_end, | |
|
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6712
diff
changeset
|
189 .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), |
| 1743 | 190 }; |
