On Sun, Feb 19, 2012 at 03:44:15PM +0100, Anton Khirnov wrote:
> ---
> libavcodec/zmbvenc.c | 41 ++++++++++++++++++++++++++---------------
> 1 files changed, 26 insertions(+), 15 deletions(-)
>
> diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c
> index 6425353..37c10c6 100644
> --- a/libavcodec/zmbvenc.c
> +++ b/libavcodec/zmbvenc.c
> @@ -29,6 +29,7 @@
>
> #include "libavutil/intreadwrite.h"
> #include "avcodec.h"
> +#include "internal.h"
>
> #include <zlib.h>
>
> @@ -115,19 +116,18 @@ 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;
> + 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++;
> @@ -227,18 +227,29 @@ 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; len++;
> + *buf++ = fl;
> if (keyframe) {
> - *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
> + *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;
ahem, why do you thinks there's 'keyframe' variable?
besides that LGTM
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
