X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fhuffyuv.c;h=4fa6ddf7f8a8c5815411b67cac6ba20a65b0f20a;hb=e38215f2a4231af102a19a0e36e6c753b9318ef1;hp=81e9ee1207d9dc7ba1eea05af527c7473ee37ab8;hpb=19716d6478c1d2fbfa03f9c1e0c1d51909040a59;p=ffmpeg diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index 81e9ee1207d..4fa6ddf7f8a 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -3,6 +3,9 @@ * * Copyright (c) 2002-2003 Michael Niedermayer * + * see http://www.pcisys.net/~melanson/codecs/huffyuv.txt for a description of + * the algorithm used + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -18,23 +21,21 @@ * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * see http://www.pcisys.net/~melanson/codecs/huffyuv.txt for a description of - * the algorithm used */ /** - * @file huffyuv.c + * @file libavcodec/huffyuv.c * huffyuv codec for libavcodec. */ #include "avcodec.h" -#include "bitstream.h" +#include "get_bits.h" +#include "put_bits.h" #include "dsputil.h" #define VLC_BITS 11 -#ifdef WORDS_BIGENDIAN +#if HAVE_BIGENDIAN #define B 3 #define G 2 #define R 1 @@ -70,8 +71,8 @@ typedef struct HYuvContext{ uint64_t stats[3][256]; uint8_t len[3][256]; uint32_t bits[3][256]; + uint32_t pix_bgr_map[1< 256) { + av_log(NULL, AV_LOG_ERROR, "Error reading huffman table\n"); + return -1; + } while (repeat--) dst[i++] = val; } + return 0; } static int generate_bits_table(uint32_t *dst, uint8_t *len_table){ @@ -261,20 +209,20 @@ static int generate_bits_table(uint32_t *dst, uint8_t *len_table){ return 0; } -#ifdef CONFIG_ENCODERS +#if CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER typedef struct { uint64_t val; int name; -} heap_elem_t; +} HeapElem; -static void heap_sift(heap_elem_t *h, int root, int size) +static void heap_sift(HeapElem *h, int root, int size) { while(root*2+1 < size) { int child = root*2+1; if(child < size-1 && h[child].val > h[child+1].val) child++; if(h[root].val > h[child].val) { - FFSWAP(heap_elem_t, h[root], h[child]); + FFSWAP(HeapElem, h[root], h[child]); root = child; } else break; @@ -282,7 +230,7 @@ static void heap_sift(heap_elem_t *h, int root, int size) } static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){ - heap_elem_t h[size]; + HeapElem h[size]; int up[2*size]; int len[2*size]; int offset, i, next; @@ -312,39 +260,79 @@ static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){ len[i] = len[up[i]] + 1; for(i=0; i 32) break; + if(dst[i] >= 32) break; } if(i==size) break; } } -#endif /* CONFIG_ENCODERS */ +#endif /* CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER */ static void generate_joint_tables(HYuvContext *s){ - // TODO modify init_vlc to allow sparse tables, and eliminate pix2_map - // TODO rgb + uint16_t symbols[1<bitstream_bpp < 24){ - uint16_t bits[1<len[0][y]; int limit = VLC_BITS - len0; - if(limit > 0){ - for(u=0; u<256; u++){ - int len1 = s->len[p][u]; - if(len1 <= limit){ - len[i] = len0 + len1; - bits[i] = (s->bits[0][y] << len1) + s->bits[p][u]; - s->pix2_map[p][i] = (y<<8) + u; - i++; - } - } + if(limit <= 0) + continue; + for(u=0; u<256; u++){ + int len1 = s->len[p][u]; + if(len1 > limit) + continue; + len[i] = len0 + len1; + bits[i] = (s->bits[0][y] << len1) + s->bits[p][u]; + symbols[i] = (y<<8) + u; + if(symbols[i] != 0xffff) // reserved to mean "invalid" + i++; } } free_vlc(&s->vlc[3+p]); - init_vlc(&s->vlc[3+p], VLC_BITS, i, len, 1, 1, bits, 2, 2, 0); + init_vlc_sparse(&s->vlc[3+p], VLC_BITS, i, len, 1, 1, bits, 2, 2, symbols, 2, 2, 0); } + }else{ + uint8_t (*map)[4] = (uint8_t(*)[4])s->pix_bgr_map; + int i, b, g, r, code; + int p0 = s->decorrelate; + int p1 = !s->decorrelate; + // restrict the range to +/-16 becaues that's pretty much guaranteed to + // cover all the combinations that fit in 11 bits total, and it doesn't + // matter if we miss a few rare codes. + for(i=0, g=-16; g<16; g++){ + int len0 = s->len[p0][g&255]; + int limit0 = VLC_BITS - len0; + if(limit0 < 2) + continue; + for(b=-16; b<16; b++){ + int len1 = s->len[p1][b&255]; + int limit1 = limit0 - len1; + if(limit1 < 1) + continue; + code = (s->bits[p0][g&255] << len1) + s->bits[p1][b&255]; + for(r=-16; r<16; r++){ + int len2 = s->len[2][r&255]; + if(len2 > limit1) + continue; + len[i] = len0 + len1 + len2; + bits[i] = (code << len2) + s->bits[2][r&255]; + if(s->decorrelate){ + map[i][G] = g; + map[i][B] = g+b; + map[i][R] = g+r; + }else{ + map[i][B] = g; + map[i][G] = b; + map[i][R] = r; + } + i++; + } + } + } + free_vlc(&s->vlc[3]); + init_vlc(&s->vlc[3], VLC_BITS, i, len, 1, 1, bits, 2, 2, 0); } } @@ -355,8 +343,8 @@ static int read_huffman_tables(HYuvContext *s, uint8_t *src, int length){ init_get_bits(&gb, src, length*8); for(i=0; i<3; i++){ - read_len_table(s->len[i], &gb); - + if(read_len_table(s->len[i], &gb)<0) + return -1; if(generate_bits_table(s->bits[i], s->len[i])<0){ return -1; } @@ -380,9 +368,11 @@ static int read_old_huffman_tables(HYuvContext *s){ int i; init_get_bits(&gb, classic_shift_luma, sizeof(classic_shift_luma)*8); - read_len_table(s->len[0], &gb); + if(read_len_table(s->len[0], &gb)<0) + return -1; init_get_bits(&gb, classic_shift_chroma, sizeof(classic_shift_chroma)*8); - read_len_table(s->len[1], &gb); + if(read_len_table(s->len[1], &gb)<0) + return -1; for(i=0; i<256; i++) s->bits[0][i] = classic_add_luma [i]; for(i=0; i<256; i++) s->bits[1][i] = classic_add_chroma[i]; @@ -408,7 +398,7 @@ static int read_old_huffman_tables(HYuvContext *s){ #endif } -static void alloc_temp(HYuvContext *s){ +static av_cold void alloc_temp(HYuvContext *s){ int i; if(s->bitstream_bpp<24){ @@ -416,13 +406,11 @@ static void alloc_temp(HYuvContext *s){ s->temp[i]= av_malloc(s->width + 16); } }else{ - for(i=0; i<2; i++){ - s->temp[i]= av_malloc(4*s->width + 16); - } + s->temp[0]= av_malloc(4*s->width + 16); } } -static int common_init(AVCodecContext *avctx){ +static av_cold int common_init(AVCodecContext *avctx){ HYuvContext *s = avctx->priv_data; s->avctx= avctx; @@ -437,8 +425,8 @@ static int common_init(AVCodecContext *avctx){ return 0; } -#ifdef CONFIG_DECODERS -static int decode_init(AVCodecContext *avctx) +#if CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER +static av_cold int decode_init(AVCodecContext *avctx) { HYuvContext *s = avctx->priv_data; @@ -452,7 +440,7 @@ s->bgr32=1; //if(avctx->extradata) // printf("extradata:%X, extradata_size:%d\n", *(uint32_t*)avctx->extradata, avctx->extradata_size); if(avctx->extradata_size){ - if((avctx->bits_per_sample&7) && avctx->bits_per_sample != 12) + if((avctx->bits_per_coded_sample&7) && avctx->bits_per_coded_sample != 12) s->version=1; // do such files exist at all? else s->version=2; @@ -467,7 +455,7 @@ s->bgr32=1; s->predictor= method&63; s->bitstream_bpp= ((uint8_t*)avctx->extradata)[1]; if(s->bitstream_bpp==0) - s->bitstream_bpp= avctx->bits_per_sample&~7; + s->bitstream_bpp= avctx->bits_per_coded_sample&~7; interlace= (((uint8_t*)avctx->extradata)[2] & 0x30) >> 4; s->interlaced= (interlace==1) ? 1 : (interlace==2) ? 0 : s->interlaced; s->context= ((uint8_t*)avctx->extradata)[2] & 0x40 ? 1 : 0; @@ -475,7 +463,7 @@ s->bgr32=1; if(read_huffman_tables(s, ((uint8_t*)avctx->extradata)+4, avctx->extradata_size) < 0) return -1; }else{ - switch(avctx->bits_per_sample&7){ + switch(avctx->bits_per_coded_sample&7){ case 1: s->predictor= LEFT; s->decorrelate= 0; @@ -486,7 +474,7 @@ s->bgr32=1; break; case 3: s->predictor= PLANE; - s->decorrelate= avctx->bits_per_sample >= 24; + s->decorrelate= avctx->bits_per_coded_sample >= 24; break; case 4: s->predictor= MEDIAN; @@ -497,7 +485,7 @@ s->bgr32=1; s->decorrelate= 0; break; } - s->bitstream_bpp= avctx->bits_per_sample & ~7; + s->bitstream_bpp= avctx->bits_per_coded_sample & ~7; s->context= 0; if(read_old_huffman_tables(s) < 0) @@ -529,13 +517,13 @@ s->bgr32=1; alloc_temp(s); -// av_log(NULL, AV_LOG_DEBUG, "pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_sample, s->interlaced); +// av_log(NULL, AV_LOG_DEBUG, "pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_coded_sample, s->interlaced); return 0; } -#endif +#endif /* CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER */ -#ifdef CONFIG_ENCODERS +#if CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER static int store_table(HYuvContext *s, uint8_t *len, uint8_t *buf){ int i; int index= 0; @@ -559,7 +547,7 @@ static int store_table(HYuvContext *s, uint8_t *len, uint8_t *buf){ return index; } -static int encode_init(AVCodecContext *avctx) +static av_cold int encode_init(AVCodecContext *avctx) { HYuvContext *s = avctx->priv_data; int i, j; @@ -586,7 +574,7 @@ static int encode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "format not supported\n"); return -1; } - avctx->bits_per_sample= s->bitstream_bpp; + avctx->bits_per_coded_sample= s->bitstream_bpp; s->decorrelate= s->bitstream_bpp >= 24; s->predictor= avctx->prediction_method; s->interlaced= avctx->flags&CODEC_FLAG_INTERLACED_ME ? 1 : 0; @@ -677,7 +665,7 @@ static int encode_init(AVCodecContext *avctx) s->stats[i][j]= 0; } -// printf("pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_sample, s->interlaced); +// printf("pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_coded_sample, s->interlaced); alloc_temp(s); @@ -685,16 +673,15 @@ static int encode_init(AVCodecContext *avctx) return 0; } -#endif /* CONFIG_ENCODERS */ +#endif /* CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER */ /* TODO instead of restarting the read when the code isn't in the first level * of the joint table, jump into the 2nd level of the individual table. */ #define READ_2PIX(dst0, dst1, plane1){\ - int code = get_vlc2(&s->gb, s->vlc[3+plane1].table, VLC_BITS, 1);\ - if(code >= 0){\ - int x = s->pix2_map[plane1][code];\ - dst0 = x>>8;\ - dst1 = x;\ + uint16_t code = get_vlc2(&s->gb, s->vlc[3+plane1].table, VLC_BITS, 1);\ + if(code != 0xffff){\ + dst0 = code>>8;\ + dst1 = code;\ }else{\ dst0 = get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3);\ dst1 = get_vlc2(&s->gb, s->vlc[plane1].table, VLC_BITS, 3);\ @@ -706,9 +693,16 @@ static void decode_422_bitstream(HYuvContext *s, int count){ count/=2; - for(i=0; itemp[0][2*i ], s->temp[1][i], 1); - READ_2PIX(s->temp[0][2*i+1], s->temp[2][i], 2); + if(count >= (get_bits_left(&s->gb))/(31*4)){ + for(i=0; igb) < s->gb.size_in_bits; i++){ + READ_2PIX(s->temp[0][2*i ], s->temp[1][i], 1); + READ_2PIX(s->temp[0][2*i+1], s->temp[2][i], 2); + } + }else{ + for(i=0; itemp[0][2*i ], s->temp[1][i], 1); + READ_2PIX(s->temp[0][2*i+1], s->temp[2][i], 2); + } } } @@ -717,14 +711,23 @@ static void decode_gray_bitstream(HYuvContext *s, int count){ count/=2; - for(i=0; itemp[0][2*i ], s->temp[0][2*i+1], 0); + if(count >= (get_bits_left(&s->gb))/(31*2)){ + for(i=0; igb) < s->gb.size_in_bits; i++){ + READ_2PIX(s->temp[0][2*i ], s->temp[0][2*i+1], 0); + } + }else{ + for(i=0; itemp[0][2*i ], s->temp[0][2*i+1], 0); + } } } -#ifdef CONFIG_ENCODERS -static int encode_422_bitstream(HYuvContext *s, int count){ +#if CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER +static int encode_422_bitstream(HYuvContext *s, int offset, int count){ int i; + const uint8_t *y = s->temp[0] + offset; + const uint8_t *u = s->temp[1] + offset/2; + const uint8_t *v = s->temp[2] + offset/2; if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < 2*4*count){ av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); @@ -732,10 +735,10 @@ static int encode_422_bitstream(HYuvContext *s, int count){ } #define LOAD4\ - int y0 = s->temp[0][2*i];\ - int y1 = s->temp[0][2*i+1];\ - int u0 = s->temp[1][i];\ - int v0 = s->temp[2][i]; + int y0 = y[2*i];\ + int y1 = y[2*i+1];\ + int u0 = u[i];\ + int v0 = v[i]; count/=2; if(s->flags&CODEC_FLAG_PASS1){ @@ -815,41 +818,39 @@ static int encode_gray_bitstream(HYuvContext *s, int count){ } return 0; } -#endif /* CONFIG_ENCODERS */ +#endif /* CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER */ -static void decode_bgr_bitstream(HYuvContext *s, int count){ +static av_always_inline void decode_bgr_1(HYuvContext *s, int count, int decorrelate, int alpha){ int i; - - if(s->decorrelate){ - if(s->bitstream_bpp==24){ - for(i=0; itemp[0][4*i+G]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); - s->temp[0][4*i+B]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3) + s->temp[0][4*i+G]; - s->temp[0][4*i+R]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3) + s->temp[0][4*i+G]; - } + for(i=0; igb, s->vlc[3].table, VLC_BITS, 1); + if(code != -1){ + *(uint32_t*)&s->temp[0][4*i] = s->pix_bgr_map[code]; + }else if(decorrelate){ + s->temp[0][4*i+G] = get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); + s->temp[0][4*i+B] = get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3) + s->temp[0][4*i+G]; + s->temp[0][4*i+R] = get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3) + s->temp[0][4*i+G]; }else{ - for(i=0; itemp[0][4*i+G]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); - s->temp[0][4*i+B]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3) + s->temp[0][4*i+G]; - s->temp[0][4*i+R]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3) + s->temp[0][4*i+G]; - get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); //?! - } + s->temp[0][4*i+B] = get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); + s->temp[0][4*i+G] = get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); + s->temp[0][4*i+R] = get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); } + if(alpha) + get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); //?! + } +} + +static void decode_bgr_bitstream(HYuvContext *s, int count){ + if(s->decorrelate){ + if(s->bitstream_bpp==24) + decode_bgr_1(s, count, 1, 0); + else + decode_bgr_1(s, count, 1, 1); }else{ - if(s->bitstream_bpp==24){ - for(i=0; itemp[0][4*i+B]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); - s->temp[0][4*i+G]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); - s->temp[0][4*i+R]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); - } - }else{ - for(i=0; itemp[0][4*i+B]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); - s->temp[0][4*i+G]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); - s->temp[0][4*i+R]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); - get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); //?! - } - } + if(s->bitstream_bpp==24) + decode_bgr_1(s, count, 0, 0); + else + decode_bgr_1(s, count, 0, 1); } } @@ -894,7 +895,7 @@ static int encode_bgr_bitstream(HYuvContext *s, int count){ return 0; } -#ifdef CONFIG_DECODERS +#if CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER static void draw_slice(HYuvContext *s, int y){ int h, cy; int offset[4]; @@ -922,7 +923,9 @@ static void draw_slice(HYuvContext *s, int y){ s->last_slice_end= y + h; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size){ +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt){ + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; HYuvContext *s = avctx->priv_data; const int width= s->width; const int width2= s->width>>1; @@ -933,9 +936,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 AVFrame *picture = data; - s->bitstream_buffer= av_fast_realloc(s->bitstream_buffer, &s->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE); + av_fast_malloc(&s->bitstream_buffer, &s->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE); + if (!s->bitstream_buffer) + return AVERROR(ENOMEM); - s->dsp.bswap_buf((uint32_t*)s->bitstream_buffer, (uint32_t*)buf, buf_size/4); + memset(s->bitstream_buffer + buf_size, 0, FF_INPUT_BUFFER_PADDING_SIZE); + s->dsp.bswap_buf((uint32_t*)s->bitstream_buffer, (const uint32_t*)buf, buf_size/4); if(p->data[0]) avctx->release_buffer(avctx, p); @@ -987,10 +993,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 case LEFT: case PLANE: decode_422_bitstream(s, width-2); - lefty= add_left_prediction(p->data[0] + 2, s->temp[0], width-2, lefty); + lefty= s->dsp.add_hfyu_left_prediction(p->data[0] + 2, s->temp[0], width-2, lefty); if(!(s->flags&CODEC_FLAG_GRAY)){ - leftu= add_left_prediction(p->data[1] + 1, s->temp[1], width2-1, leftu); - leftv= add_left_prediction(p->data[2] + 1, s->temp[2], width2-1, leftv); + leftu= s->dsp.add_hfyu_left_prediction(p->data[1] + 1, s->temp[1], width2-1, leftu); + leftv= s->dsp.add_hfyu_left_prediction(p->data[2] + 1, s->temp[2], width2-1, leftv); } for(cy=y=1; yheight; y++,cy++){ @@ -1001,7 +1007,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 ydst= p->data[0] + p->linesize[0]*y; - lefty= add_left_prediction(ydst, s->temp[0], width, lefty); + lefty= s->dsp.add_hfyu_left_prediction(ydst, s->temp[0], width, lefty); if(s->predictor == PLANE){ if(y>s->interlaced) s->dsp.add_bytes(ydst, ydst - fake_ystride, width); @@ -1017,10 +1023,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 vdst= p->data[2] + p->linesize[2]*cy; decode_422_bitstream(s, width); - lefty= add_left_prediction(ydst, s->temp[0], width, lefty); + lefty= s->dsp.add_hfyu_left_prediction(ydst, s->temp[0], width, lefty); if(!(s->flags&CODEC_FLAG_GRAY)){ - leftu= add_left_prediction(udst, s->temp[1], width2, leftu); - leftv= add_left_prediction(vdst, s->temp[2], width2, leftv); + leftu= s->dsp.add_hfyu_left_prediction(udst, s->temp[1], width2, leftu); + leftv= s->dsp.add_hfyu_left_prediction(vdst, s->temp[2], width2, leftv); } if(s->predictor == PLANE){ if(cy>s->interlaced){ @@ -1038,10 +1044,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 case MEDIAN: /* first line except first 2 pixels is left predicted */ decode_422_bitstream(s, width-2); - lefty= add_left_prediction(p->data[0] + 2, s->temp[0], width-2, lefty); + lefty= s->dsp.add_hfyu_left_prediction(p->data[0] + 2, s->temp[0], width-2, lefty); if(!(s->flags&CODEC_FLAG_GRAY)){ - leftu= add_left_prediction(p->data[1] + 1, s->temp[1], width2-1, leftu); - leftv= add_left_prediction(p->data[2] + 1, s->temp[2], width2-1, leftv); + leftu= s->dsp.add_hfyu_left_prediction(p->data[1] + 1, s->temp[1], width2-1, leftu); + leftv= s->dsp.add_hfyu_left_prediction(p->data[2] + 1, s->temp[2], width2-1, leftv); } cy=y=1; @@ -1049,31 +1055,31 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 /* second line is left predicted for interlaced case */ if(s->interlaced){ decode_422_bitstream(s, width); - lefty= add_left_prediction(p->data[0] + p->linesize[0], s->temp[0], width, lefty); + lefty= s->dsp.add_hfyu_left_prediction(p->data[0] + p->linesize[0], s->temp[0], width, lefty); if(!(s->flags&CODEC_FLAG_GRAY)){ - leftu= add_left_prediction(p->data[1] + p->linesize[2], s->temp[1], width2, leftu); - leftv= add_left_prediction(p->data[2] + p->linesize[1], s->temp[2], width2, leftv); + leftu= s->dsp.add_hfyu_left_prediction(p->data[1] + p->linesize[2], s->temp[1], width2, leftu); + leftv= s->dsp.add_hfyu_left_prediction(p->data[2] + p->linesize[1], s->temp[2], width2, leftv); } y++; cy++; } /* next 4 pixels are left predicted too */ decode_422_bitstream(s, 4); - lefty= add_left_prediction(p->data[0] + fake_ystride, s->temp[0], 4, lefty); + lefty= s->dsp.add_hfyu_left_prediction(p->data[0] + fake_ystride, s->temp[0], 4, lefty); if(!(s->flags&CODEC_FLAG_GRAY)){ - leftu= add_left_prediction(p->data[1] + fake_ustride, s->temp[1], 2, leftu); - leftv= add_left_prediction(p->data[2] + fake_vstride, s->temp[2], 2, leftv); + leftu= s->dsp.add_hfyu_left_prediction(p->data[1] + fake_ustride, s->temp[1], 2, leftu); + leftv= s->dsp.add_hfyu_left_prediction(p->data[2] + fake_vstride, s->temp[2], 2, leftv); } /* next line except the first 4 pixels is median predicted */ lefttopy= p->data[0][3]; decode_422_bitstream(s, width-4); - add_median_prediction(p->data[0] + fake_ystride+4, p->data[0]+4, s->temp[0], width-4, &lefty, &lefttopy); + s->dsp.add_hfyu_median_prediction(p->data[0] + fake_ystride+4, p->data[0]+4, s->temp[0], width-4, &lefty, &lefttopy); if(!(s->flags&CODEC_FLAG_GRAY)){ lefttopu= p->data[1][1]; lefttopv= p->data[2][1]; - add_median_prediction(p->data[1] + fake_ustride+2, p->data[1]+2, s->temp[1], width2-2, &leftu, &lefttopu); - add_median_prediction(p->data[2] + fake_vstride+2, p->data[2]+2, s->temp[2], width2-2, &leftv, &lefttopv); + s->dsp.add_hfyu_median_prediction(p->data[1] + fake_ustride+2, p->data[1]+2, s->temp[1], width2-2, &leftu, &lefttopu); + s->dsp.add_hfyu_median_prediction(p->data[2] + fake_vstride+2, p->data[2]+2, s->temp[2], width2-2, &leftv, &lefttopv); } y++; cy++; @@ -1084,7 +1090,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 while(2*cy > y){ decode_gray_bitstream(s, width); ydst= p->data[0] + p->linesize[0]*y; - add_median_prediction(ydst, ydst - fake_ystride, s->temp[0], width, &lefty, &lefttopy); + s->dsp.add_hfyu_median_prediction(ydst, ydst - fake_ystride, s->temp[0], width, &lefty, &lefttopy); y++; } if(y>=height) break; @@ -1097,10 +1103,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 udst= p->data[1] + p->linesize[1]*cy; vdst= p->data[2] + p->linesize[2]*cy; - add_median_prediction(ydst, ydst - fake_ystride, s->temp[0], width, &lefty, &lefttopy); + s->dsp.add_hfyu_median_prediction(ydst, ydst - fake_ystride, s->temp[0], width, &lefty, &lefttopy); if(!(s->flags&CODEC_FLAG_GRAY)){ - add_median_prediction(udst, udst - fake_ustride, s->temp[1], width2, &leftu, &lefttopu); - add_median_prediction(vdst, vdst - fake_vstride, s->temp[2], width2, &leftv, &lefttopv); + s->dsp.add_hfyu_median_prediction(udst, udst - fake_ustride, s->temp[1], width2, &leftu, &lefttopu); + s->dsp.add_hfyu_median_prediction(vdst, vdst - fake_vstride, s->temp[2], width2, &leftv, &lefttopv); } } @@ -1130,12 +1136,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 case LEFT: case PLANE: decode_bgr_bitstream(s, width-1); - add_left_prediction_bgr32(p->data[0] + last_line+4, s->temp[0], width-1, &leftr, &leftg, &leftb); + s->dsp.add_hfyu_left_prediction_bgr32(p->data[0] + last_line+4, s->temp[0], width-1, &leftr, &leftg, &leftb); - for(y=s->height-2; y>=0; y--){ //yes its stored upside down + for(y=s->height-2; y>=0; y--){ //Yes it is stored upside down. decode_bgr_bitstream(s, width); - add_left_prediction_bgr32(p->data[0] + p->linesize[0]*y, s->temp[0], width, &leftr, &leftg, &leftb); + s->dsp.add_hfyu_left_prediction_bgr32(p->data[0] + p->linesize[0]*y, s->temp[0], width, &leftr, &leftg, &leftb); if(s->predictor == PLANE){ if((y&s->interlaced)==0 && yheight-1-s->interlaced){ s->dsp.add_bytes(p->data[0] + p->linesize[0]*y, @@ -1161,7 +1167,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 return (get_bits_count(&s->gb)+31)/32*4 + table_size; } -#endif +#endif /* CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER */ static int common_end(HYuvContext *s){ int i; @@ -1172,24 +1178,27 @@ static int common_end(HYuvContext *s){ return 0; } -#ifdef CONFIG_DECODERS -static int decode_end(AVCodecContext *avctx) +#if CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER +static av_cold int decode_end(AVCodecContext *avctx) { HYuvContext *s = avctx->priv_data; int i; + if (s->picture.data[0]) + avctx->release_buffer(avctx, &s->picture); + common_end(s); av_freep(&s->bitstream_buffer); - for(i=0; i<3; i++){ + for(i=0; i<6; i++){ free_vlc(&s->vlc[i]); } return 0; } -#endif +#endif /* CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER */ -#ifdef CONFIG_ENCODERS +#if CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ HYuvContext *s = avctx->priv_data; AVFrame *pict = data; @@ -1229,11 +1238,11 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, put_bits(&s->pb, 8, leftu= p->data[1][0]); put_bits(&s->pb, 8, p->data[0][0]); - lefty= sub_left_prediction(s, s->temp[0], p->data[0]+2, width-2 , lefty); - leftu= sub_left_prediction(s, s->temp[1], p->data[1]+1, width2-1, leftu); - leftv= sub_left_prediction(s, s->temp[2], p->data[2]+1, width2-1, leftv); + lefty= sub_left_prediction(s, s->temp[0], p->data[0], width , 0); + leftu= sub_left_prediction(s, s->temp[1], p->data[1], width2, 0); + leftv= sub_left_prediction(s, s->temp[2], p->data[2], width2, 0); - encode_422_bitstream(s, width-2); + encode_422_bitstream(s, 2, width-2); if(s->predictor==MEDIAN){ int lefttopy, lefttopu, lefttopv; @@ -1243,7 +1252,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, leftu= sub_left_prediction(s, s->temp[1], p->data[1]+p->linesize[1], width2, leftu); leftv= sub_left_prediction(s, s->temp[2], p->data[2]+p->linesize[2], width2, leftv); - encode_422_bitstream(s, width); + encode_422_bitstream(s, 0, width); y++; cy++; } @@ -1251,7 +1260,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, leftu= sub_left_prediction(s, s->temp[1], p->data[1]+fake_ustride, 2, leftu); leftv= sub_left_prediction(s, s->temp[2], p->data[2]+fake_vstride, 2, leftv); - encode_422_bitstream(s, 4); + encode_422_bitstream(s, 0, 4); lefttopy= p->data[0][3]; lefttopu= p->data[1][1]; @@ -1259,7 +1268,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, s->dsp.sub_hfyu_median_prediction(s->temp[0], p->data[0]+4, p->data[0] + fake_ystride+4, width-4 , &lefty, &lefttopy); s->dsp.sub_hfyu_median_prediction(s->temp[1], p->data[1]+2, p->data[1] + fake_ustride+2, width2-2, &leftu, &lefttopu); s->dsp.sub_hfyu_median_prediction(s->temp[2], p->data[2]+2, p->data[2] + fake_vstride+2, width2-2, &leftv, &lefttopv); - encode_422_bitstream(s, width-4); + encode_422_bitstream(s, 0, width-4); y++; cy++; for(; ydsp.sub_hfyu_median_prediction(s->temp[1], udst - fake_ustride, udst, width2, &leftu, &lefttopu); s->dsp.sub_hfyu_median_prediction(s->temp[2], vdst - fake_vstride, vdst, width2, &leftv, &lefttopv); - encode_422_bitstream(s, width); + encode_422_bitstream(s, 0, width); } }else{ for(cy=y=1; ytemp[2], vdst, width2, leftv); } - encode_422_bitstream(s, width); + encode_422_bitstream(s, 0, width); } } }else if(avctx->pix_fmt == PIX_FMT_RGB32){ @@ -1356,6 +1365,8 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, emms_c(); size+= (put_bits_count(&s->pb)+31)/8; + put_bits(&s->pb, 16, 0); + put_bits(&s->pb, 15, 0); size/= 4; if((s->flags&CODEC_FLAG_PASS1) && (s->picture_number&31)==0){ @@ -1383,7 +1394,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, return size*4; } -static int encode_end(AVCodecContext *avctx) +static av_cold int encode_end(AVCodecContext *avctx) { HYuvContext *s = avctx->priv_data; @@ -1394,9 +1405,9 @@ static int encode_end(AVCodecContext *avctx) return 0; } -#endif /* CONFIG_ENCODERS */ +#endif /* CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER */ -#ifdef CONFIG_DECODERS +#if CONFIG_HUFFYUV_DECODER AVCodec huffyuv_decoder = { "huffyuv", CODEC_TYPE_VIDEO, @@ -1407,9 +1418,12 @@ AVCodec huffyuv_decoder = { decode_end, decode_frame, CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND, - NULL + NULL, + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), }; +#endif +#if CONFIG_FFVHUFF_DECODER AVCodec ffvhuff_decoder = { "ffvhuff", CODEC_TYPE_VIDEO, @@ -1420,12 +1434,12 @@ AVCodec ffvhuff_decoder = { decode_end, decode_frame, CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND, - NULL + NULL, + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), }; #endif -#ifdef CONFIG_ENCODERS - +#if CONFIG_HUFFYUV_ENCODER AVCodec huffyuv_encoder = { "huffyuv", CODEC_TYPE_VIDEO, @@ -1434,9 +1448,12 @@ AVCodec huffyuv_encoder = { encode_init, encode_frame, encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_RGB32, -1}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), }; +#endif +#if CONFIG_FFVHUFF_ENCODER AVCodec ffvhuff_encoder = { "ffvhuff", CODEC_TYPE_VIDEO, @@ -1445,7 +1462,7 @@ AVCodec ffvhuff_encoder = { encode_init, encode_frame, encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_RGB32, -1}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), }; - -#endif //CONFIG_ENCODERS +#endif