#include <zlib.h>
#include "avcodec.h"
+#include "internal.h"
+#include "libavutil/common.h"
-typedef struct {
- AVFrame previous_frame;
+typedef struct ZeroCodecContext {
+ AVFrame *previous_frame;
z_stream zstream;
- int size;
} ZeroCodecContext;
static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
- int *data_size, AVPacket *avpkt)
+ int *got_frame, AVPacket *avpkt)
{
ZeroCodecContext *zc = avctx->priv_data;
- AVFrame *pic = avctx->coded_frame;
- AVFrame *prev_pic = &zc->previous_frame;
+ AVFrame *pic = data;
+ AVFrame *prev_pic = zc->previous_frame;
z_stream *zstream = &zc->zstream;
- uint8_t *prev, *dst;
- int i, j, zret;
+ uint8_t *prev = prev_pic->data[0];
+ uint8_t *dst;
+ int i, j, zret, ret;
- pic->reference = 3;
+ if (avpkt->flags & AV_PKT_FLAG_KEY) {
+ pic->key_frame = 1;
+ pic->pict_type = AV_PICTURE_TYPE_I;
+ } else {
+ if (!prev) {
+ av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
+ return AVERROR_INVALIDDATA;
+ }
- if (avctx->get_buffer(avctx, pic) < 0) {
- av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
- return AVERROR(ENOMEM);
+ prev += (avctx->height - 1) * prev_pic->linesize[0];
+
+ pic->key_frame = 0;
+ pic->pict_type = AV_PICTURE_TYPE_P;
}
zret = inflateReset(zstream);
-
if (zret != Z_OK) {
- av_log(avctx, AV_LOG_ERROR, "Could not reset inflate: %d\n", zret);
- return AVERROR(EINVAL);
+ av_log(avctx, AV_LOG_ERROR, "Could not reset inflate: %d.\n", zret);
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (ff_get_buffer(avctx, pic, AV_GET_BUFFER_FLAG_REF) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
+ return AVERROR(ENOMEM);
}
zstream->next_in = avpkt->data;
zstream->avail_in = avpkt->size;
- prev = prev_pic->data[0];
- dst = pic->data[0];
+ dst = pic->data[0] + (avctx->height - 1) * pic->linesize[0];
/**
* ZeroCodec has very simple interframe compression. If a value
* is the same as the previous frame, set it to 0.
*/
- if (avpkt->flags & AV_PKT_FLAG_KEY) {
-
- pic->key_frame = 1;
- pic->pict_type = AV_PICTURE_TYPE_I;
-
- for (i = 0; i < avctx->height; i++) {
-
- zstream->next_out = dst;
- zstream->avail_out = avctx->width << 1;
+ for (i = 0; i < avctx->height; i++) {
+ zstream->next_out = dst;
+ zstream->avail_out = avctx->width << 1;
- zret = inflate(zstream, Z_SYNC_FLUSH);
-
- if (zret != Z_OK && zret != Z_STREAM_END) {
- av_log(avctx, AV_LOG_ERROR,
- "Inflate failed with return code: %d\n", zret);
- return AVERROR(EINVAL);
- }
-
- dst += pic->linesize[0];
+ zret = inflate(zstream, Z_SYNC_FLUSH);
+ if (zret != Z_OK && zret != Z_STREAM_END) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Inflate failed with return code: %d.\n", zret);
+ return AVERROR_INVALIDDATA;
}
- } else {
-
- pic->key_frame = 0;
- pic->pict_type = AV_PICTURE_TYPE_P;
-
- for (i = 0; i < avctx->height; i++) {
-
- zstream->next_out = dst;
- zstream->avail_out = avctx->width << 1;
-
- zret = inflate(zstream, Z_SYNC_FLUSH);
-
- if (zret != Z_OK && zret != Z_STREAM_END) {
- av_log(avctx, AV_LOG_ERROR,
- "Inflate failed with return code: %d\n", zret);
- return AVERROR(EINVAL);
- }
+ if (!(avpkt->flags & AV_PKT_FLAG_KEY))
for (j = 0; j < avctx->width << 1; j++)
dst[j] += prev[j] & -!dst[j];
- prev += prev_pic->linesize[0];
- dst += pic->linesize[0];
- }
+ prev -= prev_pic->linesize[0];
+ dst -= pic->linesize[0];
}
- /* Release the previous buffer if need be */
- if (prev_pic->data[0])
- avctx->release_buffer(avctx, prev_pic);
-
- /* Store the previouse frame for use later */
- *prev_pic = *pic;
+ av_frame_unref(zc->previous_frame);
+ if ((ret = av_frame_ref(zc->previous_frame, pic)) < 0)
+ return ret;
- *data_size = sizeof(AVFrame);
- *(AVFrame *)data = *pic;
+ *got_frame = 1;
return avpkt->size;
}
static av_cold int zerocodec_decode_close(AVCodecContext *avctx)
{
ZeroCodecContext *zc = avctx->priv_data;
- AVFrame *prev_pic = &zc->previous_frame;
- inflateEnd(&zc->zstream);
+ av_frame_free(&zc->previous_frame);
- /* Release last frame */
- if (prev_pic->data[0])
- avctx->release_buffer(avctx, prev_pic);
-
- av_freep(&avctx->coded_frame);
+ inflateEnd(&zc->zstream);
return 0;
}
z_stream *zstream = &zc->zstream;
int zret;
- avctx->pix_fmt = PIX_FMT_UYVY422;
+ avctx->pix_fmt = AV_PIX_FMT_UYVY422;
avctx->bits_per_raw_sample = 8;
- zc->size = avpicture_get_size(avctx->pix_fmt,
- avctx->width, avctx->height);
-
zstream->zalloc = Z_NULL;
zstream->zfree = Z_NULL;
zstream->opaque = Z_NULL;
zret = inflateInit(zstream);
-
if (zret != Z_OK) {
- av_log(avctx, AV_LOG_ERROR, "Could not initialize inflate: %d\n", zret);
+ av_log(avctx, AV_LOG_ERROR, "Could not initialize inflate: %d.\n", zret);
return AVERROR(ENOMEM);
}
- avctx->coded_frame = avcodec_alloc_frame();
-
- if (!avctx->coded_frame) {
- av_log(avctx, AV_LOG_ERROR, "Could not allocate frame buffer.\n");
+ zc->previous_frame = av_frame_alloc();
+ if (!zc->previous_frame) {
zerocodec_decode_close(avctx);
return AVERROR(ENOMEM);
}
AVCodec ff_zerocodec_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.name = "zerocodec",
- .id = CODEC_ID_ZEROCODEC,
+ .long_name = NULL_IF_CONFIG_SMALL("ZeroCodec Lossless Video"),
+ .id = AV_CODEC_ID_ZEROCODEC,
.priv_data_size = sizeof(ZeroCodecContext),
.init = zerocodec_decode_init,
.decode = zerocodec_decode_frame,
.close = zerocodec_decode_close,
- .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("ZeroCodec Lossless Video"),
+ .capabilities = AV_CODEC_CAP_DR1,
};
projects / ffmpeg / blobdiff