September 2007 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r1283 - dirac/TODO
by marco 02 Sep '07

02 Sep '07

Author: marco Date: Sun Sep 2 16:31:12 2007 New Revision: 1283 Log: Update TODO Modified: dirac/TODO Modified: dirac/TODO ============================================================================== --- dirac/TODO (original) +++ dirac/TODO Sun Sep 2 16:31:12 2007 @@ -14,11 +14,6 @@ chroma_ prefixes - For zero_neighbourhood, check if border checks can be avoided -Bugs: - -- For some reason the reference implementation can't deal with the - output of my DWT, my decoder can - Optimizations: - Determine what's more efficient: memset all coefficients to 0, or @@ -27,14 +22,11 @@ Optimizations: - Write IDWT in assembler - Perhaps write arithmetic decoding in assembler - Perhaps think about multithreading? -- Merge the loops for halfpel interpolation (border case checks are - not required anymore) - Use multiples of 16 pixels for width of refframes - Do not use GetBitContext/PutBitContext for aritmetic (de)coding - Instead of using `struct dirac_blockmotion', it might be faster to save the values separately. - Avoid coeff_posx/posy whenever possible -- Avoid malloc during the IDWT/DWT - Interleave IDWT/DWT stages - Pre-calculate the spation weighting matrices for non-common cases - Perhaps merge some multiplications (like frame weight) with the

1 0

[soc] [propchange]: r1282 - svn:log
by marco 02 Sep '07

02 Sep '07

Author: marco Revision: 1282 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -svn://marco@svn.mplayerhq.hu/soc/dirac/libavcodec/dirac.c \ No newline at end of file +Use the LeGall DWT by default for now \ No newline at end of file

1 0

[soc] [propchange]: r1282 - svn:log
by marco 02 Sep '07

02 Sep '07

Author: marco Revision: 1282 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Update TODO \ No newline at end of file +svn://marco@svn.mplayerhq.hu/soc/dirac/libavcodec/dirac.c \ No newline at end of file

1 0

[soc]: r1282 - dirac/libavcodec/dirac.c
by marco 02 Sep '07

02 Sep '07

Author: marco Date: Sun Sep 2 16:27:13 2007 New Revision: 1282 Log: Update TODO Modified: dirac/libavcodec/dirac.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Sun Sep 2 16:27:13 2007 @@ -1694,7 +1694,7 @@ int dirac_dwt(DiracContext *s, int16_t * for (level = s->frame_decoding.wavelet_depth; level >= 1; level--) { width = subband_width(s, level); height = subband_height(s, level); - dirac_subband_dwt_95(s->avctx, width, height, s->padded_width, coeffs, level); + dirac_subband_dwt_53(s->avctx, width, height, s->padded_width, coeffs, level); } return 0; @@ -3336,7 +3336,7 @@ static int dirac_encode_frame(DiracConte put_bits(pb, 1, 1); /* Set the default filter to Deslauriers-Debuc. */ - dirac_set_ue_golomb(pb, 0); + dirac_set_ue_golomb(pb, 1); /* Do not override the default depth. */ put_bits(pb, 1, 0);

1 0

[soc]: r1281 - dirac/libavcodec/dirac.c
by marco 02 Sep '07

02 Sep '07

Author: marco Date: Sun Sep 2 16:21:29 2007 New Revision: 1281 Log: never disable the IDWT Modified: dirac/libavcodec/dirac.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Sun Sep 2 16:21:29 2007 @@ -2560,10 +2560,7 @@ START_TIMER if (!s->zero_res) decode_component(s, coeffs); - /* Disable to test the current state of the encoder. */ -#if 1 dirac_idwt(s, coeffs, synth); -#endif if (s->refs) { if (dirac_motion_compensation(s, coeffs, comp)) {

1 0

[soc]: r1280 - dirac/libavcodec/dirac.c
by marco 02 Sep '07

02 Sep '07

Author: marco Date: Sun Sep 2 16:21:01 2007 New Revision: 1280 Log: fix datatypes Modified: dirac/libavcodec/dirac.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Sun Sep 2 16:21:01 2007 @@ -25,7 +25,7 @@ * @author Marco Gerards <marco(a)gnu.org> */ -#define DEBUG 1 +//#define DEBUG 1 #include "avcodec.h" #include "dsputil.h" @@ -956,7 +956,7 @@ static void coeff_unpack(DiracContext *s int coeff; int read_sign; struct dirac_arith_context_set *context; - uint16_t *coeffp; + int16_t *coeffp; int vdata, hdata; vdata = coeff_posy(s, level, orientation, v); @@ -3100,7 +3100,7 @@ static void dirac_encode_access_unit_hea -static void encode_coeff(DiracContext *s, uint16_t *coeffs, int level, +static void encode_coeff(DiracContext *s, int16_t *coeffs, int level, int orientation, int x, int y) { int parent = 0; int nhood; @@ -3108,7 +3108,7 @@ static void encode_coeff(DiracContext *s int coeff; int xpos, ypos; struct dirac_arith_context_set *context; - uint16_t *coeffp; + int16_t *coeffp; xpos = coeff_posx(s, level, orientation, x); ypos = coeff_posy(s, level, orientation, y); @@ -3138,7 +3138,7 @@ static void encode_coeff(DiracContext *s dirac_arith_write_int(&s->arith, context, coeff); } -static void encode_codeblock(DiracContext *s, uint16_t *coeffs, int level, +static void encode_codeblock(DiracContext *s, int16_t *coeffs, int level, int orientation, int xpos, int ypos) { int blockcnt_one = (s->codeblocksh[level] + s->codeblocksv[level]) == 2; int left, right, top, bottom; @@ -3190,7 +3190,7 @@ static void intra_dc_coding(DiracContext } static int encode_subband(DiracContext *s, int level, - int orientation, uint16_t *coeffs) { + int orientation, int16_t *coeffs) { int xpos, ypos; int length; char *buf;

1 0

[soc]: r1279 - dirac/libavcodec/dirac_wavelet.c
by marco 01 Sep '07

01 Sep '07

Author: marco Date: Sat Sep 1 11:30:53 2007 New Revision: 1279 Log: merge the loop for horizontal synthesis with the loop to copy out the data Modified: dirac/libavcodec/dirac_wavelet.c Modified: dirac/libavcodec/dirac_wavelet.c ============================================================================== --- dirac/libavcodec/dirac_wavelet.c (original) +++ dirac/libavcodec/dirac_wavelet.c Sat Sep 1 11:30:53 2007 @@ -164,33 +164,29 @@ START_TIMER synthline[0] -= (synthline[1] + synthline[1] + 2) >> 2; + data[0] = (synthline[0] + 1) >> 1; for (x = 1; x < width - 1; x++) { synthline[2*x] -= (synthline[2*x - 1] + synthline[2*x + 1] + 2) >> 2; + data[2*x] = (synthline[2*x] + 1) >> 1; } synthline[synth_width - 2] -= (synthline[synth_width - 3] + synthline[synth_width - 1] + 2) >> 2; + data[synth_width - 2] = (synthline[synth_width - 2] + 1) >> 1; /* Lifting stage 2. */ for (x = 0; x < width - 1; x++) { synthline[2*x + 1] += (synthline[2*x] + synthline[2*x + 2] + 1) >> 1; + data[2*x + 1] = (synthline[2*x + 1] + 1) >> 1; } synthline[synth_width - 1] += (synthline[synth_width - 2] + synthline[synth_width - 2] + 1) >> 1; - synthline += synth_width; - } - - /* Shift away one bit that was use for additional precision and - copy back to the coefficients buffer. */ - synthline = synth; - for (y = 0; y < synth_height; y++) { - for (x = 0; x < synth_width; x++) - data[x] = (synthline[x] + 1) >> 1; + data[synth_width - 1] = (synthline[synth_width - 1] + 1) >> 1; synthline += synth_width; data += padded_width; } @@ -403,14 +399,18 @@ START_TIMER synthline[0] -= (synthline[1] + synthline[1] + 2) >> 2; + data[0] = (synthline[0] + 1) >> 1; + for (x = 1; x < width - 1; x++) { synthline[2 * x] -= (synthline[2 * x - 1] + synthline[2 * x + 1] + 2) >> 2; + data[2 * x] = (synthline[2 * x] + 1) >> 1; } synthline[synth_width - 2] -= ( synthline[synth_width - 3] + synthline[synth_width - 1] + 2) >> 2; + data[synth_width - 2] = (synthline[synth_width - 2] + 1) >> 1; /* Lifting stage 2. */ synthline[1] += (- synthline[0] @@ -418,32 +418,27 @@ START_TIMER + 9 * synthline[2] - synthline[4] + 8) >> 4; + data[1] = (synthline[1] + 1) >> 1; for (x = 1; x < width - 2; x++) { synthline[2*x + 1] += (- synthline[2 * x - 2] + 9 * synthline[2 * x ] + 9 * synthline[2 * x + 2] - synthline[2 * x + 4] + 8) >> 4; + data[2 * x + 1] = (synthline[2 * x + 1] + 1) >> 1; } synthline[synth_width - 1] += (- synthline[synth_width - 4] + 9 * synthline[synth_width - 2] + 9 * synthline[synth_width - 2] - synthline[synth_width - 2] + 8) >> 4; + data[synth_width - 1] = (synthline[synth_width - 1] + 1) >> 1; synthline[synth_width - 3] += (- synthline[synth_width - 6] + 9 * synthline[synth_width - 4] + 9 * synthline[synth_width - 2] - synthline[synth_width - 2] + 8) >> 4; - synthline += synth_width; - } - - /* Shift away one bit that was use for additional precision and - copy back to the coefficients buffer. */ - synthline = synth; - for (y = 0; y < synth_height; y++) { - for (x = 0; x < synth_width; x++) - data[x] = (synthline[x] + 1) >> 1; + data[synth_width - 3] = (synthline[synth_width - 3] + 1) >> 1; synthline += synth_width; data += padded_width; }

1 0

[soc]: r1278 - in dirac/libavcodec: dirac.c dirac_wavelet.c dirac_wavelet.h
by marco 01 Sep '07

01 Sep '07

Author: marco Date: Sat Sep 1 11:20:59 2007 New Revision: 1278 Log: just allocate the memory once for the IDWT Modified: dirac/libavcodec/dirac.c dirac/libavcodec/dirac_wavelet.c dirac/libavcodec/dirac_wavelet.h Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Sat Sep 1 11:20:59 2007 @@ -1654,7 +1654,7 @@ static void decode_component(DiracContex * @param coeffs coefficients to transform * @return returns 0 on succes, otherwise -1 */ -int dirac_idwt(DiracContext *s, int16_t *coeffs) { +int dirac_idwt(DiracContext *s, int16_t *coeffs, int16_t *synth) { int level; int width, height; @@ -1665,11 +1665,11 @@ int dirac_idwt(DiracContext *s, int16_t switch(s->wavelet_idx) { case 0: dprintf(s->avctx, "Deslauriers-Debuc (9,5) IDWT\n"); - dirac_subband_idwt_95(s->avctx, width, height, s->padded_width, coeffs, level); + dirac_subband_idwt_95(s->avctx, width, height, s->padded_width, coeffs, synth, level); break; case 1: dprintf(s->avctx, "LeGall (5,3) IDWT\n"); - dirac_subband_idwt_53(s->avctx, width, height, s->padded_width, coeffs, level); + dirac_subband_idwt_53(s->avctx, width, height, s->padded_width, coeffs, synth, level); break; default: av_log(s->avctx, AV_LOG_INFO, "unknown IDWT index: %d\n", @@ -2502,10 +2502,12 @@ static int dirac_motion_compensation(Dir * @return 0 when successful, otherwise -1 is returned */ static int dirac_decode_frame(DiracContext *s) { + AVCodecContext *avctx = s->avctx; int16_t *coeffs; int16_t *line; int comp; int x,y; + int16_t *synth; START_TIMER @@ -2523,6 +2525,19 @@ START_TIMER return -1; } + /* Allocate memory for the IDWT to work in. */ + if (avcodec_check_dimensions(avctx, s->padded_luma_width, + s->padded_luma_height)) { + av_log(avctx, AV_LOG_ERROR, "avcodec_check_dimensions() failed\n"); + return -1; + } + synth = av_malloc(s->padded_luma_width * s->padded_luma_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->picture.data[comp]; int width, height; @@ -2547,7 +2562,7 @@ START_TIMER /* Disable to test the current state of the encoder. */ #if 1 - dirac_idwt(s, coeffs); + dirac_idwt(s, coeffs, synth); #endif if (s->refs) { @@ -2575,6 +2590,7 @@ START_TIMER av_freep(&s->blmotion); } av_free(coeffs); + av_free(synth); STOP_TIMER("dirac_frame_decode"); Modified: dirac/libavcodec/dirac_wavelet.c ============================================================================== --- dirac/libavcodec/dirac_wavelet.c (original) +++ dirac/libavcodec/dirac_wavelet.c Sat Sep 1 11:20:59 2007 @@ -101,25 +101,14 @@ static void dirac_subband_dwt_deinterlea * @return 0 when successful, otherwise -1 is returned */ int dirac_subband_idwt_53(AVCodecContext *avctx, int width, int height, - int padded_width, int16_t *data, int level) { - int16_t *synth, *synthline; + int padded_width, int16_t *data, int16_t *synth, int level) { + int16_t *synthline; int x, y; int synth_width = width << 1; int synth_height = height << 1; START_TIMER - if (avcodec_check_dimensions(avctx, synth_width, synth_height)) { - av_log(avctx, AV_LOG_ERROR, "avcodec_check_dimensions() failed\n"); - return -1; - } - - synth = av_malloc(synth_width * synth_height * sizeof(int16_t)); - if (!synth) { - av_log(avctx, AV_LOG_ERROR, "av_malloc() failed\n"); - return -1; - } - dirac_subband_idwt_interleave(data, width, height, padded_width, synth, level); @@ -208,8 +197,6 @@ START_TIMER STOP_TIMER("idwt53") - av_free(synth); - return 0; } @@ -345,25 +332,14 @@ STOP_TIMER("dwt53") * @return 0 when successful, otherwise -1 is returned */ int dirac_subband_idwt_95(AVCodecContext *avctx, int width, int height, - int padded_width, int16_t *data, int level) { - int16_t *synth, *synthline; + int padded_width, int16_t *data, int16_t *synth, int level) { + int16_t *synthline; int x, y; int synth_width = width << 1; int synth_height = height << 1; START_TIMER - if (avcodec_check_dimensions(avctx, synth_width, synth_height)) { - av_log(avctx, AV_LOG_ERROR, "avcodec_check_dimensions() failed\n"); - return -1; - } - - synth = av_malloc(synth_width * synth_height * sizeof(int16_t)); - if (!synth) { - av_log(avctx, AV_LOG_ERROR, "av_malloc() failed\n"); - return -1; - } - dirac_subband_idwt_interleave(data, width, height, padded_width, synth, level); /* Vertical synthesis: Lifting stage 1. */ @@ -474,8 +450,6 @@ START_TIMER STOP_TIMER("idwt95") - av_free(synth); - return 0; } Modified: dirac/libavcodec/dirac_wavelet.h ============================================================================== --- dirac/libavcodec/dirac_wavelet.h (original) +++ dirac/libavcodec/dirac_wavelet.h Sat Sep 1 11:20:59 2007 @@ -31,10 +31,10 @@ #include "avcodec.h" int dirac_subband_idwt_53(AVCodecContext *avctx, int width, int height, - int padded_width, int16_t *data, int level); + int padded_width, int16_t *data, int16_t *synth, int level); int dirac_subband_idwt_95(AVCodecContext *avctx, int width, int height, - int padded_width, int16_t *data, int level); + int padded_width, int16_t *data, int16_t *synth, int level); int dirac_subband_dwt_53(AVCodecContext *avctx, int width, int height, int padded_width, int16_t *data, int level);

1 0

[soc]: r1277 - dirac/libavcodec/dirac.c
by marco 01 Sep '07

01 Sep '07

Author: marco Date: Sat Sep 1 10:50:46 2007 New Revision: 1277 Log: simplify halfpel interpolation code by removing special cases for the borders of the frame Modified: dirac/libavcodec/dirac.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c (original) +++ dirac/libavcodec/dirac.c Sat Sep 1 10:50:46 2007 @@ -1733,193 +1733,97 @@ static inline void interpolate_frame_hal uint8_t *pixels, int comp, int xpad, int ypad) { uint8_t *lineout; - uint8_t *lineoutodd; uint8_t *refdata; uint8_t *linein; int outwidth = width * 2 + xpad * 4; + int doutwidth = 2 * outwidth; int x, y; const int t[5] = { 167, -56, 25, -11, 3 }; + uint8_t *pixelsdata = pixels + ypad * doutwidth + 2 * xpad; START_TIMER refdata = refframe->data[comp]; - lineout = pixels + 2 * ypad * outwidth + 2 * xpad; - lineoutodd = lineout + outwidth; - linein = refdata; - /* Top 4 lines. */ - for (y = 0; y < 5; y++) { + linein = refdata; + lineout = pixelsdata; + for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - int val = 128; - uint8_t *li1 = linein; - uint8_t *li2 = linein + refframe->linesize[comp]; - - val += t[0] * (li1[x] + li2[x]); - if (y > 0) - li1 -= refframe->linesize[comp]; - li2 += refframe->linesize[comp]; - - val += t[1] * (li1[x] + li2[x]); - if (y > 1) - li1 -= refframe->linesize[comp]; - li2 += refframe->linesize[comp]; - - val += t[2] * (li1[x] + li2[x]); - if (y > 2) - li1 -= refframe->linesize[comp]; - li2 += refframe->linesize[comp]; - - val += t[3] * (li1[x] + li2[x]); - if (y > 3) - li1 -= refframe->linesize[comp]; - li2 += refframe->linesize[comp]; - - val += t[4] * (li1[x] + li2[x]); - - val >>= 8; - lineout[x * 2] = linein[x]; - lineoutodd[x * 2] = av_clip_uint8(val); } - linein += refframe->linesize[comp]; - - /* Skip one line, we are interpolating to odd lines. */ - lineout += outwidth * 2; - lineoutodd += outwidth * 2; + linein += refframe->linesize[comp]; + lineout += doutwidth; } - /* Middle part. */ - linein = refdata + refframe->linesize[comp] * 5; - for (y = 5; y < height - 5; y++) { - for (x = 0; x < width; x++) { - int val = 128; - uint8_t *li1 = linein; - uint8_t *li2 = linein + refframe->linesize[comp]; - - val += t[0] * (li1[x] + li2[x]); - li1 -= refframe->linesize[comp]; - li2 += refframe->linesize[comp]; - - val += t[1] * (li1[x] + li2[x]); - li1 -= refframe->linesize[comp]; - li2 += refframe->linesize[comp]; - - val += t[2] * (li1[x] + li2[x]); - li1 -= refframe->linesize[comp]; - li2 += refframe->linesize[comp]; - - val += t[3] * (li1[x] + li2[x]); - li1 -= refframe->linesize[comp]; - li2 += refframe->linesize[comp]; - - val += t[4] * (li1[x] + li2[x]); - - val >>= 8; - - lineout[x * 2] = linein[x]; - lineoutodd[x * 2] = av_clip_uint8(val); - } - - linein += refframe->linesize[comp]; + /* Copy top even lines. */ + linein = pixels + ypad * doutwidth; + lineout = pixels; + for (y = 0; y < ypad * 2; y += 2) { + memcpy(lineout, linein, outwidth); + lineout += doutwidth; + } - /* Skip one line, we are interpolating to odd lines. */ - lineout += outwidth * 2; - lineoutodd += outwidth * 2; + /* Copy bottom even lines. */ + linein = pixels + (ypad + height - 1) * doutwidth; + lineout = linein + outwidth; + for (y = 0; y < ypad * 2; y += 2) { + memcpy(lineout, linein, outwidth); + lineout += doutwidth; } - /* Bottom. */ - linein = refdata + refframe->linesize[comp] * (height - 5); - for (y = height - 5; y < height; y++) { - for (x = 0; x < width; x++) { + /* Interpolation (vectically). */ + linein = pixelsdata; + lineout = pixelsdata + outwidth; + for (y = 0; y < height; y++) { + for (x = 0; x < width * 2; x += 2) { int val = 128; uint8_t *li1 = linein; - uint8_t *li2 = linein; - - if (y < height - 1) - li2 += refframe->linesize[comp]; + uint8_t *li2 = linein + doutwidth; val += t[0] * (li1[x] + li2[x]); - li1 -= refframe->linesize[comp]; - if (y < height - 2) - li2 += refframe->linesize[comp]; + li1 -= doutwidth; + li2 += doutwidth; val += t[1] * (li1[x] + li2[x]); - li1 -= refframe->linesize[comp]; - if (y < height - 3) - li2 += refframe->linesize[comp]; + li1 -= doutwidth; + li2 += doutwidth; val += t[2] * (li1[x] + li2[x]); - li1 -= refframe->linesize[comp]; - if (y < height - 4) - li2 += refframe->linesize[comp]; + li1 -= doutwidth; + li2 += doutwidth; val += t[3] * (li1[x] + li2[x]); - li1 -= refframe->linesize[comp]; - if (y < height - 5) - li2 += refframe->linesize[comp]; + li1 -= doutwidth; + li2 += doutwidth; val += t[4] * (li1[x] + li2[x]); val >>= 8; - lineout[x * 2] = linein[x]; - lineoutodd[x * 2] = av_clip_uint8(val); + lineout[x] = av_clip_uint8(val); } - linein += refframe->linesize[comp]; + linein += outwidth * 2; /* Skip one line, we are interpolating to odd lines. */ lineout += outwidth * 2; - lineoutodd += outwidth * 2; } - /* At this place the even rows of pixels are in place, no copying - is required.. */ - - /* Interpolate the odd rows of pixels: Left. */ - lineout = pixels + 2 * ypad * outwidth + 2 * xpad + 1; - linein = pixels + 2 * ypad * outwidth + 2 * xpad; + /* Add padding on the left and right sides of the frame. */ + lineout = pixels + 2 * ypad * outwidth; for (y = 0; y < height * 2; y++) { - for (x = 0; x < 10; x += 2) { - uint8_t *li1 = &linein[x]; - uint8_t *li2 = &linein[x + 2]; - int val = 128; - - val += t[0] * (*li1 + *li2); - - if (x > 1) - li1 -= 2; - li2 += 2; - val += t[1] * (*li1 + *li2); - - if (x > 2) - li1 -= 2; - li2 += 2; - val += t[2] * (*li1 + *li2); - - if (x > 4) - li1 -= 2; - li2 += 2; - val += t[3] * (*li1 + *li2); - - if (x > 6) - li1 -= 2; - li2 += 2; - val += t[4] * (*li1 + *li2); - - val >>= 8; - lineout[x] = av_clip_uint8(val); - } + memset(lineout, lineout[2 * xpad], 2 * xpad); + memset(&lineout[2 * width + xpad * 2], + lineout[2 * width + xpad * 2 - 2], 2 * xpad); lineout += outwidth; - linein += outwidth; } - /* Middle. */ - lineout = pixels + 2 * ypad * outwidth + 2 * xpad + 1; - linein = pixels + 2 * ypad * outwidth + 2 * xpad; + /* Interpolation (horizontally). */ + lineout = pixelsdata + 1; + linein = pixelsdata; for (y = 0; y < height * 2; y++) { - for (x = 10; x < width * 2 - 12; x += 2) { + for (x = 0; x < width * 2; x += 2) { uint8_t *li1 = &linein[x]; uint8_t *li2 = &linein[x + 2]; int val = 128; @@ -1945,57 +1849,16 @@ START_TIMER linein += outwidth; } - /* Right. */ - lineout = pixels + 2 * ypad * outwidth + 2 * xpad + 1; - linein = pixels + 2 * ypad * outwidth + 2 * xpad; - for (y = 0; y < height * 2; y++) { - for (x = width * 2 - 12; x < width * 2; x += 2) { - uint8_t *li1 = &linein[x]; - uint8_t *li2 = &linein[x]; - int val = 128; - - if (x < 2 * width - 2) - li2 += 2; - val += t[0] * (*li1 + *li2); - - li1 -= 2; - if (x < 2 * width - 4) - li2 += 2; - val += t[1] * (*li1 + *li2); - - li1 -= 2; - if (x < 2 * width - 6) - li2 += 2; - val += t[2] * (*li1 + *li2); - - li1 -= 2; - if (x < 2 * width - 8) - li2 += 2; - val += t[3] * (*li1 + *li2); - - li1 -= 2; - if (x < 2 * width - 10) - li2 += 2; - val += t[4] * (*li1 + *li2); - - val >>= 8; - lineout[x] = av_clip_uint8(val); - } - lineout += outwidth; - linein += outwidth; - } - - /* Add padding on the left and right sides of the frame. */ + /* Add padding to right side of the frame. */ lineout = pixels + 2 * ypad * outwidth; for (y = 0; y < height * 2; y++) { - memset(lineout, lineout[2 * xpad], 2 * xpad); memset(&lineout[2 * width + xpad * 2], lineout[2 * width + xpad * 2 - 1], 2 * xpad); lineout += outwidth; } /* Copy top lines. */ - linein = pixels + 2 * ypad * outwidth; + linein = pixels + ypad * doutwidth; lineout = pixels; for (y = 0; y < ypad * 2; y++) { memcpy(lineout, linein, outwidth); @@ -2003,7 +1866,7 @@ START_TIMER } /* Copy bottom lines. */ - linein = pixels + 2 * (ypad + height - 1) * outwidth; + linein = pixels + (ypad + height - 1) * doutwidth; lineout = linein + outwidth; for (y = 0; y < ypad * 2; y++) { memcpy(lineout, linein, outwidth);

1 0

[soc]: r1276 - qcelp/qcelpdec.c
by reynaldo 01 Sep '07

01 Sep '07

Author: reynaldo Date: Sat Sep 1 06:05:44 2007 New Revision: 1276 Log: Gets rid of an useless tmp array and adds a missing const qualifier -- Another from Michael's review Modified: qcelp/qcelpdec.c Modified: qcelp/qcelpdec.c ============================================================================== --- qcelp/qcelpdec.c (original) +++ qcelp/qcelpdec.c Sat Sep 1 06:05:44 2007 @@ -54,13 +54,10 @@ typedef struct int frame_num; } QCELPContext; -static void qcelp_update_pitchf_mem(float *pitchf_mem, float *last) +static void qcelp_update_pitchf_mem(float *pitchf_mem, const float *last) { - float tmp[150]; - - memcpy(tmp, pitchf_mem+40, 110*sizeof(float)); - memcpy(tmp+110, last, 40*sizeof(float)); - memcpy(pitchf_mem, tmp, 150*sizeof(float)); + memmove(pitchf_mem, pitchf_mem+40, 110*sizeof(float)); + memmove(pitchf_mem+110, last, 40*sizeof(float)); } static int qcelp_decode_init(AVCodecContext *avctx)

1 0