diff options
| author | Paul B Mahol <onemda@gmail.com> | 2011-12-08 00:05:23 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-12-08 09:47:53 +0100 |
| commit | e93947b7d845168beb768c988f4e13fe9601d670 (patch) | |
| tree | af687fbca0087de4cfaf1fee0baef3baf04861c2 /libavcodec | |
| parent | 47b20a1db07552fa6071fb7368534dda0b0f5546 (diff) | |
cljr: add encoder
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/allcodecs.c | 2 | ||||
| -rw-r--r-- | libavcodec/cljr.c | 43 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 28 insertions, 19 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 82023ff230..59795b116a 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -87,7 +87,7 @@ void avcodec_register_all(void) REGISTER_DECODER (CAVS, cavs); REGISTER_DECODER (CDGRAPHICS, cdgraphics); REGISTER_DECODER (CINEPAK, cinepak); - REGISTER_DECODER (CLJR, cljr); + REGISTER_ENCDEC (CLJR, cljr); REGISTER_DECODER (CSCD, cscd); REGISTER_DECODER (CYUV, cyuv); REGISTER_DECODER (DFA, dfa); diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index 6c7d7b0fee..dd720828a6 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -25,12 +25,8 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "get_bits.h" - -/* Disable the encoder. */ -#undef CONFIG_CLJR_ENCODER -#define CONFIG_CLJR_ENCODER 0 +#include "put_bits.h" typedef struct CLJRContext{ AVCodecContext *avctx; @@ -92,24 +88,35 @@ static int decode_frame(AVCodecContext *avctx, #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; + PutBitContext pb; + AVFrame *p = data; + int x, y; - *p = *pict; p->pict_type= AV_PICTURE_TYPE_I; p->key_frame= 1; - emms_c(); + 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); + } + } - avpriv_align_put_bits(&a->pb); - while(get_bit_count(&a->pb)&31) - put_bits(&a->pb, 8, 0); + flush_put_bits(&pb); - size= get_bit_count(&a->pb)/32; + emms_c(); - return size*4; + return put_bits_count(&pb) / 8; } #endif @@ -165,6 +172,8 @@ AVCodec ff_cljr_encoder = { .priv_data_size = sizeof(CLJRContext), .init = encode_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 diff --git a/libavcodec/version.h b/libavcodec/version.h index 3918b139da..a41234fd90 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -21,7 +21,7 @@ #define AVCODEC_VERSION_H #define LIBAVCODEC_VERSION_MAJOR 53 -#define LIBAVCODEC_VERSION_MINOR 26 +#define LIBAVCODEC_VERSION_MINOR 27 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |