diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-09 00:05:51 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-09 00:05:51 +0100 |
commit | 25b9eef410f4a737250dcf2d17b65f6c0c39cd6a (patch) | |
tree | a1a8c88aca0b5a88a6fd0c2e9ac1008698f34fea /libavcodec/cljr.c | |
parent | b229485f1ad38162927b235a359b98ff5a0dc13a (diff) | |
parent | 6b60a4c9c94bbe03afc8e0851197d97d96f644e5 (diff) | |
download | ffmpeg-streaming-25b9eef410f4a737250dcf2d17b65f6c0c39cd6a.zip ffmpeg-streaming-25b9eef410f4a737250dcf2d17b65f6c0c39cd6a.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cljr: K&R cosmetics
cljr: return a more sensible value when encountering invalid headers
cljr: drop unnecessary emms_c() calls without MMX code
cljr: remove useless casts
cljr: group encode/decode parts under single ifdefs
cljr: remove stray semicolon
cljr: add missing return statement in decode_end()
doc: add pulseaudio to the input list
avconv: remove unsubstantiated comment
shorten: avoid abort() on unknown audio types
cljr: add encoder
build: merge lists of HTML documentation targets
tests/examples: Mark some variables only used within their files as static.
tests/tools/examples: Replace direct exit() calls by return.
x86 cpuid: set vendor union members separately
cljr: release picture at end of decoding
rv40: NEON optimised rv40 qpel motion compensation
Conflicts:
doc/examples/muxing.c
libavcodec/cljr.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cljr.c')
-rw-r--r-- | libavcodec/cljr.c | 153 |
1 files changed, 81 insertions, 72 deletions
diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index 53ab40c..183652b 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -25,119 +25,92 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "get_bits.h" +#include "put_bits.h" -/* Disable the encoder. */ -#undef CONFIG_CLJR_ENCODER -#define CONFIG_CLJR_ENCODER 0 - -typedef struct CLJRContext{ +typedef struct CLJRContext { AVCodecContext *avctx; - AVFrame picture; + AVFrame picture; } CLJRContext; +static av_cold int common_init(AVCodecContext *avctx) +{ + CLJRContext * const a = avctx->priv_data; + + avcodec_get_frame_defaults(&a->picture); + avctx->coded_frame = &a->picture; + a->avctx = avctx; + + 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 (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){ + 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; 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){ + 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; - - avcodec_get_frame_defaults(&a->picture); - 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", @@ -145,19 +118,55 @@ 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, unsigned char *buf, + int buf_size, void *data) +{ + PutBitContext pb; + AVFrame *p = data; + int x, y; + + p->pict_type = AV_PICTURE_TYPE_I; + p->key_frame = 1; + + init_put_bits(&pb, buf, buf_size / 8); + + 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); + + return put_bits_count(&pb) / 8; +} + AVCodec ff_cljr_encoder = { .name = "cljr", .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_CLJR, .priv_data_size = sizeof(CLJRContext), - .init = encode_init, + .init = common_init, .encode = encode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), + .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_YUV411P, + PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), }; #endif |