#include "avcodec.h"
#include "libavutil/opt.h"
#include "get_bits.h"
+#include "internal.h"
#include "put_bits.h"
typedef struct CLJRContext {
if (p->data[0])
avctx->release_buffer(avctx, p);
+ if (avctx->height <= 0 || avctx->width <= 0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid width or height\n");
+ return AVERROR_INVALIDDATA;
+ }
+
if (buf_size / avctx->height < avctx->width) {
av_log(avctx, AV_LOG_ERROR,
"Resolution larger than buffer size. Invalid header?\n");
uint8_t *cb = &a->picture.data[1][y * a->picture.linesize[1]];
uint8_t *cr = &a->picture.data[2][y * a->picture.linesize[2]];
for (x = 0; x < avctx->width; x += 4) {
- luma[3] = get_bits(&gb, 5) << 3;
- luma[2] = get_bits(&gb, 5) << 3;
- luma[1] = get_bits(&gb, 5) << 3;
- luma[0] = get_bits(&gb, 5) << 3;
+ luma[3] = (get_bits(&gb, 5)*33) >> 2;
+ luma[2] = (get_bits(&gb, 5)*33) >> 2;
+ luma[1] = (get_bits(&gb, 5)*33) >> 2;
+ luma[0] = (get_bits(&gb, 5)*33) >> 2;
luma += 4;
*(cb++) = get_bits(&gb, 6) << 2;
*(cr++) = get_bits(&gb, 6) << 2;
#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)
{
CLJRContext *a = avctx->priv_data;
PutBitContext pb;
- AVFrame *p = data;
- int x, y;
+ int x, y, ret;
uint32_t dither= avctx->frame_number;
static const uint32_t ordered_dither[2][2] =
{
{ 0xCB2A0000, 0xCB250000 },
};
- p->pict_type = AV_PICTURE_TYPE_I;
- p->key_frame = 1;
+ 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;
+ }
- init_put_bits(&pb, buf, buf_size / 8);
+ avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+ avctx->coded_frame->key_frame = 1;
+
+ 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]];
case 1: dither = dither * 1664525 + 1013904223; break;
case 2: dither = ordered_dither[ y&1 ][ (x>>2)&1 ];break;
}
- put_bits(&pb, 5, (luma[3] + (dither>>29) ) >> 3);
- put_bits(&pb, 5, (luma[2] + ((dither>>26)&7)) >> 3);
- put_bits(&pb, 5, (luma[1] + ((dither>>23)&7)) >> 3);
- put_bits(&pb, 5, (luma[0] + ((dither>>20)&7)) >> 3);
+ put_bits(&pb, 5, (249*(luma[3] + (dither>>29) )) >> 11);
+ put_bits(&pb, 5, (249*(luma[2] + ((dither>>26)&7))) >> 11);
+ put_bits(&pb, 5, (249*(luma[1] + ((dither>>23)&7))) >> 11);
+ put_bits(&pb, 5, (249*(luma[0] + ((dither>>20)&7))) >> 11);
luma += 4;
- put_bits(&pb, 6, (*(cb++) + ((dither>>18)&3)) >> 2);
- put_bits(&pb, 6, (*(cr++) + ((dither>>16)&3)) >> 2);
+ put_bits(&pb, 6, (253*(*(cb++) + ((dither>>18)&3))) >> 10);
+ put_bits(&pb, 6, (253*(*(cr++) + ((dither>>16)&3))) >> 10);
}
}
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;
}
#define OFFSET(x) offsetof(CLJRContext, x)
.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"),