December 2008 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r3881 - dirac/libavcodec/diracdec.c
by conrad 09 Dec '08

09 Dec '08

Author: conrad Date: Tue Dec 9 23:05:49 2008 New Revision: 3881 Log: Optimization suggested by Michael Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Tue Dec 9 23:05:49 2008 @@ -686,12 +686,13 @@ static int dirac_decode_frame_internal(D the data calculated by MC. */ line = coeffs; if (s->refs) { + int bias = 257 << (s->total_wt_bits - 1); mcline = s->mcpic; for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - int coeff = mcline[x] + (1 << (s->total_wt_bits - 1)); + int coeff = mcline[x] + bias; coeff = line[x] + (coeff >> s->total_wt_bits); - frame[x]= av_clip_uint8(coeff + 128); + frame[x]= av_clip_uint8(coeff); } line += s->plane[comp].padded_width;

1 0

[soc]: r3880 - in dirac/libavcodec: diracdec.c dwt.c dwt.h
by conrad 09 Dec '08

09 Dec '08

Author: conrad Date: Tue Dec 9 23:05:47 2008 New Revision: 3880 Log: Rewrite idwt in the style of Snow's, making it mostly in-place and removing the need for a temp buffer. 20% faster intra decode. Added: dirac/libavcodec/dwt.c dirac/libavcodec/dwt.h Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Tue Dec 9 23:05:47 2008 @@ -34,6 +34,7 @@ #include "dirac_arith.h" #include "dirac_wavelet.h" #include "mpeg12data.h" +#include "dwt.h" /** * Value of Picture.reference when Picture is not a reference picture, but @@ -600,50 +601,15 @@ static int dirac_unpack_block_motion_dat } /** - * IDWT - * - * @param coeffs coefficients to transform - * @return returns 0 on succes, otherwise -1 - */ -int dirac_idwt(DiracContext *s, int16_t *coeffs, int16_t *synth, int comp) -{ - int level; - int width, height; - - for (level = 1; level <= s->decoding.wavelet_depth; level++) { - width = s->plane[comp].band[level-1][1].width; - height = s->plane[comp].band[level-1][1].height; - - switch(s->wavelet_idx) { - case 0: - dirac_subband_idwt_97(s->avctx, width, height, s->plane[comp].padded_width, - coeffs, synth, level); - break; - case 1: - dirac_subband_idwt_53(s->avctx, width, height, s->plane[comp].padded_width, - coeffs, synth, level); - break; - default: - av_log(s->avctx, AV_LOG_INFO, "unknown IDWT index: %d\n", - s->wavelet_idx); - } - } - - return 0; -} - -/** * Decode a frame. * * @return 0 when successful, otherwise -1 is returned */ static int dirac_decode_frame_internal(DiracContext *s) { - AVCodecContext *avctx = s->avctx; int16_t *coeffs; int16_t *line; int16_t *mcline; - int16_t *synth; int comp, level, orientation; int x, y; @@ -673,15 +639,15 @@ static int dirac_decode_frame_internal(D b->ibuf = coeffs; b->level = level; - b->stride = s->plane[comp].padded_width; + b->stride = s->plane[comp].padded_width << (s->decoding.wavelet_depth - level); b->width = (w + !(orientation&1))>>1; b->height = (h + !(orientation>1))>>1; b->orientation = orientation; if (orientation & 1) - b->ibuf += b->width; + b->ibuf += (w+1)>>1; if (orientation > 1) - b->ibuf += b->height * b->stride; + b->ibuf += b->stride>>1; if (level) b->parent = &s->plane[comp].band[level-1][orientation]; @@ -691,13 +657,6 @@ static int dirac_decode_frame_internal(D } } - /* Allocate memory for the IDWT to work in. */ - synth = av_malloc(s->plane[0].padded_width * s->plane[0].padded_height * sizeof(int16_t)); - if (!synth) { - av_log(avctx, AV_LOG_ERROR, "av_malloc() failed\n"); - return -1; - } - for (comp = 0; comp < 3; comp++) { uint8_t *frame = s->current_picture->data[comp]; int width, height; @@ -711,7 +670,8 @@ static int dirac_decode_frame_internal(D if (!s->zero_res) decode_component(s, comp); - dirac_idwt(s, coeffs, synth, comp); + ff_spatial_idwt2(coeffs, s->plane[comp].padded_width, s->plane[comp].padded_height, + s->plane[comp].padded_width, s->wavelet_idx+2, s->decoding.wavelet_depth); if (s->refs) { if (dirac_motion_compensation(s, coeffs, comp)) { @@ -758,7 +718,6 @@ static int dirac_decode_frame_internal(D av_freep(&s->blmotion); } av_free(coeffs); - av_free(synth); return 0; } Added: dirac/libavcodec/dwt.c ============================================================================== --- (empty file) +++ dirac/libavcodec/dwt.c Tue Dec 9 23:05:47 2008 @@ -0,0 +1,233 @@ +/* + * Copyright (C) 2004 Michael Niedermayer <michaelni(a)gmx.at> + * Copyright (C) 2008 David Conrad + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + */ + +#include "avcodec.h" +#include "dsputil.h" +#include "dwt.h" + +static inline int mirror(int v, int m){ + if (v<0) return -v; + else if(v>m) return 2*m-v; + else return v; +} + +static inline int extend(int v, int m){ + if (v<0) return 0; + else if(v>m) return m; + else return v; +} + +#define COMPOSE_53iL0(b0, b1, b2)\ + (b1 - ((b0 + b2 + 2) >> 2)) + +#define COMPOSE_DIRAC53iH0(b0, b1, b2)\ + (b1 + ((b0 + b2 + 1) >> 1)) + +#define COMPOSE_DD97iH0(b0, b1, b2, b3, b4)\ + (b2 + ((-b0 + 9*b1 + 9*b3 - b4 + 8) >> 4)) + +static av_always_inline +void interleave(IDWTELEM *dst, IDWTELEM *src0, IDWTELEM *src1, int width, + int add, int shift){ + int i; + for (i = 0; i < width>>1; i++) { + dst[2*i ] = (src0[i] + add) >> shift; + dst[2*i+1] = (src1[i] + add) >> shift; + } +} + +static void horizontal_compose_dirac53i(IDWTELEM *b, int w){ + IDWTELEM temp[w]; + const int w2= w >> 1; + int x; + + temp[0] = COMPOSE_53iL0(b[w2], b[0], b[w2]); + for (x = 0; x < w2-1; x++) { + temp[x+1 ] = COMPOSE_53iL0 (b[x+w2], b[x+1 ], b[x+w2+1]); + temp[x+w2] = COMPOSE_DIRAC53iH0(temp[x], b[x+w2], temp[x+1]); + } + temp[w-1] = COMPOSE_DIRAC53iH0(temp[w2-1], b[w-1], temp[w2-1]); + + interleave(b, temp, temp+w2, w, 1, 1); +} + +static void vertical_compose53iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width){ + int i; + + for(i=0; i<width; i++){ + b1[i] = COMPOSE_53iL0(b0[i], b1[i], b2[i]); + } +} + +static void vertical_compose_dirac53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width){ + int i; + + for(i=0; i<width; i++){ + b1[i] = COMPOSE_DIRAC53iH0(b0[i], b1[i], b2[i]); + } +} + +static void spatial_compose_dirac53i_dy(dwt_compose_t *cs, IDWTELEM *buffer, + int width, int height, int stride){ + int y= cs->y; + IDWTELEM *b0= cs->b0; + IDWTELEM *b1= cs->b1; + IDWTELEM *b2= buffer + mirror(y+1, height-1)*stride; + IDWTELEM *b3= buffer + mirror(y+2, height-1)*stride; + + if(y+1<(unsigned)height) vertical_compose53iL0 (b1, b2, b3, width); + if(y+0<(unsigned)height) vertical_compose_dirac53iH0(b0, b1, b2, width); + + if(y-1<(unsigned)height) horizontal_compose_dirac53i(b0, width); + if(y+0<(unsigned)height) horizontal_compose_dirac53i(b1, width); + + cs->b0 = b2; + cs->b1 = b3; + cs->y += 2; +} + +static void horizontal_compose_dd97i(IDWTELEM *b, int w){ + IDWTELEM temp[w]; + const int w2 = w >> 1; + int x; + + temp[0] = COMPOSE_53iL0(b[w2], b[0], b[w2]); + for (x = 0; x < w2-1; x++) + temp[x+1] = COMPOSE_53iL0(b[x+w2], b[x+1], b[x+w2+1]); + + temp[w2] = COMPOSE_DD97iH0(temp[0], temp[0], b[w2], temp[1], temp[2]); + for (x = 0; x < w2-2; x++) + temp[x+w2+1] = COMPOSE_DD97iH0(temp[x], temp[x+1], b[x+w2+1], temp[x+2], temp[x+3]); + + temp[w-2] = COMPOSE_DD97iH0(temp[w2-3], temp[w2-2], b[w-2], temp[w2-1], temp[w2-1]); + temp[w-1] = COMPOSE_DD97iH0(temp[w2-2], temp[w2-1], b[w-1], temp[w2-1], temp[w2-1]); + + interleave(b, temp, temp+w2, w, 1, 1); +} + +static void vertical_compose_dd97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + IDWTELEM *b3, IDWTELEM *b4, int width){ + int i; + + for(i=0; i<width; i++){ + b2[i] = COMPOSE_DD97iH0(b0[i], b1[i], b2[i], b3[i], b4[i]); + } +} + +static void spatial_compose_dd97i_dy(dwt_compose_t *cs, IDWTELEM *buffer, + int width, int height, int stride){ + int y = cs->y; + IDWTELEM *b0= cs->b0; + IDWTELEM *b1= cs->b1; + IDWTELEM *b2= cs->b2; + IDWTELEM *b3= cs->b3; + IDWTELEM *b4= cs->b4; + IDWTELEM *b5= cs->b5; + IDWTELEM *b6= buffer + extend(y+5, height-2)*stride; + IDWTELEM *b7= buffer + mirror(y+6, height-1)*stride; + + if(y+5<(unsigned)height) vertical_compose53iL0 ( b5, b6, b7, width); + if(y+1<(unsigned)height) vertical_compose_dd97iH0(b0, b2, b3, b4, b6, width); + + if(y-1<(unsigned)height) horizontal_compose_dd97i(b0, width); + if(y+0<(unsigned)height) horizontal_compose_dd97i(b1, width); + + cs->b0=b2; + cs->b1=b3; + cs->b2=b4; + cs->b3=b5; + cs->b4=b6; + cs->b5=b7; + cs->y += 2; +} + +static void spatial_compose53i_init(dwt_compose_t *cs, IDWTELEM *buffer, + int height, int stride){ + cs->b0 = buffer + mirror(-1-1, height-1)*stride; + cs->b1 = buffer + mirror(-1 , height-1)*stride; + cs->y = -1; +} + +static void spatial_compose_dd97i_init(dwt_compose_t *cs, IDWTELEM *buffer, + int height, int stride){ + cs->b0 = buffer + extend(-5-1, height-2)*stride; + cs->b1 = buffer + mirror(-5 , height-1)*stride; + cs->b2 = buffer + extend(-5+1, height-2)*stride; + cs->b3 = buffer + mirror(-5+2, height-1)*stride; + cs->b4 = buffer + extend(-5+3, height-2)*stride; + cs->b5 = buffer + mirror(-5+4, height-1)*stride; + cs->y = -5; +} + +void ff_spatial_idwt_init2(dwt_compose_t *cs, IDWTELEM *buffer, int width, int height, + int stride, int type, int decomposition_count){ + int level; + for(level=decomposition_count-1; level>=0; level--){ + int hl = height >> level; + int stride_l = stride << level; + + switch(type){ + case DWT_DIRAC_DD9_7: + spatial_compose_dd97i_init(cs+level, buffer, hl, stride_l); + break; + case DWT_DIRAC_LEGALL5_3: + spatial_compose53i_init(cs+level, buffer, hl, stride_l); + break; + } + } +} + +void ff_spatial_idwt_slice2(dwt_compose_t *cs, IDWTELEM *buffer, int width, int height, + int stride, int type, int decomposition_count, int y){ + const int support[] = {5, 3, 7, 3}; + int level; + + for(level=decomposition_count-1; level>=0; level--){ + int wl = width >> level; + int hl = height >> level; + int stride_l = stride << level; + + while(cs[level].y <= FFMIN((y>>level)+support[type], height>>level)){ + switch(type){ + case DWT_DIRAC_DD9_7: + spatial_compose_dd97i_dy(cs+level, buffer, wl, hl, stride_l); + break; + case DWT_DIRAC_LEGALL5_3: + spatial_compose_dirac53i_dy(cs+level, buffer, wl, hl, stride_l); + break; + } + } + } +} + +void ff_spatial_idwt2(IDWTELEM *buffer, int width, int height, + int stride, int type, int decomposition_count){ + dwt_compose_t cs[decomposition_count]; + int y; + + ff_spatial_idwt_init2(cs, buffer, width, height, stride, + type, decomposition_count); + for(y=0; y<height; y+=4) + ff_spatial_idwt_slice2(cs, buffer, width, height, stride, + type, decomposition_count, y); +} Added: dirac/libavcodec/dwt.h ============================================================================== --- (empty file) +++ dirac/libavcodec/dwt.h Tue Dec 9 23:05:47 2008 @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2004 Michael Niedermayer <michaelni(a)gmx.at> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + */ + +#ifndef AVCODEC_DWT_H +#define AVCODEC_DWT_H + +#include "avcodec.h" +#include "dsputil.h" + +typedef struct { + int y; + IDWTELEM *b0; + IDWTELEM *b1; + IDWTELEM *b2; + IDWTELEM *b3; + IDWTELEM *b4; + IDWTELEM *b5; +} dwt_compose_t; + +#define DWT_SNOW_DAUB9_7 0 +#define DWT_SNOW_LEGALL5_3 1 +#define DWT_DIRAC_DD9_7 2 +#define DWT_DIRAC_LEGALL5_3 3 +#define DWT_DIRAC_DD13_7 4 +#define DWT_DIRAC_HAAR0 5 +#define DWT_DIRAC_HAAR1 6 +#define DWT_DIRAC_FIDELITY 7 +#define DWT_DIRAC_DAUB9_7 8 + +void ff_spatial_idwt2(IDWTELEM *buffer, int width, int height, int stride, + int type, int decomposition_count); + +void ff_spatial_idwt_slice2(dwt_compose_t *cs, IDWTELEM *buffer, int width, int height, + int stride, int type, int decomposition_count, int y); + +#endif /* AVCODEC_DWT_H */

1 0

[soc]: r3879 - in dirac/libavcodec: dirac.h diracdec.c
by conrad 09 Dec '08

09 Dec '08

Author: conrad Date: Tue Dec 9 23:05:45 2008 New Revision: 3879 Log: Use Plane and SubBand structs (based on snow) Modified: dirac/libavcodec/dirac.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h (original) +++ dirac/libavcodec/dirac.h Tue Dec 9 23:05:45 2008 @@ -31,6 +31,7 @@ #include "avcodec.h" #include "bitstream.h" #include "dirac_arith.h" +#include "dsputil.h" typedef enum { COLOR_PRIMARY_HDTV, ///< ITU-R BT. 709, also computer/web/sRGB @@ -147,6 +148,25 @@ struct dirac_blockmotion { #define MAX_REFERENCE_FRAMES 16 #define MAX_DELAYED_FRAMES 16 #define MAX_FRAMES 32 +#define MAX_DECOMPOSITIONS 8 + +typedef struct SubBand{ + int level; + int orientation; + int stride; + int width; + int height; + IDWTELEM *ibuf; + struct SubBand *parent; +} SubBand; + +typedef struct Plane{ + int width; + int height; + int padded_width; + int padded_height; + SubBand band[MAX_DECOMPOSITIONS][4]; +} Plane; typedef struct DiracContext { AVCodecContext *avctx; @@ -170,13 +190,8 @@ typedef struct DiracContext { struct decoding_parameters decoding; unsigned int codeblock_mode; - unsigned int codeblocksh[7]; /* XXX: 7 levels. */ - unsigned int codeblocksv[7]; /* XXX: 7 levels. */ - - int padded_luma_width; ///< padded luma width - int padded_luma_height; ///< padded luma height - int padded_chroma_width; ///< padded chroma width - int padded_chroma_height; ///< padded chroma height + unsigned int codeblocksh[MAX_DECOMPOSITIONS+1]; + unsigned int codeblocksv[MAX_DECOMPOSITIONS+1]; int chroma_hshift; ///< horizontal bits to shift for choma int chroma_vshift; ///< vertical bits to shift for choma @@ -200,9 +215,9 @@ typedef struct DiracContext { unsigned int wavelet_idx; + Plane plane[3]; + /* Current component. */ - int padded_width; ///< padded width of the current component - int padded_height; ///< padded height of the current component int width; int height; int xbsep; @@ -237,32 +252,6 @@ typedef enum { subband_hh = 3 } dirac_subband; -/** - * Calculate the width of a subband on a given level - * - * @param level subband level - * @return subband width - */ -static int inline subband_width(DiracContext *s, int level) -{ - if (level == 0) - return s->padded_width >> s->decoding.wavelet_depth; - return s->padded_width >> (s->decoding.wavelet_depth - level + 1); -} - -/** - * Calculate the height of a subband on a given level - * - * @param level subband level - * @return height of the subband - */ -static int inline subband_height(DiracContext *s, int level) -{ - if (level == 0) - return s->padded_height >> s->decoding.wavelet_depth; - return s->padded_height >> (s->decoding.wavelet_depth - level + 1); -} - // this assumes a max quantizer of 119 (larger would overflow 32 bits), // which schoedinger and dirac-research also assume static unsigned int inline coeff_quant_factor(unsigned int quant) @@ -297,49 +286,13 @@ static unsigned int inline coeff_quant_o return (coeff_quant_factor(quant) * 3 + 4) >> 3; } -/** - * Calculate the horizontal position of a coefficient given a level, - * orientation and horizontal position within the subband. - * - * @param level subband level - * @param orientation orientation of the subband within the level - * @param x position within the subband - * @return horizontal position within the coefficient array - */ -static int inline coeff_posx(DiracContext *s, int level, - dirac_subband orientation, int x) -{ - if (orientation == subband_hl || orientation == subband_hh) - return subband_width(s, level) + x; - - return x; -} - -/** - * Calculate the vertical position of a coefficient given a level, - * orientation and vertical position within the subband. - * - * @param level subband level - * @param orientation orientation of the subband within the level - * @param y position within the subband - * @return vertical position within the coefficient array - */ static inline -int coeff_posy(DiracContext *s, int level, dirac_subband orientation, int y) -{ - if (orientation == subband_lh || orientation == subband_hh) - return subband_height(s, level) + y; - - return y; -} - -static inline -int zero_neighbourhood(DiracContext *s, int16_t *data, int x, int y) +int zero_neighbourhood(int16_t *data, int x, int y, int stride) { /* Check if there is a zero to the left and top left of this coefficient. */ - if (y > 0 && (data[-s->padded_width] - || ( x > 0 && data[-s->padded_width - 1]))) + if (y > 0 && (data[-stride] + || ( x > 0 && data[-stride - 1]))) return 0; else if (x > 0 && data[- 1]) return 0; @@ -357,11 +310,11 @@ int zero_neighbourhood(DiracContext *s, * @return prediction for the sign: -1 when negative, 1 when positive, 0 when 0 */ static inline -int sign_predict(DiracContext *s, int16_t *data, dirac_subband orientation, - int x, int y) +int sign_predict(int16_t *data, dirac_subband orientation, + int x, int y, int stride) { if (orientation == subband_hl && y > 0) - return DIRAC_SIGN(data[-s->padded_width]); + return DIRAC_SIGN(data[-stride]); else if (orientation == subband_lh && x > 0) return DIRAC_SIGN(data[-1]); else @@ -369,13 +322,13 @@ int sign_predict(DiracContext *s, int16_ } static inline -int intra_dc_coeff_prediction(DiracContext *s, int16_t *coeff, int x, int y) +int intra_dc_coeff_prediction(int16_t *coeff, int x, int y, int stride) { int pred; if (x > 0 && y > 0) { pred = (coeff[-1] - + coeff[-s->padded_width] - + coeff[-s->padded_width - 1]); + + coeff[-stride] + + coeff[-stride - 1]); if (pred > 0) pred = (pred + 1) / 3; else @@ -384,7 +337,7 @@ int intra_dc_coeff_prediction(DiracConte /* Just use the coefficient left of this one. */ pred = coeff[-1]; } else if (y > 0) - pred = coeff[-s->padded_width]; + pred = coeff[-stride]; else pred = 0; Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Tue Dec 9 23:05:45 2008 @@ -131,8 +131,8 @@ static inline int coeff_dequant(int coef * @param qoffset quantizer offset * @param qfact quantizer factor */ -static void coeff_unpack(DiracContext *s, int16_t *data, int level, - dirac_subband orientation, int x, int y, +static void coeff_unpack(DiracContext *s, SubBand *b, + int x, int y, int qoffset, int qfactor) { int parent = 0; @@ -142,26 +142,19 @@ static void coeff_unpack(DiracContext *s int read_sign; struct dirac_arith_context_set *context; int16_t *coeffp; - int vdata, hdata; - vdata = coeff_posy(s, level, orientation, y); - hdata = coeff_posx(s, level, orientation, x); - - coeffp = &data[hdata + vdata * s->padded_width]; + coeffp = &b->ibuf[y * b->stride + x]; /* The value of the pixel belonging to the lower level. */ - if (level >= 2) { - int low_x = coeff_posx(s, level - 1, orientation, x >> 1); - int low_y = coeff_posy(s, level - 1, orientation, y >> 1); - parent = data[s->padded_width * low_y + low_x] != 0; - } + if (b->parent) + parent = b->parent->ibuf[b->parent->stride * (y>>1) + (x>>1)] != 0; /* Determine if the pixel has only zeros in its neighbourhood. */ - nhood = zero_neighbourhood(s, coeffp, x, y); + nhood = zero_neighbourhood(coeffp, x, y, b->stride); /* Calculate an index into context_sets_waveletcoeff. */ idx = parent * 6 + (!nhood) * 3; - idx += sign_predict(s, coeffp, orientation, x, y); + idx += sign_predict(coeffp, b->orientation, x, y, b->stride); context = &ff_dirac_context_sets_waveletcoeff[idx]; @@ -188,19 +181,18 @@ static void coeff_unpack(DiracContext *s * @param quant quantizer offset * @param quant quantizer factor */ -static void codeblock(DiracContext *s, int16_t *data, int level, - dirac_subband orientation, int cb_x, int cb_y, - unsigned int *quant) +static void codeblock(DiracContext *s, SubBand *b, + int cb_x, int cb_y, int cb_numx, int cb_numy, + unsigned int *quant, int blockcnt_one) { - int blockcnt_one = (s->codeblocksh[level] + s->codeblocksv[level]) == 2; int left, right, top, bottom; int x, y; unsigned int qoffset, qfactor; - left = (subband_width(s, level) * cb_x ) / s->codeblocksh[level]; - right = (subband_width(s, level) * (cb_x + 1)) / s->codeblocksh[level]; - top = (subband_height(s, level) * cb_y ) / s->codeblocksv[level]; - bottom = (subband_height(s, level) * (cb_y + 1)) / s->codeblocksv[level]; + left = (b->width * cb_x ) / cb_numx; + right = (b->width * (cb_x+1)) / cb_numx; + top = (b->height * cb_y ) / cb_numy; + bottom = (b->height * (cb_y+1)) / cb_numy; if (!blockcnt_one) { /* Determine if this codeblock is a zero block. */ @@ -216,7 +208,7 @@ static void codeblock(DiracContext *s, i for (y = top; y < bottom; y++) for (x = left; x < right; x++) - coeff_unpack(s, data, level, orientation, x, y, qoffset, qfactor); + coeff_unpack(s, b, x, y, qoffset, qfactor); } /** @@ -224,16 +216,16 @@ static void codeblock(DiracContext *s, i * * @param data coefficients */ -static void intra_dc_prediction(DiracContext *s, int16_t *data) +static void intra_dc_prediction(SubBand *b) { int x, y; - int16_t *line = data; + int16_t *line = b->ibuf; - for (y = 0; y < subband_height(s, 0); y++) { - for (x = 0; x < subband_width(s, 0); x++) { - line[x] += intra_dc_coeff_prediction(s, &line[x], x, y); + for (y = 0; y < b->height; y++) { + for (x = 0; x < b->width; x++) { + line[x] += intra_dc_coeff_prediction(&line[x], x, y, b->stride); } - line += s->padded_width; + line += b->stride; } } @@ -244,13 +236,15 @@ static void intra_dc_prediction(DiracCon * @param level subband level * @param orientation orientation of the subband */ -static int subband(DiracContext *s, int16_t *data, int level, - dirac_subband orientation) +static int subband(DiracContext *s, SubBand *b) { GetBitContext *gb = &s->gb; unsigned int length; unsigned int quant; int cb_x, cb_y; + int cb_numx = s->codeblocksh[b->level + (b->orientation != subband_ll)]; + int cb_numy = s->codeblocksv[b->level + (b->orientation != subband_ll)]; + int blockcnt_one = (cb_numx + cb_numy) == 2; length = svq3_get_ue_golomb(gb); if (! length) { @@ -260,14 +254,14 @@ static int subband(DiracContext *s, int1 dirac_arith_init(&s->arith, gb, length); - for (cb_y = 0; cb_y < s->codeblocksv[level]; cb_y++) - for (cb_x = 0; cb_x < s->codeblocksh[level]; cb_x++) - codeblock(s, data, level, orientation, cb_x, cb_y, &quant); + for (cb_y = 0; cb_y < cb_numy; cb_y++) + for (cb_x = 0; cb_x < cb_numx; cb_x++) + codeblock(s, b, cb_x, cb_y, cb_numx, cb_numy, &quant, blockcnt_one); dirac_arith_flush(&s->arith); } - if (level == 0 && s->refs == 0) - intra_dc_prediction(s, data); + if (b->orientation == subband_ll && s->refs == 0) + intra_dc_prediction(b); return 0; } @@ -277,23 +271,18 @@ static int subband(DiracContext *s, int1 * * @param coeffs coefficients for this component */ -static void decode_component(DiracContext *s, int16_t *coeffs) +static void decode_component(DiracContext *s, int comp) { GetBitContext *gb = &s->gb; int level; dirac_subband orientation; - /* Align for coefficient bitstream. */ - align_get_bits(gb); - - /* Unpack LL, level 0. */ - subband(s, coeffs, 0, subband_ll); - - /* Unpack all other subbands at all levels. */ - for (level = 1; level <= s->decoding.wavelet_depth; level++) { - for (orientation = 1; orientation <= subband_hh; orientation++) { + /* Unpack all subbands at all levels. */ + for (level = 0; level < s->decoding.wavelet_depth; level++) { + for (orientation = (level ? 1 : 0); orientation < 4; orientation++) { + SubBand *b = &s->plane[comp].band[level][orientation]; align_get_bits(gb); - subband(s, coeffs, level, orientation); + subband(s, b); } } } @@ -616,22 +605,22 @@ static int dirac_unpack_block_motion_dat * @param coeffs coefficients to transform * @return returns 0 on succes, otherwise -1 */ -int dirac_idwt(DiracContext *s, int16_t *coeffs, int16_t *synth) +int dirac_idwt(DiracContext *s, int16_t *coeffs, int16_t *synth, int comp) { int level; int width, height; for (level = 1; level <= s->decoding.wavelet_depth; level++) { - width = subband_width(s, level); - height = subband_height(s, level); + width = s->plane[comp].band[level-1][1].width; + height = s->plane[comp].band[level-1][1].height; switch(s->wavelet_idx) { case 0: - dirac_subband_idwt_97(s->avctx, width, height, s->padded_width, + dirac_subband_idwt_97(s->avctx, width, height, s->plane[comp].padded_width, coeffs, synth, level); break; case 1: - dirac_subband_idwt_53(s->avctx, width, height, s->padded_width, + dirac_subband_idwt_53(s->avctx, width, height, s->plane[comp].padded_width, coeffs, synth, level); break; default: @@ -654,24 +643,56 @@ static int dirac_decode_frame_internal(D int16_t *coeffs; int16_t *line; int16_t *mcline; - int comp; - int x,y; int16_t *synth; + int comp, level, orientation; + int x, y; - if (avcodec_check_dimensions(s->avctx, s->padded_luma_width, - s->padded_luma_height)) - return -1; +#define PAD(size, depth) \ + (((size + (1 << depth) - 1) >> depth) << depth) - coeffs = av_malloc(s->padded_luma_width * s->padded_luma_height - * sizeof(int16_t)); + for (comp = 0; comp < 3; comp++) { + int w = s->source.width >> (comp ? s->chroma_hshift : 0); + int h = s->source.height >> (comp ? s->chroma_vshift : 0); + + s->plane[comp].width = w; + s->plane[comp].height = h; + s->plane[comp].padded_width = w = PAD(w, s->decoding.wavelet_depth); + s->plane[comp].padded_height = h = PAD(h, s->decoding.wavelet_depth); + + if (!comp) { + coeffs = av_malloc(w * h * sizeof(IDWTELEM)); if (! coeffs) { av_log(s->avctx, AV_LOG_ERROR, "av_malloc() failed\n"); return -1; } + } + + for (level = s->decoding.wavelet_depth-1; level >= 0; level--) { + for (orientation = level ? 1 : 0; orientation < 4; orientation++) { + SubBand *b = &s->plane[comp].band[level][orientation]; + + b->ibuf = coeffs; + b->level = level; + b->stride = s->plane[comp].padded_width; + b->width = (w + !(orientation&1))>>1; + b->height = (h + !(orientation>1))>>1; + b->orientation = orientation; + + if (orientation & 1) + b->ibuf += b->width; + if (orientation > 1) + b->ibuf += b->height * b->stride; + + if (level) + b->parent = &s->plane[comp].band[level-1][orientation]; + } + w = (w+1)>>1; + h = (h+1)>>1; + } + } /* Allocate memory for the IDWT to work in. */ - synth = av_malloc(s->padded_luma_width * s->padded_luma_height - * sizeof(int16_t)); + synth = av_malloc(s->plane[0].padded_width * s->plane[0].padded_height * sizeof(int16_t)); if (!synth) { av_log(avctx, AV_LOG_ERROR, "av_malloc() failed\n"); return -1; @@ -683,21 +704,14 @@ static int dirac_decode_frame_internal(D width = s->source.width >> (comp ? s->chroma_hshift : 0); height = s->source.height >> (comp ? s->chroma_vshift : 0); - if (comp == 0) { - s->padded_width = s->padded_luma_width; - s->padded_height = s->padded_luma_height; - } else { - s->padded_width = s->padded_chroma_width; - s->padded_height = s->padded_chroma_height; - } memset(coeffs, 0, - s->padded_width * s->padded_height * sizeof(int16_t)); + s->plane[comp].padded_width * s->plane[comp].padded_height * sizeof(int16_t)); if (!s->zero_res) - decode_component(s, coeffs); + decode_component(s, comp); - dirac_idwt(s, coeffs, synth); + dirac_idwt(s, coeffs, synth, comp); if (s->refs) { if (dirac_motion_compensation(s, coeffs, comp)) { @@ -720,7 +734,7 @@ static int dirac_decode_frame_internal(D frame[x]= av_clip_uint8(coeff + 128); } - line += s->padded_width; + line += s->plane[comp].padded_width; frame += s->current_picture->linesize[comp]; mcline += s->width; } @@ -730,7 +744,7 @@ static int dirac_decode_frame_internal(D frame[x]= av_clip_uint8(line[x] + 128); } - line += s->padded_width; + line += s->plane[comp].padded_width; frame += s->current_picture->linesize[comp]; } } @@ -825,20 +839,6 @@ static int parse_frame(DiracContext *s) for (i = 0; i <= s->decoding.wavelet_depth; i++) s->codeblocksh[i] = s->codeblocksv[i] = 1; } - -#define CALC_PADDING(size, depth) \ - (((size + (1 << depth) - 1) >> depth) << depth) - - /* Round up to a multiple of 2^depth. */ - s->padded_luma_width = CALC_PADDING(s->source.width, - s->decoding.wavelet_depth); - s->padded_luma_height = CALC_PADDING(s->source.height, - s->decoding.wavelet_depth); - s->padded_chroma_width = CALC_PADDING((s->source.width >> s->chroma_hshift), - s->decoding.wavelet_depth); - s->padded_chroma_height = CALC_PADDING((s->source.height >> s->chroma_vshift), - s->decoding.wavelet_depth); - return 0; }

1 0

[soc]: r3878 - libavfilter/diffs/01_ffplay_filters.diff
by stefano 09 Dec '08

09 Dec '08

Author: stefano Date: Tue Dec 9 00:04:01 2008 New Revision: 3878 Log: Fix ffplay memleak introduced with r3757 occurring when using a rawvideo decoder. Make the get_video_frame() function returns a shallow copy of the input data packet, so that it can be freed just after its use. Modified: libavfilter/diffs/01_ffplay_filters.diff Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff (original) +++ libavfilter/diffs/01_ffplay_filters.diff Tue Dec 9 00:04:01 2008 @@ -211,13 +211,12 @@ Index: ffplay.c /* update the bitmap content */ SDL_UnlockYUVOverlay(vp->bmp); -@@ -1334,54 +1405,256 @@ +@@ -1334,54 +1405,261 @@ return queue_picture(is, src_frame, pts); } -+static int get_video_frame(VideoState *is, AVFrame *frame, uint64_t *pts) ++static int get_video_frame(VideoState *is, AVFrame *frame, uint64_t *pts, AVPacket *pkt) +{ -+ AVPacket pkt1, *pkt = &pkt1; + int len1, got_picture; + + if (packet_queue_get(&is->videoq, pkt, 1) < 0) @@ -249,9 +248,6 @@ Index: ffplay.c + *pts = AV_TIME_BASE * (*pts) * is->video_st->time_base.num / + is->video_st->time_base.den; + -+ /* rawvideo decoder uses the packet data to set the data in the output AVFrame */ -+ if (is->video_st->codec->codec->id != CODEC_ID_RAWVIDEO) -+ av_free_packet(pkt); + if(got_picture) + return 1; + return 0; @@ -285,8 +281,9 @@ Index: ffplay.c + FilterPriv *priv = link->src->priv; + AVFilterPicRef *picref; + uint64_t pts = 0; ++ AVPacket pkt; + -+ if(get_video_frame(priv->is, priv->frame, &pts) < 0) ++ if(get_video_frame(priv->is, priv->frame, &pts, &pkt) < 0) + return -1; + + /* FIXME: until I figure out how to hook everything up to the codec @@ -294,6 +291,7 @@ Index: ffplay.c + picref = avfilter_get_video_buffer(link, AV_PERM_WRITE); + av_picture_copy((AVPicture *)&picref->data, (AVPicture *)priv->frame, + picref->pic->format, picref->w, picref->h); ++ av_free_packet(&pkt); + + picref->pts = pts; + picref->pixel_aspect = priv->is->video_st->codec->sample_aspect_ratio; @@ -442,6 +440,9 @@ Index: ffplay.c + for(;;) { - while (is->paused && !is->videoq.abort_request) { ++#if !ENABLE_AVFILTER ++ AVPacket pkt; ++#endif + while (is->paused && !is->videoq.abort_request) SDL_Delay(10); - } @@ -450,7 +451,7 @@ Index: ffplay.c +#if ENABLE_AVFILTER + ret = get_filtered_video_frame(filt_out, frame, &pts_int); +#else -+ ret = get_video_frame(is, frame, &pts_int); ++ ret = get_video_frame(is, frame, &pts_int, &pkt); +#endif - if(pkt->data == flush_pkt.data){ @@ -469,7 +470,11 @@ Index: ffplay.c - pkt->data, pkt->size); + pts = pts_int; + pts /= AV_TIME_BASE; -+ if(output_picture2(is, frame, pts) < 0) ++ ret = output_picture2(is, frame, pts); ++#if !ENABLE_AVFILTER ++ av_free_packet(&pkt); ++#endif ++ if (ret < 0) + goto the_end; - if( (decoder_reorder_pts || pkt->dts == AV_NOPTS_VALUE) @@ -499,7 +504,7 @@ Index: ffplay.c av_free(frame); return 0; } -@@ -2161,6 +2434,12 @@ +@@ -2161,6 +2439,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -512,7 +517,7 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2498,6 +2777,9 @@ +@@ -2498,6 +2782,9 @@ { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" }, { "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" }, { "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, @@ -522,7 +527,7 @@ Index: ffplay.c { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -@@ -2546,7 +2828,9 @@ +@@ -2546,7 +2833,9 @@ avctx_opts[i]= avcodec_alloc_context2(i); } avformat_opts = av_alloc_format_context();

1 0

[soc] [propchange]: r3877 - svn:log
by diego 06 Dec '08

06 Dec '08

Author: diego Revision: 3877 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Fix warning about uninitalized variables +Fix warning about uninitialized variables

1 0

[soc]: r3877 - dirac/libavcodec/diracdec.c
by conrad 06 Dec '08

06 Dec '08

Author: conrad Date: Sat Dec 6 03:01:10 2008 New Revision: 3877 Log: Fix warning about uninitalized variables Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Sat Dec 6 03:01:10 2008 @@ -903,8 +903,8 @@ int dirac_decode_frame(AVCodecContext *a DiracContext *s = avctx->priv_data; AVFrame *picture = data; int i; - int parse_code; - unsigned data_unit_size, buf_read = 0; + int parse_code = pc_padding; + unsigned data_unit_size = buf_size, buf_read = 0; // release unused frames for (i = 0; i < MAX_FRAMES; i++)

1 0

[soc]: r3876 - in dirac/libavcodec: dirac.c dirac.h diracdec.c
by conrad 06 Dec '08

06 Dec '08

Author: conrad Date: Sat Dec 6 03:01:09 2008 New Revision: 3876 Log: Completely rewrite reference and delay frame management (based on h264) Also remove caching of the halfpel planes, this will be replaced with better motion compensation anyways. Modified: dirac/libavcodec/dirac.c dirac/libavcodec/dirac.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Sat Dec 6 03:01:09 2008 @@ -448,25 +448,6 @@ const struct dirac_block_params ff_dirac }; /** - * Search a frame in the buffer of reference frames - * - * @param frameno frame number in display order - * @return index of the reference frame in the reference frame buffer - */ -int dirac_reference_frame_idx(DiracContext *s, int frameno) -{ - int i; - - for (i = 0; i < s->refcnt; i++) { - AVFrame *f = &s->refframes[i].frame; - if (f->display_picture_number == frameno) - return i; - } - - return -1; -} - -/** * Interpolate a frame * * @param refframe frame to grab the upconverted pixel from @@ -1036,9 +1017,6 @@ int dirac_motion_compensation(DiracConte { int i, j; int x, y; - int refidx[2] = { 0 }; - int cacheframe[2] = {1, 1}; - AVFrame *ref[2] = { 0 }; struct dirac_blockmotion *currblock; int xstart, ystart; int xstop, ystop; @@ -1084,14 +1062,11 @@ int dirac_motion_compensation(DiracConte return -1; for (i = 0; i < s->refs; i++) { - refidx[i] = dirac_reference_frame_idx(s, s->ref[i]); - if (refidx[i] < 0) { - av_log(s->avctx, AV_LOG_ERROR, "Reference frame %d not in buffer\n", s->ref[i]); + if (!s->ref_pics[i]) { + av_log(s->avctx, AV_LOG_ERROR, "Reference frame %d not in buffer\n", i); return -1; } - ref[i] = &s->refframes[refidx[i]].frame; - if (s->refframes[refidx[i]].halfpel[comp] == NULL) { s->refdata[i] = av_malloc(s->refwidth * s->refheight); if (!s->refdata[i]) { if (i == 1) @@ -1099,12 +1074,8 @@ int dirac_motion_compensation(DiracConte av_log(s->avctx, AV_LOG_ERROR, "av_malloc() failed\n"); return -1; } - interpolate_frame_halfpel(ref[i], s->width, s->height, + interpolate_frame_halfpel(s->ref_pics[i], s->width, s->height, s->refdata[i], comp, s->xblen, s->yblen); - } else { - s->refdata[i] = s->refframes[refidx[i]].halfpel[comp]; - cacheframe[i] = 2; - } } if (avcodec_check_dimensions(s->avctx, s->width, s->height)) { @@ -1180,17 +1151,7 @@ int dirac_motion_compensation(DiracConte av_freep(&s->spatialwt); - for (i = 0; i < s->retirecnt; i++) { - if (cacheframe[0] == 1 && i == refidx[0]) - cacheframe[0] = 0; - if (cacheframe[1] == 1 && i == refidx[1]) - cacheframe[1] = 0; - } - for (i = 0; i < s->refs; i++) { - if (cacheframe[i]) - s->refframes[refidx[i]].halfpel[comp] = s->refdata[i]; - else av_freep(&s->refdata[i]); } Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h (original) +++ dirac/libavcodec/dirac.h Sat Dec 6 03:01:09 2008 @@ -143,13 +143,10 @@ struct dirac_blockmotion { int16_t dc[3]; }; -/* XXX */ -#define REFFRAME_CNT 20 - -struct reference_frame { - AVFrame frame; - int8_t *halfpel[3]; -}; +// Schoedinger limits these to 8 +#define MAX_REFERENCE_FRAMES 16 +#define MAX_DELAYED_FRAMES 16 +#define MAX_FRAMES 32 typedef struct DiracContext { AVCodecContext *avctx; @@ -160,13 +157,13 @@ typedef struct DiracContext { char *encodebuf; int prev_size; - AVFrame picture; + AVFrame *current_picture; + AVFrame *ref_pics[2]; - int refcnt; - struct reference_frame refframes[REFFRAME_CNT]; /* XXX */ + AVFrame *ref_frames[MAX_REFERENCE_FRAMES+1]; + AVFrame *delay_frames[MAX_DELAYED_FRAMES+1]; + AVFrame *all_frames; - int retirecnt; - uint32_t retireframe[REFFRAME_CNT]; int16_t *mcpic; dirac_source_params source; @@ -195,7 +192,6 @@ typedef struct DiracContext { int globalmc_flag; ///< use global motion compensation flag /** global motion compensation parameters */ struct globalmc_parameters globalmc; - uint32_t ref[2]; ///< reference pictures int16_t *spatialwt; int8_t *refdata[2]; @@ -554,8 +550,6 @@ int block_dc_prediction(DiracContext *s, return sign * (total + (cnt >> 1)) / cnt; } -int dirac_reference_frame_idx(DiracContext *s, int frameno); - int dirac_motion_compensation(DiracContext *s, int16_t *coeffs, int comp); int dirac_decode_frame(AVCodecContext *avctx, void *data, int *data_size, Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Sat Dec 6 03:01:09 2008 @@ -35,14 +35,66 @@ #include "dirac_wavelet.h" #include "mpeg12data.h" +/** + * Value of Picture.reference when Picture is not a reference picture, but + * is held for delayed output. + */ +#define DELAYED_PIC_REF 4 + +static AVFrame *get_frame(AVFrame *framelist[], int picnum) +{ + int i; + for (i = 0; framelist[i]; i++) + if (framelist[i]->display_picture_number == picnum) + return framelist[i]; + return NULL; +} + +static AVFrame *remove_frame(AVFrame *(*framelist)[], int picnum) +{ + AVFrame *remove_pic = NULL; + int i, remove_idx = -1; + + for (i = 0; (*framelist)[i]; i++) + if ((*framelist)[i]->display_picture_number == picnum) { + remove_pic = (*framelist)[i]; + remove_idx = i; + } + + if (remove_pic) + for (i = remove_idx; (*framelist)[i]; i++) + (*framelist)[i] = (*framelist)[i+1]; + + return remove_pic; +} + +static int add_frame(AVFrame *(*framelist)[], int maxframes, AVFrame *frame) +{ + int i; + for (i = 0; i < maxframes; i++) + if (!(*framelist)[i]) { + (*framelist)[i] = frame; + return 0; + } + return -1; +} + static int decode_init(AVCodecContext *avctx) { + DiracContext *s = avctx->priv_data; + + s->all_frames = av_mallocz(MAX_FRAMES * sizeof(AVFrame)); + if (!s->all_frames) + return -1; + return 0; } static int decode_end(AVCodecContext *avctx) { - // DiracContext *s = avctx->priv_data; + DiracContext *s = avctx->priv_data; + + av_free(s->all_frames); return 0; } @@ -626,7 +678,7 @@ static int dirac_decode_frame_internal(D } for (comp = 0; comp < 3; comp++) { - uint8_t *frame = s->picture.data[comp]; + uint8_t *frame = s->current_picture->data[comp]; int width, height; width = s->source.width >> (comp ? s->chroma_hshift : 0); @@ -669,7 +721,7 @@ static int dirac_decode_frame_internal(D } line += s->padded_width; - frame += s->picture.linesize[comp]; + frame += s->current_picture->linesize[comp]; mcline += s->width; } } else { @@ -679,7 +731,7 @@ static int dirac_decode_frame_internal(D } line += s->padded_width; - frame += s->picture.linesize[comp]; + frame += s->current_picture->linesize[comp]; } } @@ -704,22 +756,35 @@ static int dirac_decode_frame_internal(D */ static int parse_frame(DiracContext *s) { - int retire; + int retire, picnum; int i; GetBitContext *gb = &s->gb; - s->picture.display_picture_number = get_bits_long(gb, 32); + picnum= s->current_picture->display_picture_number = get_bits_long(gb, 32); + s->ref_pics[0] = s->ref_pics[1] = NULL; for (i = 0; i < s->refs; i++) - s->ref[i] = dirac_get_se_golomb(gb) + s->picture.display_picture_number; + s->ref_pics[i] = get_frame(s->ref_frames, picnum + dirac_get_se_golomb(gb)); /* Retire the reference frames that are not used anymore. */ - s->retirecnt = 0; - if (s->picture.reference) { - retire = dirac_get_se_golomb(gb); - if (retire) { - s->retireframe[0] = s->picture.display_picture_number + retire; - s->retirecnt = 1; + if (s->current_picture->reference) { + retire = picnum + dirac_get_se_golomb(gb); + if (retire != picnum) { + AVFrame *retire_pic = remove_frame(&s->ref_frames, retire); + + if (retire_pic) { + if (retire_pic->reference & DELAYED_PIC_REF) + retire_pic->reference = DELAYED_PIC_REF; + else + retire_pic->reference = 0; + } else + av_log(s->avctx, AV_LOG_DEBUG, "Frame to retire not found\n"); + } + + // if reference array is full, remove the oldest as per the spec + while (add_frame(&s->ref_frames, MAX_REFERENCE_FRAMES, s->current_picture)) { + av_log(s->avctx, AV_LOG_ERROR, "Reference frame overflow\n"); + remove_frame(&s->ref_frames, s->ref_frames[0]->display_picture_number); } } @@ -777,15 +842,59 @@ static int parse_frame(DiracContext *s) return 0; } -static void parse_picture_code(DiracContext *s, int parse_code) +static int alloc_frame(AVCodecContext *avctx, int parse_code) { static const uint8_t pict_type[3] = { FF_I_TYPE, FF_P_TYPE, FF_B_TYPE }; - avcodec_get_frame_defaults(&s->picture); + DiracContext *s = avctx->priv_data; + AVFrame *pic = NULL; + int i; + + // find an unused frame + for (i = 0; i < MAX_FRAMES; i++) + if (s->all_frames[i].data[0] == NULL) + pic = &s->all_frames[i]; + if (!pic) { + av_log(avctx, AV_LOG_ERROR, "framelist full\n"); + return -1; + } + + avcodec_get_frame_defaults(pic); s->refs = parse_code & 0x03; - s->picture.reference = (parse_code & 0x0C) == 0x0C; - s->picture.key_frame = s->refs == 0; - s->picture.pict_type = pict_type[s->refs]; + pic->reference = (parse_code & 0x0C) == 0x0C; + pic->key_frame = s->refs == 0; + pic->pict_type = pict_type[s->refs]; + + if (avctx->get_buffer(avctx, pic) < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return -1; + } + s->current_picture = pic; + return 0; +} + +static int get_delayed_pic(DiracContext *s, AVFrame *picture, int *data_size) +{ + AVFrame *out = s->delay_frames[0]; + int i, out_idx = 0; + + // find frame with lowest picture number + for (i = 1; s->delay_frames[i]; i++) + if (s->delay_frames[i]->display_picture_number < out->display_picture_number) { + out = s->delay_frames[i]; + out_idx = i; + } + + for (i = out_idx; s->delay_frames[i]; i++) + s->delay_frames[i] = s->delay_frames[i+1]; + + if (out) { + out->reference ^= DELAYED_PIC_REF; + *data_size = sizeof(AVFrame); + *picture = *out; + } + + return 0; } int dirac_decode_frame(AVCodecContext *avctx, void *data, int *data_size, @@ -797,17 +906,14 @@ int dirac_decode_frame(AVCodecContext *a int parse_code; unsigned data_unit_size, buf_read = 0; - if (buf_size == 0) { - int idx = dirac_reference_frame_idx(s, avctx->frame_number); - if (idx == -1) { - /* The frame was not found. */ - *data_size = 0; - } else { - *data_size = sizeof(AVFrame); - *picture = s->refframes[idx].frame; - } - return 0; - } + // release unused frames + for (i = 0; i < MAX_FRAMES; i++) + if (s->all_frames[i].data[0] && !s->all_frames[i].reference) + avctx->release_buffer(s->avctx, &s->all_frames[i]); + + // end of stream, so flush delayed pics + if (buf_size == 0) + return get_delayed_pic(s, picture, data_size); // read through data units until we find a picture while (buf_read < buf_size) { @@ -843,101 +949,31 @@ int dirac_decode_frame(AVCodecContext *a if ((parse_code & 0x08) != 0x08) return 0; - parse_picture_code(s, parse_code); - if (parse_frame(s) < 0) + if (alloc_frame(avctx, parse_code) < 0) return -1; - if (s->picture.data[0] != NULL) - avctx->release_buffer(avctx, &s->picture); - - if (avctx->get_buffer(avctx, &s->picture) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if (parse_frame(s) < 0) return -1; - } if (dirac_decode_frame_internal(s)) return -1; - if (s->picture.reference - || s->picture.display_picture_number != avctx->frame_number) { - if (s->refcnt + 1 == REFFRAME_CNT) { - av_log(avctx, AV_LOG_ERROR, "reference picture buffer overrun\n"); - return -1; - } - - s->refframes[s->refcnt].halfpel[0] = 0; - s->refframes[s->refcnt].halfpel[1] = 0; - s->refframes[s->refcnt].halfpel[2] = 0; - s->refframes[s->refcnt++].frame = s->picture; - } - - /* Retire frames that were reordered and displayed if they are no - reference frames either. */ - for (i = 0; i < s->refcnt; i++) { - AVFrame *f = &s->refframes[i].frame; - - if (f->reference == 0 - && f->display_picture_number < avctx->frame_number) { - s->retireframe[s->retirecnt++] = f->display_picture_number; - } - } - - for (i = 0; i < s->retirecnt; i++) { - AVFrame *f; - int idx, j; - - idx = dirac_reference_frame_idx(s, s->retireframe[i]); - if (idx == -1) { - av_log(avctx, AV_LOG_WARNING, "frame to retire #%d not found\n", - s->retireframe[i]); - continue; - } - - f = &s->refframes[idx].frame; - /* Do not retire frames that were not displayed yet. */ - if (f->display_picture_number >= avctx->frame_number) { - f->reference = 0; - continue; - } - - if (f->data[0] != NULL) - avctx->release_buffer(avctx, f); - - av_free(s->refframes[idx].halfpel[0]); - av_free(s->refframes[idx].halfpel[1]); - av_free(s->refframes[idx].halfpel[2]); - - s->refcnt--; - - for (j = idx; j < idx + s->refcnt; j++) { - s->refframes[j] = s->refframes[j + 1]; - } - } - - if (s->picture.display_picture_number > avctx->frame_number) { - int idx; - - if (!s->picture.reference) { - /* This picture needs to be shown at a later time. */ + if (s->current_picture->display_picture_number > avctx->frame_number) { + AVFrame *delayed_frame = remove_frame(&s->delay_frames, avctx->frame_number); - s->refframes[s->refcnt].halfpel[0] = 0; - s->refframes[s->refcnt].halfpel[1] = 0; - s->refframes[s->refcnt].halfpel[2] = 0; - s->refframes[s->refcnt++].frame = s->picture; - } + s->current_picture->reference |= DELAYED_PIC_REF; + if (add_frame(&s->delay_frames, MAX_DELAYED_FRAMES, s->current_picture)) + av_log(avctx, AV_LOG_ERROR, "Delay frame overflow\n"); - idx = dirac_reference_frame_idx(s, avctx->frame_number); - if (idx == -1) { - /* The frame is not yet decoded. */ - *data_size = 0; - } else { + if (delayed_frame) { + delayed_frame->reference ^= DELAYED_PIC_REF; *data_size = sizeof(AVFrame); - *picture = s->refframes[idx].frame; + *picture = *delayed_frame; } } else { /* The right frame at the right time :-) */ *data_size = sizeof(AVFrame); - *picture = s->picture; + *picture = *s->current_picture; } return buf_read + data_unit_size;

1 0

[soc]: r3875 - in dirac/libavcodec: dirac.h diracdec.c
by conrad 06 Dec '08

06 Dec '08

Author: conrad Date: Sat Dec 6 03:01:07 2008 New Revision: 3875 Log: Remove picnum from DiracContext Modified: dirac/libavcodec/dirac.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h (original) +++ dirac/libavcodec/dirac.h Sat Dec 6 03:01:07 2008 @@ -162,7 +162,6 @@ typedef struct DiracContext { AVFrame picture; - uint32_t picnum; int refcnt; struct reference_frame refframes[REFFRAME_CNT]; /* XXX */ Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Sat Dec 6 03:01:07 2008 @@ -708,17 +708,17 @@ static int parse_frame(DiracContext *s) int i; GetBitContext *gb = &s->gb; - s->picnum = get_bits_long(gb, 32); + s->picture.display_picture_number = get_bits_long(gb, 32); for (i = 0; i < s->refs; i++) - s->ref[i] = dirac_get_se_golomb(gb) + s->picnum; + s->ref[i] = dirac_get_se_golomb(gb) + s->picture.display_picture_number; /* Retire the reference frames that are not used anymore. */ s->retirecnt = 0; if (s->picture.reference) { retire = dirac_get_se_golomb(gb); if (retire) { - s->retireframe[0] = s->picnum + retire; + s->retireframe[0] = s->picture.display_picture_number + retire; s->retirecnt = 1; } } @@ -858,8 +858,6 @@ int dirac_decode_frame(AVCodecContext *a if (dirac_decode_frame_internal(s)) return -1; - s->picture.display_picture_number = s->picnum; - if (s->picture.reference || s->picture.display_picture_number != avctx->frame_number) { if (s->refcnt + 1 == REFFRAME_CNT) {

1 0

[soc]: r3874 - dirac/libavcodec/diracdec.c
by conrad 06 Dec '08

06 Dec '08

Author: conrad Date: Sat Dec 6 03:01:05 2008 New Revision: 3874 Log: Move parsing the picture code to its own function Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c (original) +++ dirac/libavcodec/diracdec.c Sat Dec 6 03:01:05 2008 @@ -708,9 +708,6 @@ static int parse_frame(DiracContext *s) int i; GetBitContext *gb = &s->gb; - s->picture.pict_type = FF_I_TYPE; - s->picture.key_frame = 1; - s->picnum = get_bits_long(gb, 32); for (i = 0; i < s->refs; i++) @@ -780,6 +777,16 @@ static int parse_frame(DiracContext *s) return 0; } +static void parse_picture_code(DiracContext *s, int parse_code) +{ + static const uint8_t pict_type[3] = { FF_I_TYPE, FF_P_TYPE, FF_B_TYPE }; + avcodec_get_frame_defaults(&s->picture); + + s->refs = parse_code & 0x03; + s->picture.reference = (parse_code & 0x0C) == 0x0C; + s->picture.key_frame = s->refs == 0; + s->picture.pict_type = pict_type[s->refs]; +} int dirac_decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) @@ -836,9 +843,7 @@ int dirac_decode_frame(AVCodecContext *a if ((parse_code & 0x08) != 0x08) return 0; - s->refs = parse_code & 0x03; - s->picture.reference = (parse_code & 0x0C) == 0x0C; - + parse_picture_code(s, parse_code); if (parse_frame(s) < 0) return -1; @@ -937,10 +942,6 @@ int dirac_decode_frame(AVCodecContext *a *picture = s->picture; } - if (s->picture.reference - || s->picture.display_picture_number < avctx->frame_number) - avcodec_get_frame_defaults(&s->picture); - return buf_read + data_unit_size; }

1 0

[soc]: r3873 - dirac/libavcodec/dirac.c
by conrad 06 Dec '08

06 Dec '08

Author: conrad Date: Sat Dec 6 03:01:03 2008 New Revision: 3873 Log: Cosmetics Modified: dirac/libavcodec/dirac.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Sat Dec 6 03:01:03 2008 @@ -273,18 +273,17 @@ int ff_dirac_parse_sequence_header(GetBi unsigned int picture_coding_mode; /* parse parameters */ - version_major = svq3_get_ue_golomb(gb); - version_minor = svq3_get_ue_golomb(gb); + version_major = svq3_get_ue_golomb(gb); + version_minor = svq3_get_ue_golomb(gb); + avctx->profile = svq3_get_ue_golomb(gb); + avctx->level = svq3_get_ue_golomb(gb); + video_format = svq3_get_ue_golomb(gb); + if (version_major < 2) av_log(avctx, AV_LOG_WARNING, "Stream is old and may not work\n"); else if (version_major > 2) av_log(avctx, AV_LOG_WARNING, "Stream may have unhandled features\n"); - avctx->profile = svq3_get_ue_golomb(gb); - avctx->level = svq3_get_ue_golomb(gb); - - video_format = svq3_get_ue_golomb(gb); - if (video_format > 20) return -1;

1 0