X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fhuffyuv.c;h=d65943fcc161a34eb2ff4d6ca470486aa73e3a27;hb=514e0831aef4d487cf7b4a53c7fbb24222bc5634;hp=48e9ca6ab938b1057e1a7ca741c0495a2d7bc93a;hpb=7c5ab7b88dca11e9db864d544c2e4a82f55ab85c;p=ffmpeg diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index 48e9ca6ab93..d65943fcc16 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -1,7 +1,7 @@ /* * huffyuv codec for libavcodec * - * Copyright (c) 2002 Michael Niedermayer + * Copyright (c) 2002-2003 Michael Niedermayer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,28 +15,40 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 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 + * the algorithm used + */ + +/** + * @file huffyuv.c + * huffyuv codec for libavcodec. */ #include "common.h" +#include "bitstream.h" #include "avcodec.h" #include "dsputil.h" -#ifndef INT64_MAX -#define INT64_MAX 9223372036854775807LL +#define VLC_BITS 11 + +#ifdef WORDS_BIGENDIAN +#define B 3 +#define G 2 +#define R 1 +#else +#define B 0 +#define G 1 +#define R 2 #endif -#define VLC_BITS 11 - typedef enum Predictor{ LEFT= 0, PLANE, MEDIAN, } Predictor; - + typedef struct HYuvContext{ AVCodecContext *avctx; Predictor predictor; @@ -50,36 +62,69 @@ typedef struct HYuvContext{ int bgr32; //use bgr32 instead of bgr24 int width, height; int flags; + int context; int picture_number; int last_slice_end; - int linesize[3]; - uint8_t __align8 temp[3][2500]; + uint8_t *temp[3]; uint64_t stats[3][256]; uint8_t len[3][256]; uint32_t bits[3][256]; VLC vlc[3]; - uint8_t __align8 *picture[3]; - uint8_t __align8 bitstream_buffer[1024*1024*3]; //FIXME dynamic alloc or some other solution - DSPContext dsp; + AVFrame picture; + uint8_t *bitstream_buffer; + unsigned int bitstream_buffer_size; + DSPContext dsp; }HYuvContext; -static inline void bswap_buf(uint32_t *dst, uint32_t *src, int w){ - int i; - - for(i=0; i+8<=w; i+=8){ - dst[i+0]= bswap_32(src[i+0]); - dst[i+1]= bswap_32(src[i+1]); - dst[i+2]= bswap_32(src[i+2]); - dst[i+3]= bswap_32(src[i+3]); - dst[i+4]= bswap_32(src[i+4]); - dst[i+5]= bswap_32(src[i+5]); - dst[i+6]= bswap_32(src[i+6]); - dst[i+7]= bswap_32(src[i+7]); - } - for(;i0; len--){ - int bit= 1<<(32-len); for(index=0; index<256; index++){ - if(len_table[index]==len){ - if(bits & (bit-1)){ - fprintf(stderr, "Error generating huffman table\n"); - return -1; - } - dst[index]= bits>>(32-len); - bits+= bit; - } + if(len_table[index]==len) + dst[index]= bits++; + } + if(bits & 1){ + av_log(NULL, AV_LOG_ERROR, "Error generating huffman table\n"); + return -1; } + bits >>= 1; } return 0; } @@ -216,19 +240,19 @@ static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){ uint64_t counts[2*size]; int up[2*size]; int offset, i, next; - + for(offset=1; ; offset<<=1){ for(i=0; i counts[i]){ if(min1 > counts[i]){ @@ -242,9 +266,9 @@ static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){ } } } - + if(min2==INT64_MAX) break; - + counts[next]= min1 + min2; counts[min1_i]= counts[min2_i]= INT64_MAX; @@ -252,16 +276,16 @@ static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){ up[min2_i]= next; up[next]= -1; } - + for(i=0; i 32) break; - + + if(len >= 32) break; + dst[i]= len; } if(i==size) break; @@ -271,12 +295,12 @@ static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){ static int read_huffman_tables(HYuvContext *s, uint8_t *src, int length){ GetBitContext gb; int i; - - init_get_bits(&gb, src, length); - + + init_get_bits(&gb, src, length*8); + for(i=0; i<3; i++){ read_len_table(s->len[i], &gb); - + if(generate_bits_table(s->bits[i], s->len[i])<0){ return -1; } @@ -285,22 +309,23 @@ for(j=0; j<256; j++){ printf("%6X, %2d, %3d\n", s->bits[i][j], s->len[i][j], j); } #endif - init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4); + free_vlc(&s->vlc[i]); + init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4, 0); } - - return 0; + + return (get_bits_count(&gb)+7)/8; } static int read_old_huffman_tables(HYuvContext *s){ -#if 0 +#if 1 GetBitContext gb; int i; - init_get_bits(&gb, classic_shift_luma, sizeof(classic_shift_luma)); + init_get_bits(&gb, classic_shift_luma, sizeof(classic_shift_luma)*8); read_len_table(s->len[0], &gb); - init_get_bits(&gb, classic_shift_chroma, sizeof(classic_shift_chroma)); + init_get_bits(&gb, classic_shift_chroma, sizeof(classic_shift_chroma)*8); read_len_table(s->len[1], &gb); - + 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]; @@ -310,31 +335,57 @@ static int read_old_huffman_tables(HYuvContext *s){ } memcpy(s->bits[2], s->bits[1], 256*sizeof(uint32_t)); memcpy(s->len[2] , s->len [1], 256*sizeof(uint8_t)); - - for(i=0; i<3; i++) - init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4); - + + for(i=0; i<3; i++){ + free_vlc(&s->vlc[i]); + init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, s->bits[i], 4, 4, 0); + } + return 0; #else - fprintf(stderr, "v1 huffyuv is not supported \n"); + av_log(s->avctx, AV_LOG_DEBUG, "v1 huffyuv is not supported \n"); return -1; #endif } -static int decode_init(AVCodecContext *avctx) -{ +static void alloc_temp(HYuvContext *s){ + int i; + + if(s->bitstream_bpp<24){ + for(i=0; i<3; i++){ + s->temp[i]= av_malloc(s->width + 16); + } + }else{ + s->temp[0]= av_malloc(4*s->width + 16); + } +} + +static int common_init(AVCodecContext *avctx){ HYuvContext *s = avctx->priv_data; - int width, height, y_size, c_size, stride; s->avctx= avctx; s->flags= avctx->flags; - - dsputil_init(&s->dsp, avctx->dsp_mask); - - width= s->width= avctx->width; - height= s->height= avctx->height; + + dsputil_init(&s->dsp, avctx); + + s->width= avctx->width; + s->height= avctx->height; + assert(s->width>0 && s->height>0); + + return 0; +} + +static int decode_init(AVCodecContext *avctx) +{ + HYuvContext *s = avctx->priv_data; + + common_init(avctx); + memset(s->vlc, 0, 3*sizeof(VLC)); + + avctx->coded_frame= &s->picture; + s->interlaced= s->height > 288; + s->bgr32=1; - assert(width && height); //if(avctx->extradata) // printf("extradata:%X, extradata_size:%d\n", *(uint32_t*)avctx->extradata, avctx->extradata_size); if(avctx->extradata_size){ @@ -344,17 +395,20 @@ s->bgr32=1; s->version=2; }else s->version=0; - + if(s->version==2){ - int method; + int method, interlace; method= ((uint8_t*)avctx->extradata)[0]; s->decorrelate= method&64 ? 1 : 0; s->predictor= method&63; s->bitstream_bpp= ((uint8_t*)avctx->extradata)[1]; - if(s->bitstream_bpp==0) + if(s->bitstream_bpp==0) s->bitstream_bpp= avctx->bits_per_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; + if(read_huffman_tables(s, ((uint8_t*)avctx->extradata)+4, avctx->extradata_size) < 0) return -1; }else{ @@ -381,137 +435,125 @@ s->bgr32=1; break; } s->bitstream_bpp= avctx->bits_per_sample & ~7; - + s->context= 0; + if(read_old_huffman_tables(s) < 0) return -1; } - - s->interlaced= height > 288; - - c_size= 0; + switch(s->bitstream_bpp){ case 12: avctx->pix_fmt = PIX_FMT_YUV420P; - stride= (width+15)&~15; - c_size= height*stride/4; break; case 16: if(s->yuy2){ avctx->pix_fmt = PIX_FMT_YUV422; - stride= (width*2+15)&~15; }else{ avctx->pix_fmt = PIX_FMT_YUV422P; - stride= (width+15)&~15; - c_size= height*stride/2; } break; case 24: case 32: if(s->bgr32){ - avctx->pix_fmt = PIX_FMT_BGRA32; - stride= (width*4+15)&~15; + avctx->pix_fmt = PIX_FMT_RGBA32; }else{ avctx->pix_fmt = PIX_FMT_BGR24; - stride= (width*3+15)&~15; } break; default: assert(0); - stride=0; //gcc fix } - - y_size= height*stride; - - if(!(avctx->flags&CODEC_FLAG_DR1)){ - s->linesize[0]= stride; - s->picture[0]= av_mallocz(y_size); - - if(c_size){ - s->picture[1]= av_mallocz(c_size); - s->picture[2]= av_mallocz(c_size); - s->linesize[1]= s->linesize[2]= stride/2; - - memset(s->picture[1], 128, c_size); - memset(s->picture[2], 128, c_size); - } - } - -// printf("pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_sample, s->interlaced); - + + 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); + return 0; } -static void store_table(HYuvContext *s, uint8_t *len){ +static int store_table(HYuvContext *s, uint8_t *len, uint8_t *buf){ int i; - int index= s->avctx->extradata_size; + int index= 0; for(i=0; i<256;){ - int cur=i; int val= len[i]; - int repeat; - - for(; i<256 && len[i]==val; i++); - - repeat= i - cur; - + int repeat=0; + + for(; i<256 && len[i]==val && repeat<255; i++) + repeat++; + + assert(val < 32 && val >0 && repeat<256 && repeat>0); if(repeat>7){ - ((uint8_t*)s->avctx->extradata)[index++]= val; - ((uint8_t*)s->avctx->extradata)[index++]= repeat; + buf[index++]= val; + buf[index++]= repeat; }else{ - ((uint8_t*)s->avctx->extradata)[index++]= val | (repeat<<5); + buf[index++]= val | (repeat<<5); } } - - s->avctx->extradata_size= index; + + return index; } static int encode_init(AVCodecContext *avctx) { HYuvContext *s = avctx->priv_data; - int i, j, width, height; + int i, j; - s->avctx= avctx; - s->flags= avctx->flags; - - dsputil_init(&s->dsp, avctx->dsp_mask); - - width= s->width= avctx->width; - height= s->height= avctx->height; - - assert(width && height); - - avctx->extradata= av_mallocz(1024*10); - avctx->stats_out= av_mallocz(1024*10); + common_init(avctx); + + avctx->extradata= av_mallocz(1024*30); // 256*3+4 == 772 + avctx->stats_out= av_mallocz(1024*30); // 21*256*3(%llu ) + 3(\n) + 1(0) = 16132 s->version=2; - + + avctx->coded_frame= &s->picture; + switch(avctx->pix_fmt){ case PIX_FMT_YUV420P: - if(avctx->strict_std_compliance>=0){ - fprintf(stderr, "YV12-huffyuv is experimental, there WILL be no compatbility! (use (v)strict=-1)\n"); - return -1; - } s->bitstream_bpp= 12; break; case PIX_FMT_YUV422P: s->bitstream_bpp= 16; break; default: - fprintf(stderr, "format not supported\n"); + av_log(avctx, AV_LOG_ERROR, "format not supported\n"); return -1; } avctx->bits_per_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; + if(avctx->context_model==1){ + s->context= avctx->context_model; + if(s->flags & (CODEC_FLAG_PASS1|CODEC_FLAG_PASS2)){ + av_log(avctx, AV_LOG_ERROR, "context=1 is not compatible with 2 pass huffyuv encoding\n"); + return -1; + } + }else s->context= 0; + + if(avctx->codec->id==CODEC_ID_HUFFYUV){ + if(avctx->pix_fmt==PIX_FMT_YUV420P){ + av_log(avctx, AV_LOG_ERROR, "Error: YV12 is not supported by huffyuv; use vcodec=ffvhuff or format=422p\n"); + return -1; + } + if(avctx->context_model){ + av_log(avctx, AV_LOG_ERROR, "Error: per-frame huffman tables are not supported by huffyuv; use vcodec=ffvhuff\n"); + return -1; + } + if(s->interlaced != ( s->height > 288 )) + av_log(avctx, AV_LOG_INFO, "using huffyuv 2.2.0 or newer interlacing flag\n"); + } + ((uint8_t*)avctx->extradata)[0]= s->predictor; ((uint8_t*)avctx->extradata)[1]= s->bitstream_bpp; - ((uint8_t*)avctx->extradata)[2]= + ((uint8_t*)avctx->extradata)[2]= s->interlaced ? 0x10 : 0x20; + if(s->context) + ((uint8_t*)avctx->extradata)[2]|= 0x40; ((uint8_t*)avctx->extradata)[3]= 0; s->avctx->extradata_size= 4; - + if(avctx->stats_in){ char *p= avctx->stats_in; - + for(i=0; i<3; i++) for(j=0; j<256; j++) s->stats[i][j]= 1; @@ -524,7 +566,7 @@ static int encode_init(AVCodecContext *avctx) s->stats[i][j]+= strtol(p, &next, 0); if(next==p) return -1; p=next; - } + } } if(p[0]==0 || p[1]==0 || p[2]==0) break; } @@ -532,61 +574,77 @@ static int encode_init(AVCodecContext *avctx) for(i=0; i<3; i++) for(j=0; j<256; j++){ int d= FFMIN(j, 256-j); - + s->stats[i][j]= 100000000/(d+1); } } - + for(i=0; i<3; i++){ generate_len_table(s->len[i], s->stats[i], 256); if(generate_bits_table(s->bits[i], s->len[i])<0){ return -1; } - - store_table(s, s->len[i]); + + s->avctx->extradata_size+= + store_table(s, s->len[i], &((uint8_t*)s->avctx->extradata)[s->avctx->extradata_size]); + } + + if(s->context){ + for(i=0; i<3; i++){ + int pels = s->width*s->height / (i?40:10); + for(j=0; j<256; j++){ + int d= FFMIN(j, 256-j); + s->stats[i][j]= pels/(d+1); + } + } + }else{ + for(i=0; i<3; i++) + for(j=0; j<256; j++) + s->stats[i][j]= 0; } - for(i=0; i<3; i++) - for(j=0; j<256; j++) - s->stats[i][j]= 0; - - s->interlaced= height > 288; - // printf("pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_sample, s->interlaced); - + + alloc_temp(s); + s->picture_number=0; - + return 0; } static void decode_422_bitstream(HYuvContext *s, int count){ int i; - + count/=2; - + for(i=0; itemp[0][2*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); - s->temp[1][ i ]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); - s->temp[0][2*i+1]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); - s->temp[2][ i ]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); + s->temp[0][2*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); + s->temp[1][ i ]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); + s->temp[0][2*i+1]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); + s->temp[2][ i ]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); } } static void decode_gray_bitstream(HYuvContext *s, int count){ int i; - + count/=2; - + for(i=0; itemp[0][2*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); - s->temp[0][2*i+1]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); + s->temp[0][2*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); + s->temp[0][2*i+1]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); } } -static void encode_422_bitstream(HYuvContext *s, int count){ +static int encode_422_bitstream(HYuvContext *s, int count){ int i; - + + 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"); + return -1; + } + count/=2; if(s->flags&CODEC_FLAG_PASS1){ for(i=0; istats[0][ s->temp[0][2*i+1] ]++; s->stats[2][ s->temp[2][ i ] ]++; } + } + if(s->avctx->flags2&CODEC_FLAG2_NO_OUTPUT) + return 0; + if(s->context){ + for(i=0; istats[0][ s->temp[0][2*i ] ]++; + put_bits(&s->pb, s->len[0][ s->temp[0][2*i ] ], s->bits[0][ s->temp[0][2*i ] ]); + s->stats[1][ s->temp[1][ i ] ]++; + put_bits(&s->pb, s->len[1][ s->temp[1][ i ] ], s->bits[1][ s->temp[1][ i ] ]); + s->stats[0][ s->temp[0][2*i+1] ]++; + put_bits(&s->pb, s->len[0][ s->temp[0][2*i+1] ], s->bits[0][ s->temp[0][2*i+1] ]); + s->stats[2][ s->temp[2][ i ] ]++; + put_bits(&s->pb, s->len[2][ s->temp[2][ i ] ], s->bits[2][ s->temp[2][ i ] ]); + } }else{ for(i=0; ipb, s->len[0][ s->temp[0][2*i ] ], s->bits[0][ s->temp[0][2*i ] ]); @@ -603,55 +675,73 @@ static void encode_422_bitstream(HYuvContext *s, int count){ put_bits(&s->pb, s->len[2][ s->temp[2][ i ] ], s->bits[2][ s->temp[2][ i ] ]); } } + return 0; } -static void encode_gray_bitstream(HYuvContext *s, int count){ +static int encode_gray_bitstream(HYuvContext *s, int count){ int i; - + + if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < 4*count){ + av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); + return -1; + } + count/=2; if(s->flags&CODEC_FLAG_PASS1){ for(i=0; istats[0][ s->temp[0][2*i ] ]++; s->stats[0][ s->temp[0][2*i+1] ]++; } + } + if(s->avctx->flags2&CODEC_FLAG2_NO_OUTPUT) + return 0; + + if(s->context){ + for(i=0; istats[0][ s->temp[0][2*i ] ]++; + put_bits(&s->pb, s->len[0][ s->temp[0][2*i ] ], s->bits[0][ s->temp[0][2*i ] ]); + s->stats[0][ s->temp[0][2*i+1] ]++; + put_bits(&s->pb, s->len[0][ s->temp[0][2*i+1] ], s->bits[0][ s->temp[0][2*i+1] ]); + } }else{ for(i=0; ipb, s->len[0][ s->temp[0][2*i ] ], s->bits[0][ s->temp[0][2*i ] ]); put_bits(&s->pb, s->len[0][ s->temp[0][2*i+1] ], s->bits[0][ s->temp[0][2*i+1] ]); } } + return 0; } static void decode_bgr_bitstream(HYuvContext *s, int count){ int i; - + if(s->decorrelate){ if(s->bitstream_bpp==24){ for(i=0; itemp[0][4*i+1]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); - s->temp[0][4*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3) + s->temp[0][4*i+1]; - s->temp[0][4*i+2]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3) + s->temp[0][4*i+1]; + 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+1]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); - s->temp[0][4*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3) + s->temp[0][4*i+1]; - s->temp[0][4*i+2]= get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3) + s->temp[0][4*i+1]; + 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]; get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); //?! } } }else{ if(s->bitstream_bpp==24){ for(i=0; itemp[0][4*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); - s->temp[0][4*i+1]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); - s->temp[0][4*i+2]= 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); } }else{ for(i=0; itemp[0][4*i ]= get_vlc2(&s->gb, s->vlc[0].table, VLC_BITS, 3); - s->temp[0][4*i+1]= get_vlc2(&s->gb, s->vlc[1].table, VLC_BITS, 3); - s->temp[0][4*i+2]= 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); get_vlc2(&s->gb, s->vlc[2].table, VLC_BITS, 3); //?! } } @@ -660,27 +750,28 @@ static void decode_bgr_bitstream(HYuvContext *s, int count){ static void draw_slice(HYuvContext *s, int y){ int h, cy; - UINT8 *src_ptr[3]; - - if(s->avctx->draw_horiz_band==NULL) + int offset[4]; + + if(s->avctx->draw_horiz_band==NULL) return; - + h= y - s->last_slice_end; y -= h; - + if(s->bitstream_bpp==12){ cy= y>>1; }else{ cy= y; } - - src_ptr[0] = s->picture[0] + s->linesize[0]*y; - src_ptr[1] = s->picture[1] + s->linesize[1]*cy; - src_ptr[2] = s->picture[2] + s->linesize[2]*cy; + + offset[0] = s->picture.linesize[0]*y; + offset[1] = s->picture.linesize[1]*cy; + offset[2] = s->picture.linesize[2]*cy; + offset[3] = 0; emms_c(); - s->avctx->draw_horiz_band(s->avctx, src_ptr, s->linesize[0], y, s->width, h); - + s->avctx->draw_horiz_band(s->avctx, &s->picture, offset, y, 3, h); + s->last_slice_end= y + h; } @@ -690,76 +781,78 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 const int width2= s->width>>1; const int height= s->height; int fake_ystride, fake_ustride, fake_vstride; - int i; + AVFrame * const p= &s->picture; + int table_size= 0; - AVPicture *picture = data; + AVFrame *picture = data; - *data_size = 0; + s->bitstream_buffer= av_fast_realloc(s->bitstream_buffer, &s->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE); - /* no supplementary picture */ - if (buf_size == 0) - return 0; + s->dsp.bswap_buf((uint32_t*)s->bitstream_buffer, (uint32_t*)buf, buf_size/4); - bswap_buf((uint32_t*)s->bitstream_buffer, (uint32_t*)buf, buf_size/4); - - init_get_bits(&s->gb, s->bitstream_buffer, buf_size); + if(p->data[0]) + avctx->release_buffer(avctx, p); + + p->reference= 0; + if(avctx->get_buffer(avctx, p) < 0){ + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return -1; + } - if(avctx->flags&CODEC_FLAG_DR1){ - if(avctx->get_buffer_callback(avctx, s->width, s->height, I_TYPE) < 0){ - fprintf(stderr, "get_buffer() failed\n"); + if(s->context){ + table_size = read_huffman_tables(s, s->bitstream_buffer, buf_size); + if(table_size < 0) return -1; - } + } - s->linesize[0]= avctx->dr_stride; - s->linesize[1]= - s->linesize[2]= avctx->dr_uvstride; + if((unsigned)(buf_size-table_size) >= INT_MAX/8) + return -1; + + init_get_bits(&s->gb, s->bitstream_buffer+table_size, (buf_size-table_size)*8); + + fake_ystride= s->interlaced ? p->linesize[0]*2 : p->linesize[0]; + fake_ustride= s->interlaced ? p->linesize[1]*2 : p->linesize[1]; + fake_vstride= s->interlaced ? p->linesize[2]*2 : p->linesize[2]; - for(i=0; i<3;i++) - s->picture[i]= avctx->dr_buffer[i]; - } - fake_ystride= s->interlaced ? s->linesize[0]*2 : s->linesize[0]; - fake_ustride= s->interlaced ? s->linesize[1]*2 : s->linesize[1]; - fake_vstride= s->interlaced ? s->linesize[2]*2 : s->linesize[2]; - s->last_slice_end= 0; - + if(s->bitstream_bpp<24){ int y, cy; int lefty, leftu, leftv; int lefttopy, lefttopu, lefttopv; - + if(s->yuy2){ - s->picture[0][3]= get_bits(&s->gb, 8); - s->picture[0][2]= get_bits(&s->gb, 8); - s->picture[0][1]= get_bits(&s->gb, 8); - s->picture[0][0]= get_bits(&s->gb, 8); - - fprintf(stderr, "YUY2 output isnt implemenetd yet\n"); + p->data[0][3]= get_bits(&s->gb, 8); + p->data[0][2]= get_bits(&s->gb, 8); + p->data[0][1]= get_bits(&s->gb, 8); + p->data[0][0]= get_bits(&s->gb, 8); + + av_log(avctx, AV_LOG_ERROR, "YUY2 output is not implemented yet\n"); return -1; }else{ - - leftv= s->picture[2][0]= get_bits(&s->gb, 8); - lefty= s->picture[0][1]= get_bits(&s->gb, 8); - leftu= s->picture[1][0]= get_bits(&s->gb, 8); - s->picture[0][0]= get_bits(&s->gb, 8); - + + leftv= p->data[2][0]= get_bits(&s->gb, 8); + lefty= p->data[0][1]= get_bits(&s->gb, 8); + leftu= p->data[1][0]= get_bits(&s->gb, 8); + p->data[0][0]= get_bits(&s->gb, 8); + switch(s->predictor){ case LEFT: case PLANE: decode_422_bitstream(s, width-2); - lefty= add_left_prediction(s->picture[0] + 2, s->temp[0], width-2, lefty); + lefty= add_left_prediction(p->data[0] + 2, s->temp[0], width-2, lefty); if(!(s->flags&CODEC_FLAG_GRAY)){ - leftu= add_left_prediction(s->picture[1] + 1, s->temp[1], width2-1, leftu); - leftv= add_left_prediction(s->picture[2] + 1, s->temp[2], width2-1, leftv); + 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); } for(cy=y=1; yheight; y++,cy++){ uint8_t *ydst, *udst, *vdst; - + if(s->bitstream_bpp==12){ decode_gray_bitstream(s, width); - - ydst= s->picture[0] + s->linesize[0]*y; + + ydst= p->data[0] + p->linesize[0]*y; lefty= add_left_prediction(ydst, s->temp[0], width, lefty); if(s->predictor == PLANE){ @@ -769,15 +862,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 y++; if(y>=s->height) break; } - + draw_slice(s, y); - - ydst= s->picture[0] + s->linesize[0]*y; - udst= s->picture[1] + s->linesize[1]*cy; - vdst= s->picture[2] + s->linesize[2]*cy; - - decode_422_bitstream(s, width); + ydst= p->data[0] + p->linesize[0]*y; + udst= p->data[1] + p->linesize[1]*cy; + vdst= p->data[2] + p->linesize[2]*cy; + + decode_422_bitstream(s, width); lefty= add_left_prediction(ydst, s->temp[0], width, lefty); if(!(s->flags&CODEC_FLAG_GRAY)){ leftu= add_left_prediction(udst, s->temp[1], width2, leftu); @@ -794,57 +886,57 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 } } draw_slice(s, height); - + break; case MEDIAN: /* first line except first 2 pixels is left predicted */ decode_422_bitstream(s, width-2); - lefty= add_left_prediction(s->picture[0] + 2, s->temp[0], width-2, lefty); + lefty= add_left_prediction(p->data[0] + 2, s->temp[0], width-2, lefty); if(!(s->flags&CODEC_FLAG_GRAY)){ - leftu= add_left_prediction(s->picture[1] + 1, s->temp[1], width2-1, leftu); - leftv= add_left_prediction(s->picture[2] + 1, s->temp[2], width2-1, leftv); + 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); } - + cy=y=1; - + /* second line is left predicted for interlaced case */ if(s->interlaced){ decode_422_bitstream(s, width); - lefty= add_left_prediction(s->picture[0] + s->linesize[0], s->temp[0], width, lefty); + lefty= add_left_prediction(p->data[0] + p->linesize[0], s->temp[0], width, lefty); if(!(s->flags&CODEC_FLAG_GRAY)){ - leftu= add_left_prediction(s->picture[1] + s->linesize[2], s->temp[1], width2, leftu); - leftv= add_left_prediction(s->picture[2] + s->linesize[1], s->temp[2], width2, leftv); + 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); } y++; cy++; } /* next 4 pixels are left predicted too */ decode_422_bitstream(s, 4); - lefty= add_left_prediction(s->picture[0] + fake_ystride, s->temp[0], 4, lefty); + lefty= add_left_prediction(p->data[0] + fake_ystride, s->temp[0], 4, lefty); if(!(s->flags&CODEC_FLAG_GRAY)){ - leftu= add_left_prediction(s->picture[1] + fake_ustride, s->temp[1], 2, leftu); - leftv= add_left_prediction(s->picture[2] + fake_vstride, s->temp[2], 2, leftv); + 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); } /* next line except the first 4 pixels is median predicted */ - lefttopy= s->picture[0][3]; + lefttopy= p->data[0][3]; decode_422_bitstream(s, width-4); - add_median_prediction(s->picture[0] + fake_ystride+4, s->picture[0]+4, s->temp[0], width-4, &lefty, &lefttopy); + add_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= s->picture[1][1]; - lefttopv= s->picture[2][1]; - add_median_prediction(s->picture[1] + fake_ustride+2, s->picture[1]+2, s->temp[1], width2-2, &leftu, &lefttopu); - add_median_prediction(s->picture[2] + fake_vstride+2, s->picture[2]+2, s->temp[2], width2-2, &leftv, &lefttopv); + 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); } y++; cy++; - + for(; ybitstream_bpp==12){ while(2*cy > y){ decode_gray_bitstream(s, width); - ydst= s->picture[0] + s->linesize[0]*y; + ydst= p->data[0] + p->linesize[0]*y; add_median_prediction(ydst, ydst - fake_ystride, s->temp[0], width, &lefty, &lefttopy); y++; } @@ -854,9 +946,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 decode_422_bitstream(s, width); - ydst= s->picture[0] + s->linesize[0]*y; - udst= s->picture[1] + s->linesize[1]*cy; - vdst= s->picture[2] + s->linesize[2]*cy; + ydst= p->data[0] + p->linesize[0]*y; + 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); if(!(s->flags&CODEC_FLAG_GRAY)){ @@ -872,70 +964,75 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 }else{ int y; int leftr, leftg, leftb; - const int last_line= (height-1)*s->linesize[0]; - + const int last_line= (height-1)*p->linesize[0]; + if(s->bitstream_bpp==32){ - s->picture[0][last_line+3]= get_bits(&s->gb, 8); - leftr= s->picture[0][last_line+2]= get_bits(&s->gb, 8); - leftg= s->picture[0][last_line+1]= get_bits(&s->gb, 8); - leftb= s->picture[0][last_line+0]= get_bits(&s->gb, 8); + skip_bits(&s->gb, 8); + leftr= p->data[0][last_line+R]= get_bits(&s->gb, 8); + leftg= p->data[0][last_line+G]= get_bits(&s->gb, 8); + leftb= p->data[0][last_line+B]= get_bits(&s->gb, 8); }else{ - leftr= s->picture[0][last_line+2]= get_bits(&s->gb, 8); - leftg= s->picture[0][last_line+1]= get_bits(&s->gb, 8); - leftb= s->picture[0][last_line+0]= get_bits(&s->gb, 8); + leftr= p->data[0][last_line+R]= get_bits(&s->gb, 8); + leftg= p->data[0][last_line+G]= get_bits(&s->gb, 8); + leftb= p->data[0][last_line+B]= get_bits(&s->gb, 8); skip_bits(&s->gb, 8); } - + if(s->bgr32){ switch(s->predictor){ case LEFT: case PLANE: decode_bgr_bitstream(s, width-1); - add_left_prediction_bgr32(s->picture[0] + last_line+4, s->temp[0], width-1, &leftr, &leftg, &leftb); + add_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 decode_bgr_bitstream(s, width); - - add_left_prediction_bgr32(s->picture[0] + s->linesize[0]*y, s->temp[0], width, &leftr, &leftg, &leftb); + + add_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){ - s->dsp.add_bytes(s->picture[0] + s->linesize[0]*y, - s->picture[0] + s->linesize[0]*y + fake_ystride, fake_ystride); + if((y&s->interlaced)==0 && yheight-1-s->interlaced){ + s->dsp.add_bytes(p->data[0] + p->linesize[0]*y, + p->data[0] + p->linesize[0]*y + fake_ystride, fake_ystride); } } } - draw_slice(s, height); // just 1 large slice as this isnt possible in reverse order + draw_slice(s, height); // just 1 large slice as this is not possible in reverse order break; default: - fprintf(stderr, "prediction type not supported!\n"); + av_log(avctx, AV_LOG_ERROR, "prediction type not supported!\n"); } }else{ - fprintf(stderr, "BGR24 output isnt implemenetd yet\n"); + av_log(avctx, AV_LOG_ERROR, "BGR24 output is not implemented yet\n"); return -1; } } emms_c(); - - for(i=0;i<3;i++) { - picture->data[i] = s->picture[i]; - picture->linesize[i]= s->linesize[i]; - } - *data_size = sizeof(AVPicture); - - return (get_bits_count(&s->gb)+7)>>3; + *picture= *p; + *data_size = sizeof(AVFrame); + + return (get_bits_count(&s->gb)+31)/32*4 + table_size; +} + +static int common_end(HYuvContext *s){ + int i; + + for(i=0; i<3; i++){ + av_freep(&s->temp[i]); + } + return 0; } static int decode_end(AVCodecContext *avctx) { HYuvContext *s = avctx->priv_data; int i; - - for(i=0; i<3; i++){ - if(!(avctx->flags&CODEC_FLAG_DR1)) - av_freep(&s->picture[i]); + common_end(s); + av_freep(&s->bitstream_buffer); + + for(i=0; i<3; i++){ free_vlc(&s->vlc[i]); } @@ -944,92 +1041,105 @@ static int decode_end(AVCodecContext *avctx) static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ HYuvContext *s = avctx->priv_data; - AVPicture *pict = data; + AVFrame *pict = data; const int width= s->width; const int width2= s->width>>1; const int height= s->height; const int fake_ystride= s->interlaced ? pict->linesize[0]*2 : pict->linesize[0]; const int fake_ustride= s->interlaced ? pict->linesize[1]*2 : pict->linesize[1]; const int fake_vstride= s->interlaced ? pict->linesize[2]*2 : pict->linesize[2]; - int i, size; + AVFrame * const p= &s->picture; + int i, j, size=0; - init_put_bits(&s->pb, buf, buf_size, NULL, NULL); - - for(i=0; i<3; i++){ - s->picture[i]= pict->data[i]; - s->linesize[i]= pict->linesize[i]; + *p = *pict; + p->pict_type= FF_I_TYPE; + p->key_frame= 1; + + if(s->context){ + for(i=0; i<3; i++){ + generate_len_table(s->len[i], s->stats[i], 256); + if(generate_bits_table(s->bits[i], s->len[i])<0) + return -1; + size+= store_table(s, s->len[i], &buf[size]); + } + + for(i=0; i<3; i++) + for(j=0; j<256; j++) + s->stats[i][j] >>= 1; } - + + init_put_bits(&s->pb, buf+size, buf_size-size); + if(avctx->pix_fmt == PIX_FMT_YUV422P || avctx->pix_fmt == PIX_FMT_YUV420P){ int lefty, leftu, leftv, y, cy; - put_bits(&s->pb, 8, leftv= s->picture[2][0]); - put_bits(&s->pb, 8, lefty= s->picture[0][1]); - put_bits(&s->pb, 8, leftu= s->picture[1][0]); - put_bits(&s->pb, 8, s->picture[0][0]); - - lefty= sub_left_prediction(s, s->temp[0], s->picture[0]+2, width-2 , lefty); - leftu= sub_left_prediction(s, s->temp[1], s->picture[1]+1, width2-1, leftu); - leftv= sub_left_prediction(s, s->temp[2], s->picture[2]+1, width2-1, leftv); - + put_bits(&s->pb, 8, leftv= p->data[2][0]); + put_bits(&s->pb, 8, lefty= p->data[0][1]); + 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); + encode_422_bitstream(s, width-2); - + if(s->predictor==MEDIAN){ int lefttopy, lefttopu, lefttopv; cy=y=1; if(s->interlaced){ - lefty= sub_left_prediction(s, s->temp[0], s->picture[0]+s->linesize[0], width , lefty); - leftu= sub_left_prediction(s, s->temp[1], s->picture[1]+s->linesize[1], width2, leftu); - leftv= sub_left_prediction(s, s->temp[2], s->picture[2]+s->linesize[2], width2, leftv); - + lefty= sub_left_prediction(s, s->temp[0], p->data[0]+p->linesize[0], width , lefty); + 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); y++; cy++; } - - lefty= sub_left_prediction(s, s->temp[0], s->picture[0]+fake_ystride, 4, lefty); - leftu= sub_left_prediction(s, s->temp[1], s->picture[1]+fake_ystride, 2, leftu); - leftv= sub_left_prediction(s, s->temp[2], s->picture[2]+fake_ystride, 2, leftv); - + + lefty= sub_left_prediction(s, s->temp[0], p->data[0]+fake_ystride, 4, lefty); + 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); - lefttopy= s->picture[0][3]; - lefttopu= s->picture[1][1]; - lefttopv= s->picture[2][1]; - sub_median_prediction(s->temp[0], s->picture[0]+4, s->picture[0] + fake_ystride+4, width-4 , &lefty, &lefttopy); - sub_median_prediction(s->temp[1], s->picture[1]+2, s->picture[1] + fake_ustride+2, width2-2, &leftu, &lefttopu); - sub_median_prediction(s->temp[2], s->picture[2]+2, s->picture[2] + fake_vstride+2, width2-2, &leftv, &lefttopv); + lefttopy= p->data[0][3]; + lefttopu= p->data[1][1]; + lefttopv= p->data[2][1]; + 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); y++; cy++; for(; ybitstream_bpp==12){ while(2*cy > y){ - ydst= s->picture[0] + s->linesize[0]*y; - sub_median_prediction(s->temp[0], ydst - fake_ystride, ydst, width , &lefty, &lefttopy); + ydst= p->data[0] + p->linesize[0]*y; + s->dsp.sub_hfyu_median_prediction(s->temp[0], ydst - fake_ystride, ydst, width , &lefty, &lefttopy); encode_gray_bitstream(s, width); y++; } if(y>=height) break; } - ydst= s->picture[0] + s->linesize[0]*y; - udst= s->picture[1] + s->linesize[1]*cy; - vdst= s->picture[2] + s->linesize[2]*cy; + ydst= p->data[0] + p->linesize[0]*y; + udst= p->data[1] + p->linesize[1]*cy; + vdst= p->data[2] + p->linesize[2]*cy; - sub_median_prediction(s->temp[0], ydst - fake_ystride, ydst, width , &lefty, &lefttopy); - sub_median_prediction(s->temp[1], udst - fake_ustride, udst, width2, &leftu, &lefttopu); - sub_median_prediction(s->temp[2], vdst - fake_vstride, vdst, width2, &leftv, &lefttopv); + s->dsp.sub_hfyu_median_prediction(s->temp[0], ydst - fake_ystride, ydst, width , &lefty, &lefttopy); + s->dsp.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); } }else{ for(cy=y=1; ybitstream_bpp==12){ - ydst= s->picture[0] + s->linesize[0]*y; + ydst= p->data[0] + p->linesize[0]*y; if(s->predictor == PLANE && s->interlaced < y){ s->dsp.diff_bytes(s->temp[1], ydst, ydst - fake_ystride, width); @@ -1042,19 +1152,19 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, y++; if(y>=height) break; } - - ydst= s->picture[0] + s->linesize[0]*y; - udst= s->picture[1] + s->linesize[1]*cy; - vdst= s->picture[2] + s->linesize[2]*cy; + + ydst= p->data[0] + p->linesize[0]*y; + udst= p->data[1] + p->linesize[1]*cy; + vdst= p->data[2] + p->linesize[2]*cy; if(s->predictor == PLANE && s->interlaced < cy){ s->dsp.diff_bytes(s->temp[1], ydst, ydst - fake_ystride, width); s->dsp.diff_bytes(s->temp[2], udst, udst - fake_ustride, width2); - s->dsp.diff_bytes(s->temp[3], vdst, vdst - fake_vstride, width2); + s->dsp.diff_bytes(s->temp[2] + width2, vdst, vdst - fake_vstride, width2); lefty= sub_left_prediction(s, s->temp[0], s->temp[1], width , lefty); leftu= sub_left_prediction(s, s->temp[1], s->temp[2], width2, leftu); - leftv= sub_left_prediction(s, s->temp[2], s->temp[3], width2, leftv); + leftv= sub_left_prediction(s, s->temp[2], s->temp[2] + width2, width2, leftv); }else{ lefty= sub_left_prediction(s, s->temp[0], ydst, width , lefty); leftu= sub_left_prediction(s, s->temp[1], udst, width2, leftu); @@ -1063,46 +1173,49 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, encode_422_bitstream(s, width); } - } + } }else{ - fprintf(stderr, "Format not supported!\n"); + av_log(avctx, AV_LOG_ERROR, "Format not supported!\n"); } emms_c(); - - size= (get_bit_count(&s->pb)+31)/32; - + + size+= (put_bits_count(&s->pb)+31)/8; + size/= 4; + if((s->flags&CODEC_FLAG_PASS1) && (s->picture_number&31)==0){ int j; char *p= avctx->stats_out; + char *end= p + 1024*30; for(i=0; i<3; i++){ for(j=0; j<256; j++){ - sprintf(p, "%Ld ", s->stats[i][j]); + snprintf(p, end-p, "%"PRIu64" ", s->stats[i][j]); p+= strlen(p); s->stats[i][j]= 0; } - sprintf(p, "\n"); + snprintf(p, end-p, "\n"); p++; } - }else{ + } + if(!(s->avctx->flags2 & CODEC_FLAG2_NO_OUTPUT)){ flush_put_bits(&s->pb); - bswap_buf((uint32_t*)buf, (uint32_t*)buf, size); + s->dsp.bswap_buf((uint32_t*)buf, (uint32_t*)buf, size); + avctx->stats_out[0] = '\0'; } - - avctx->key_frame= 1; - avctx->pict_type= I_TYPE; - + s->picture_number++; - + return size*4; } static int encode_end(AVCodecContext *avctx) { -// HYuvContext *s = avctx->priv_data; + HYuvContext *s = avctx->priv_data; + + common_end(s); av_freep(&avctx->extradata); av_freep(&avctx->stats_out); - + return 0; } @@ -1119,6 +1232,21 @@ AVCodec huffyuv_decoder = { NULL }; +AVCodec ffvhuff_decoder = { + "ffvhuff", + CODEC_TYPE_VIDEO, + CODEC_ID_FFVHUFF, + sizeof(HYuvContext), + decode_init, + NULL, + decode_end, + decode_frame, + CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND, + NULL +}; + +#ifdef CONFIG_ENCODERS + AVCodec huffyuv_encoder = { "huffyuv", CODEC_TYPE_VIDEO, @@ -1128,3 +1256,15 @@ AVCodec huffyuv_encoder = { encode_frame, encode_end, }; + +AVCodec ffvhuff_encoder = { + "ffvhuff", + CODEC_TYPE_VIDEO, + CODEC_ID_FFVHUFF, + sizeof(HYuvContext), + encode_init, + encode_frame, + encode_end, +}; + +#endif //CONFIG_ENCODERS