#include <stdio.h>
#include <stdlib.h>
+#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
+#include "internal.h"
#include <zlib.h>
*/
typedef struct ZmbvEncContext {
AVCodecContext *avctx;
- AVFrame pic;
int range;
uint8_t *comp_buf, *work_buf;
int comp_size;
int keyint, curfrm;
z_stream zstream;
+
+ int score_tab[256];
} ZmbvEncContext;
-static int score_tab[256];
/** Block comparing function
* XXX should be optimized and moved to DSPContext
* TODO handle out of edge ME
*/
-static inline int block_cmp(uint8_t *src, int stride, uint8_t *src2, int stride2,
- int bw, int bh, int *xored)
+static inline int block_cmp(ZmbvEncContext *c, uint8_t *src, int stride,
+ uint8_t *src2, int stride2, int bw, int bh,
+ int *xored)
{
int sum = 0;
int i, j;
}
for(i = 1; i < 256; i++)
- sum += score_tab[histogram[i]];
+ sum += c->score_tab[histogram[i]];
return sum;
}
*mx = *my = 0;
bw = FFMIN(ZMBV_BLOCK, c->avctx->width - x);
bh = FFMIN(ZMBV_BLOCK, c->avctx->height - y);
- bv = block_cmp(src, sstride, prev, pstride, bw, bh, xored);
+ bv = block_cmp(c, src, sstride, prev, pstride, bw, bh, xored);
if(!bv) return 0;
for(ty = FFMAX(y - c->range, 0); ty < FFMIN(y + c->range, c->avctx->height - bh); ty++){
for(tx = FFMAX(x - c->range, 0); tx < FFMIN(x + c->range, c->avctx->width - bw); tx++){
if(tx == x && ty == y) continue; // we already tested this block
dx = tx - x;
dy = ty - y;
- tv = block_cmp(src, sstride, prev + dx + dy*pstride, pstride, bw, bh, xored);
+ tv = block_cmp(c, src, sstride, prev + dx + dy * pstride, pstride, bw, bh, xored);
if(tv < bv){
bv = tv;
*mx = dx;
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;
+#if FF_API_CODED_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
+ avctx->coded_frame->pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
+ avctx->coded_frame->key_frame = keyframe;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
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;
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;
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);
+
+ return 0;
+}
/**
* Init zmbv encoder
int lvl = 9;
for(i=1; i<256; i++)
- score_tab[i]= -i * log(i/(double)(ZMBV_BLOCK*ZMBV_BLOCK)) * (256/M_LN2);
+ c->score_tab[i] = -i * log(i / (double)(ZMBV_BLOCK * ZMBV_BLOCK)) * (256 / M_LN2);
c->avctx = avctx;
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 AVERROR(ENOMEM);
}
((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 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 AVERROR(ENOMEM);
}
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);
-
return 0;
}
AVCodec ff_zmbv_encoder = {
.name = "zmbv",
+ .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"),
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_ZMBV,
+ .id = AV_CODEC_ID_ZMBV,
.priv_data_size = sizeof(ZmbvEncContext),
.init = encode_init,
- .encode = encode_frame,
+ .encode2 = encode_frame,
.close = encode_end,
- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_PAL8, PIX_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"),
+ .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE },
};