X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcljr.c;h=40d8a4c449946d6b2b901d72578bdda6ef757e8d;hb=04d382252456c6a03ddbabbf1abcd274f761e6cd;hp=e8d818aa7840bc6fae510af7dcb42c499dce240a;hpb=fc9489f6adb9d3e790e6e5ebe984eaee0c733b09;p=ffmpeg diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index e8d818aa784..40d8a4c4499 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -25,118 +25,95 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "get_bits.h" +#include "internal.h" +#include "put_bits.h" -/* Disable the encoder. */ -#undef CONFIG_CLJR_ENCODER -#define CONFIG_CLJR_ENCODER 0 - -typedef struct CLJRContext{ - AVCodecContext *avctx; - AVFrame picture; +typedef struct CLJRContext { + AVFrame picture; } CLJRContext; +static av_cold int common_init(AVCodecContext *avctx) +{ + CLJRContext * const a = avctx->priv_data; + + avctx->coded_frame = &a->picture; + + return 0; +} + +#if CONFIG_CLJR_DECODER static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; + int buf_size = avpkt->size; CLJRContext * const a = avctx->priv_data; GetBitContext gb; AVFrame *picture = data; - AVFrame * const p= (AVFrame*)&a->picture; + AVFrame * const p = &a->picture; int x, y; - if(p->data[0]) + if (p->data[0]) avctx->release_buffer(avctx, p); - if(buf_size/avctx->height < avctx->width) { - av_log(avctx, AV_LOG_ERROR, "Resolution larger than buffer size. Invalid header?\n"); - return -1; + if (avctx->height <= 0 || avctx->width <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid width or height\n"); + return AVERROR_INVALIDDATA; } - p->reference= 0; - if(avctx->get_buffer(avctx, p) < 0){ + if (buf_size < avctx->height * avctx->width) { + av_log(avctx, AV_LOG_ERROR, + "Resolution larger than buffer size. Invalid header?\n"); + return AVERROR_INVALIDDATA; + } + + p->reference = 0; + if (avctx->get_buffer(avctx, p) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } - p->pict_type= AV_PICTURE_TYPE_I; - p->key_frame= 1; + p->pict_type = AV_PICTURE_TYPE_I; + p->key_frame = 1; init_get_bits(&gb, buf, buf_size * 8); - for(y=0; yheight; y++){ - uint8_t *luma= &a->picture.data[0][ y*a->picture.linesize[0] ]; - 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; xwidth; x+=4){ + for (y = 0; y < avctx->height; y++) { + uint8_t *luma = &a->picture.data[0][y * a->picture.linesize[0]]; + 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+= 4; + luma += 4; *(cb++) = get_bits(&gb, 6) << 2; *(cr++) = get_bits(&gb, 6) << 2; } } - *picture= *(AVFrame*)&a->picture; + *picture = a->picture; *data_size = sizeof(AVPicture); - emms_c(); - return buf_size; } -#if CONFIG_CLJR_ENCODER -static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ - CLJRContext * const a = avctx->priv_data; - AVFrame *pict = data; - AVFrame * const p= (AVFrame*)&a->picture; - int size; - - *p = *pict; - p->pict_type= AV_PICTURE_TYPE_I; - p->key_frame= 1; - - emms_c(); - - avpriv_align_put_bits(&a->pb); - while(get_bit_count(&a->pb)&31) - put_bits(&a->pb, 8, 0); - - size= get_bit_count(&a->pb)/32; - - return size*4; -} -#endif - -static av_cold void common_init(AVCodecContext *avctx){ - CLJRContext * const a = avctx->priv_data; - - avctx->coded_frame= (AVFrame*)&a->picture; - a->avctx= avctx; -} - -static av_cold int decode_init(AVCodecContext *avctx){ - - common_init(avctx); - - avctx->pix_fmt= PIX_FMT_YUV411P; - - return 0; +static av_cold int decode_init(AVCodecContext *avctx) +{ + avctx->pix_fmt = PIX_FMT_YUV411P; + return common_init(avctx); } -#if CONFIG_CLJR_ENCODER -static av_cold int encode_init(AVCodecContext *avctx){ - - common_init(avctx); +static av_cold int decode_end(AVCodecContext *avctx) +{ + CLJRContext *a = avctx->priv_data; + if (a->picture.data[0]) + avctx->release_buffer(avctx, &a->picture); return 0; } -#endif AVCodec ff_cljr_decoder = { .name = "cljr", @@ -144,19 +121,62 @@ AVCodec ff_cljr_decoder = { .id = CODEC_ID_CLJR, .priv_data_size = sizeof(CLJRContext), .init = decode_init, + .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), + .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), }; +#endif #if CONFIG_CLJR_ENCODER +static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *p, int *got_packet) +{ + PutBitContext pb; + 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, pkt->data, pkt->size); + + for (y = 0; y < avctx->height; y++) { + uint8_t *luma = &p->data[0][y * p->linesize[0]]; + uint8_t *cb = &p->data[1][y * p->linesize[1]]; + uint8_t *cr = &p->data[2][y * p->linesize[2]]; + for (x = 0; x < avctx->width; x += 4) { + put_bits(&pb, 5, luma[3] >> 3); + put_bits(&pb, 5, luma[2] >> 3); + put_bits(&pb, 5, luma[1] >> 3); + put_bits(&pb, 5, luma[0] >> 3); + luma += 4; + put_bits(&pb, 6, *(cb++) >> 2); + put_bits(&pb, 6, *(cr++) >> 2); + } + } + + flush_put_bits(&pb); + + pkt->size = put_bits_count(&pb) / 8; + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + return 0; +} + AVCodec ff_cljr_encoder = { .name = "cljr", .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_CLJR, .priv_data_size = sizeof(CLJRContext), - .init = encode_init, - .encode = encode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), + .init = common_init, + .encode2 = encode_frame, + .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_YUV411P, + PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), }; #endif