X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fzmbvenc.c;h=d7b518db2667ee5a95ee678797c3285b4b983922;hb=94bb1ce882a12b6d7a1fa32715a68121b39ee838;hp=e4f4860ea0b34bc973ad28a0d9f0653b59b2eaea;hpb=e65ab9d94f1c8d8893e32d90467d9525625d306a;p=ffmpeg diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index e4f4860ea0b..d7b518db266 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -27,8 +27,10 @@ #include #include +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" +#include "internal.h" #include @@ -42,7 +44,6 @@ */ typedef struct ZmbvEncContext { AVCodecContext *avctx; - AVFrame pic; int range; uint8_t *comp_buf, *work_buf; @@ -115,40 +116,27 @@ static int zmbv_me(ZmbvEncContext *c, uint8_t *src, int sstride, uint8_t *prev, return bv; } -static int encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void *data) +static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *pict, int *got_packet) { ZmbvEncContext * const c = avctx->priv_data; - AVFrame *pict = data; - AVFrame * const p = &c->pic; - uint8_t *src, *prev; + const AVFrame * const p = pict; + uint8_t *src, *prev, *buf; uint32_t *palptr; - int len = 0; int keyframe, chpal; int fl; - int work_size = 0; + int work_size = 0, pkt_size; int bw, bh; - int i, j; + int i, j, ret; keyframe = !c->curfrm; c->curfrm++; if(c->curfrm == c->keyint) c->curfrm = 0; - *p = *pict; - p->pict_type= keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; - p->key_frame= keyframe; + avctx->coded_frame->pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; + avctx->coded_frame->key_frame = keyframe; chpal = !keyframe && memcmp(p->data[1], c->pal2, 1024); - fl = (keyframe ? ZMBV_KEYFRAME : 0) | (chpal ? ZMBV_DELTAPAL : 0); - *buf++ = fl; len++; - if(keyframe){ - deflateReset(&c->zstream); - *buf++ = 0; len++; // hi ver - *buf++ = 1; len++; // lo ver - *buf++ = 1; len++; // comp - *buf++ = 4; len++; // format - 8bpp - *buf++ = ZMBV_BLOCK; len++; // block width - *buf++ = ZMBV_BLOCK; len++; // block height - } palptr = (uint32_t*)p->data[1]; src = p->data[0]; prev = c->prev; @@ -223,6 +211,9 @@ static int encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void src += p->linesize[0]; } + if (keyframe) + deflateReset(&c->zstream); + c->zstream.next_in = c->work_buf; c->zstream.avail_in = work_size; c->zstream.total_in = 0; @@ -235,10 +226,45 @@ static int encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void return -1; } + pkt_size = c->zstream.total_out + 1 + 6*keyframe; + if ((ret = ff_alloc_packet(pkt, pkt_size)) < 0) { + av_log(avctx, AV_LOG_ERROR, "Error getting packet of size %d.\n", pkt_size); + return ret; + } + buf = pkt->data; + + fl = (keyframe ? ZMBV_KEYFRAME : 0) | (chpal ? ZMBV_DELTAPAL : 0); + *buf++ = fl; + if (keyframe) { + *buf++ = 0; // hi ver + *buf++ = 1; // lo ver + *buf++ = 1; // comp + *buf++ = 4; // format - 8bpp + *buf++ = ZMBV_BLOCK; // block width + *buf++ = ZMBV_BLOCK; // block height + } memcpy(buf, c->comp_buf, c->zstream.total_out); - return len + c->zstream.total_out; + + pkt->flags |= AV_PKT_FLAG_KEY*keyframe; + *got_packet = 1; + + return 0; } +static av_cold int encode_end(AVCodecContext *avctx) +{ + ZmbvEncContext * const c = avctx->priv_data; + + av_freep(&c->comp_buf); + av_freep(&c->work_buf); + + deflateEnd(&c->zstream); + av_freep(&c->prev); + + av_frame_free(&avctx->coded_frame); + + return 0; +} /** * Init zmbv encoder @@ -265,72 +291,58 @@ static av_cold int encode_init(AVCodecContext *avctx) lvl = avctx->compression_level; if(lvl < 0 || lvl > 9){ av_log(avctx, AV_LOG_ERROR, "Compression level should be 0-9, not %i\n", lvl); - return -1; + return AVERROR(EINVAL); } // Needed if zlib unused or init aborted before deflateInit - memset(&(c->zstream), 0, sizeof(z_stream)); + memset(&c->zstream, 0, sizeof(z_stream)); c->comp_size = avctx->width * avctx->height + 1024 + ((avctx->width + ZMBV_BLOCK - 1) / ZMBV_BLOCK) * ((avctx->height + ZMBV_BLOCK - 1) / ZMBV_BLOCK) * 2 + 4; - if ((c->work_buf = av_malloc(c->comp_size)) == NULL) { + if (!(c->work_buf = av_malloc(c->comp_size))) { av_log(avctx, AV_LOG_ERROR, "Can't allocate work buffer.\n"); - return -1; + return AVERROR(ENOMEM); } /* Conservative upper bound taken from zlib v1.2.1 source via lcl.c */ c->comp_size = c->comp_size + ((c->comp_size + 7) >> 3) + ((c->comp_size + 63) >> 6) + 11; /* Allocate compression buffer */ - if ((c->comp_buf = av_malloc(c->comp_size)) == NULL) { + if (!(c->comp_buf = av_malloc(c->comp_size))) { av_log(avctx, AV_LOG_ERROR, "Can't allocate compression buffer.\n"); - return -1; + return AVERROR(ENOMEM); } c->pstride = FFALIGN(avctx->width, 16); - if ((c->prev = av_malloc(c->pstride * avctx->height)) == NULL) { + if (!(c->prev = av_malloc(c->pstride * avctx->height))) { av_log(avctx, AV_LOG_ERROR, "Can't allocate picture.\n"); - return -1; + return AVERROR(ENOMEM); } c->zstream.zalloc = Z_NULL; c->zstream.zfree = Z_NULL; c->zstream.opaque = Z_NULL; - zret = deflateInit(&(c->zstream), lvl); + zret = deflateInit(&c->zstream, lvl); if (zret != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); return -1; } - avctx->coded_frame = (AVFrame*)&c->pic; - - return 0; -} - - - -/** - * Uninit zmbv encoder - */ -static av_cold int encode_end(AVCodecContext *avctx) -{ - ZmbvEncContext * const c = avctx->priv_data; - - av_freep(&c->comp_buf); - av_freep(&c->work_buf); - - deflateEnd(&(c->zstream)); - av_freep(&c->prev); + avctx->coded_frame = av_frame_alloc(); + if (!avctx->coded_frame) { + encode_end(avctx); + return AVERROR(ENOMEM); + } return 0; } AVCodec ff_zmbv_encoder = { - "zmbv", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_ZMBV, - sizeof(ZmbvEncContext), - encode_init, - encode_frame, - encode_end, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_PAL8, PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), + .name = "zmbv", + .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_ZMBV, + .priv_data_size = sizeof(ZmbvEncContext), + .init = encode_init, + .encode2 = encode_frame, + .close = encode_end, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE }, };