#include "avcodec.h"
#include "lcl.h"
+#include "libavutil/internal.h"
+#include "libavutil/mem.h"
#include <zlib.h>
typedef struct LclEncContext {
AVCodecContext *avctx;
- AVFrame pic;
// Image type
int imgtype;
* Encode a frame
*
*/
-static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
+static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+ const AVFrame *pict, int *got_packet)
+{
LclEncContext *c = avctx->priv_data;
- AVFrame *pict = data;
- AVFrame * const p = &c->pic;
- int i;
+ const AVFrame * const p = pict;
+ int i, ret;
int zret; // Zlib return code
+ int max_size = deflateBound(&c->zstream, avctx->width * avctx->height * 3);
- *p = *pict;
- p->pict_type= FF_I_TYPE;
- p->key_frame= 1;
+ if (!pkt->data &&
+ (ret = av_new_packet(pkt, max_size)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Error allocating packet of size %d.\n", max_size);
+ return ret;
+ }
- if(avctx->pix_fmt != PIX_FMT_BGR24){
+ if(avctx->pix_fmt != AV_PIX_FMT_BGR24){
av_log(avctx, AV_LOG_ERROR, "Format not supported!\n");
return -1;
}
av_log(avctx, AV_LOG_ERROR, "Deflate reset error: %d\n", zret);
return -1;
}
- c->zstream.next_out = buf;
- c->zstream.avail_out = buf_size;
+ c->zstream.next_out = pkt->data;
+ c->zstream.avail_out = pkt->size;
for(i = avctx->height - 1; i >= 0; i--) {
c->zstream.next_in = p->data[0]+p->linesize[0]*i;
return -1;
}
- return c->zstream.total_out;
+ pkt->size = c->zstream.total_out;
+ pkt->flags |= AV_PKT_FLAG_KEY;
+ *got_packet = 1;
+
+ return 0;
}
/*
assert(avctx->width && avctx->height);
avctx->extradata= av_mallocz(8);
- avctx->coded_frame= &c->pic;
+
+ avctx->coded_frame = av_frame_alloc();
+ if (!avctx->coded_frame)
+ return AVERROR(ENOMEM);
+
+ avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+ avctx->coded_frame->key_frame = 1;
// Will be user settable someday
c->compression = 6;
av_freep(&avctx->extradata);
deflateEnd(&c->zstream);
+ av_frame_free(&avctx->coded_frame);
+
return 0;
}
AVCodec ff_zlib_encoder = {
- "zlib",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_ZLIB,
- sizeof(LclEncContext),
- encode_init,
- encode_frame,
- encode_end,
- .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_BGR24, PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"),
+ .name = "zlib",
+ .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_ZLIB,
+ .priv_data_size = sizeof(LclEncContext),
+ .init = encode_init,
+ .encode2 = encode_frame,
+ .close = encode_end,
+ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
};