Commit 3dffa1b4 authored by Anton Khirnov's avatar Anton Khirnov
Browse files

cljr: implement encode2.

parent 177bb4bf
......@@ -26,6 +26,7 @@
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
#include "put_bits.h"
typedef struct CLJRContext {
......@@ -128,17 +129,21 @@ AVCodec ff_cljr_decoder = {
#endif
#if CONFIG_CLJR_ENCODER
static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
int buf_size, void *data)
static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *p, int *got_packet)
{
PutBitContext pb;
AVFrame *p = data;
int x, y;
int x, y, ret;
if ((ret = ff_alloc_packet(pkt, 32*avctx->height*avctx->width/4)) < 0) {
av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
return ret;
}
avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
avctx->coded_frame->key_frame = 1;
init_put_bits(&pb, buf, buf_size / 8);
init_put_bits(&pb, pkt->data, pkt->size);
for (y = 0; y < avctx->height; y++) {
uint8_t *luma = &p->data[0][y * p->linesize[0]];
......@@ -157,7 +162,10 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
flush_put_bits(&pb);
return put_bits_count(&pb) / 8;
pkt->size = put_bits_count(&pb) / 8;
pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
AVCodec ff_cljr_encoder = {
......@@ -166,7 +174,7 @@ AVCodec ff_cljr_encoder = {
.id = CODEC_ID_CLJR,
.priv_data_size = sizeof(CLJRContext),
.init = common_init,
.encode = encode_frame,
.encode2 = encode_frame,
.pix_fmts = (const enum PixelFormat[]) { PIX_FMT_YUV411P,
PIX_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment