August 2009 - ffmpeg-cvslog - lists.ffmpeg.org

r19746 - trunk/libavcodec/rv34.c
by subversion＠mplayerhq.hu 30 Aug '09

30 Aug '09

Author: kostya Date: Sun Aug 30 12:54:16 2009 New Revision: 19746 Log: Convert ZERO8x2 macro into inline function Modified: trunk/libavcodec/rv34.c Modified: trunk/libavcodec/rv34.c ============================================================================== --- trunk/libavcodec/rv34.c Sun Aug 30 10:29:11 2009 (r19745) +++ trunk/libavcodec/rv34.c Sun Aug 30 12:54:16 2009 (r19746) @@ -37,9 +37,11 @@ //#define DEBUG -#define ZERO8x2(dst, stride) \ - fill_rectangle(dst, 1, 2, stride, 0, 4); \ - fill_rectangle(((uint8_t*)(dst))+4, 1, 2, stride, 0, 4); \ +static inline void ZERO8x2(void* dst, int stride) +{ + fill_rectangle(dst, 1, 2, stride, 0, 4); + fill_rectangle(((uint8_t*)(dst))+4, 1, 2, stride, 0, 4); +} /** translation of RV30/40 macroblock types to lavc ones */ static const int rv34_mb_type_to_lavc[12] = {

1 0

r19745 - trunk/libavcodec/vorbis.c
by subversion＠mplayerhq.hu 30 Aug '09

30 Aug '09

Author: reimar Date: Sun Aug 30 10:29:11 2009 New Revision: 19745 Log: Remove unused variable. Modified: trunk/libavcodec/vorbis.c Modified: trunk/libavcodec/vorbis.c ============================================================================== --- trunk/libavcodec/vorbis.c Sun Aug 30 08:30:53 2009 (r19744) +++ trunk/libavcodec/vorbis.c Sun Aug 30 10:29:11 2009 (r19745) @@ -148,7 +148,6 @@ void ff_vorbis_ready_floor1_list(vorbis_ static inline void render_line_unrolled(intptr_t x, intptr_t y, int x1, intptr_t sy, int ady, int adx, float * buf) { int err = -adx; - int tmp; x -= x1-1; buf += x1-1; while (++x < 0) {

1 0

r19743 - in trunk/libavcodec: rv34.c rv40.c
by subversion＠mplayerhq.hu 30 Aug '09

30 Aug '09

Author: kostya Date: Sun Aug 30 08:16:33 2009 New Revision: 19743 Log: Adjust r->avail_cache[] indexes to avoid alignment issues when zeroing block inside it. Modified: trunk/libavcodec/rv34.c trunk/libavcodec/rv40.c Modified: trunk/libavcodec/rv34.c ============================================================================== --- trunk/libavcodec/rv34.c Sun Aug 30 00:38:48 2009 (r19742) +++ trunk/libavcodec/rv34.c Sun Aug 30 08:16:33 2009 (r19743) @@ -440,7 +440,7 @@ static const uint8_t part_sizes_w[RV34_M static const uint8_t part_sizes_h[RV34_MB_TYPES] = { 2, 2, 2, 1, 2, 2, 2, 2, 1, 2, 2, 2 }; /** availability index for subblocks */ -static const uint8_t avail_indexes[4] = { 5, 6, 9, 10 }; +static const uint8_t avail_indexes[4] = { 6, 7, 10, 11 }; /** * motion vector prediction @@ -553,21 +553,21 @@ static void rv34_pred_mv_b(RV34DecContex memset(A, 0, sizeof(A)); memset(B, 0, sizeof(B)); memset(C, 0, sizeof(C)); - if((r->avail_cache[5-1] & type) & mask){ + if((r->avail_cache[6-1] & type) & mask){ A[0] = cur_pic->motion_val[dir][mv_pos - 1][0]; A[1] = cur_pic->motion_val[dir][mv_pos - 1][1]; has_A = 1; } - if((r->avail_cache[5-4] & type) & mask){ + if((r->avail_cache[6-4] & type) & mask){ B[0] = cur_pic->motion_val[dir][mv_pos - s->b8_stride][0]; B[1] = cur_pic->motion_val[dir][mv_pos - s->b8_stride][1]; has_B = 1; } - if(r->avail_cache[5-4] && (r->avail_cache[5-2] & type) & mask){ + if(r->avail_cache[6-4] && (r->avail_cache[6-2] & type) & mask){ C[0] = cur_pic->motion_val[dir][mv_pos - s->b8_stride + 2][0]; C[1] = cur_pic->motion_val[dir][mv_pos - s->b8_stride + 2][1]; has_C = 1; - }else if((s->mb_x+1) == s->mb_width && (r->avail_cache[5-5] & type) & mask){ + }else if((s->mb_x+1) == s->mb_width && (r->avail_cache[6-5] & type) & mask){ C[0] = cur_pic->motion_val[dir][mv_pos - s->b8_stride - 1][0]; C[1] = cur_pic->motion_val[dir][mv_pos - s->b8_stride - 1][1]; has_C = 1; @@ -958,17 +958,17 @@ static void rv34_output_macroblock(RV34D int idx; // Set neighbour information. - if(r->avail_cache[0]) - avail[0] = 1; if(r->avail_cache[1]) - avail[1] = avail[2] = 1; + avail[0] = 1; if(r->avail_cache[2]) - avail[3] = avail[4] = 1; + avail[1] = avail[2] = 1; if(r->avail_cache[3]) - avail[5] = 1; + avail[3] = avail[4] = 1; if(r->avail_cache[4]) + avail[5] = 1; + if(r->avail_cache[5]) avail[8] = avail[16] = 1; - if(r->avail_cache[8]) + if(r->avail_cache[9]) avail[24] = avail[32] = 1; Y = s->dest[0]; @@ -987,9 +987,9 @@ static void rv34_output_macroblock(RV34D intra_types += r->intra_types_stride; } intra_types -= r->intra_types_stride * 4; - fill_rectangle(r->avail_cache + 5, 2, 2, 4, 0, 4); + fill_rectangle(r->avail_cache + 6, 2, 2, 4, 0, 4); for(j = 0; j < 2; j++){ - idx = 5 + j*4; + idx = 6 + j*4; for(i = 0; i < 2; i++, cbp >>= 1, idx++){ rv34_pred_4x4_block(r, U + i*4 + j*4*s->uvlinesize, s->uvlinesize, ittrans[intra_types[i*2+j*2*r->intra_types_stride]], r->avail_cache[idx-4], r->avail_cache[idx-1], !i && !j, r->avail_cache[idx-3]); rv34_pred_4x4_block(r, V + i*4 + j*4*s->uvlinesize, s->uvlinesize, ittrans[intra_types[i*2+j*2*r->intra_types_stride]], r->avail_cache[idx-4], r->avail_cache[idx-1], !i && !j, r->avail_cache[idx-3]); @@ -1002,7 +1002,7 @@ static void rv34_output_macroblock(RV34D } }else{ itype = ittrans16[intra_types[0]]; - itype = adjust_pred16(itype, r->avail_cache[5-4], r->avail_cache[5-1]); + itype = adjust_pred16(itype, r->avail_cache[6-4], r->avail_cache[6-1]); r->h.pred16x16[itype](Y, s->linesize); dsp->add_pixels_clamped(s->block[0], Y, s->linesize); dsp->add_pixels_clamped(s->block[1], Y + 8, s->linesize); @@ -1012,7 +1012,7 @@ static void rv34_output_macroblock(RV34D itype = ittrans16[intra_types[0]]; if(itype == PLANE_PRED8x8) itype = DC_PRED8x8; - itype = adjust_pred16(itype, r->avail_cache[5-4], r->avail_cache[5-1]); + itype = adjust_pred16(itype, r->avail_cache[6-4], r->avail_cache[6-1]); r->h.pred8x8[itype](U, s->uvlinesize); dsp->add_pixels_clamped(s->block[4], U, s->uvlinesize); r->h.pred8x8[itype](V, s->uvlinesize); @@ -1173,18 +1173,18 @@ static int rv34_decode_macroblock(RV34De // Calculate which neighbours are available. Maybe it's worth optimizing too. memset(r->avail_cache, 0, sizeof(r->avail_cache)); - fill_rectangle(r->avail_cache + 5, 2, 2, 4, 1, 4); + fill_rectangle(r->avail_cache + 6, 2, 2, 4, 1, 4); dist = (s->mb_x - s->resync_mb_x) + (s->mb_y - s->resync_mb_y) * s->mb_width; if(s->mb_x && dist) - r->avail_cache[4] = - r->avail_cache[8] = s->current_picture_ptr->mb_type[mb_pos - 1]; + r->avail_cache[5] = + r->avail_cache[9] = s->current_picture_ptr->mb_type[mb_pos - 1]; if(dist >= s->mb_width) - r->avail_cache[1] = - r->avail_cache[2] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride]; + r->avail_cache[2] = + r->avail_cache[3] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride]; if(((s->mb_x+1) < s->mb_width) && dist >= s->mb_width - 1) - r->avail_cache[3] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride + 1]; + r->avail_cache[4] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride + 1]; if(s->mb_x && dist > s->mb_width) - r->avail_cache[0] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride - 1]; + r->avail_cache[1] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride - 1]; s->qscale = r->si.quant; cbp = cbp2 = rv34_decode_mb_header(r, intra_types); Modified: trunk/libavcodec/rv40.c ============================================================================== --- trunk/libavcodec/rv40.c Sun Aug 30 00:38:48 2009 (r19742) +++ trunk/libavcodec/rv40.c Sun Aug 30 08:16:33 2009 (r19743) @@ -235,13 +235,13 @@ static int rv40_decode_mb_info(RV34DecCo if(--r->s.mb_skip_run) return RV34_MB_SKIP; - if(r->avail_cache[5-1]) + if(r->avail_cache[6-1]) blocks[r->mb_type[mb_pos - 1]]++; - if(r->avail_cache[5-4]){ + if(r->avail_cache[6-4]){ blocks[r->mb_type[mb_pos - s->mb_stride]]++; - if(r->avail_cache[5-2]) + if(r->avail_cache[6-2]) blocks[r->mb_type[mb_pos - s->mb_stride + 1]]++; - if(r->avail_cache[5-5]) + if(r->avail_cache[6-5]) blocks[r->mb_type[mb_pos - s->mb_stride - 1]]++; }

1 0

r29587 - trunk/libswscale/swscale.c
by subversion＠mplayerhq.hu 29 Aug '09

29 Aug '09

Author: ramiro Date: Sun Aug 30 01:08:32 2009 New Revision: 29587 Log: Curly brackets cosmetics for previous commit. Modified: trunk/libswscale/swscale.c Modified: trunk/libswscale/swscale.c ============================================================================== --- trunk/libswscale/swscale.c Sun Aug 30 01:06:22 2009 (r29586) +++ trunk/libswscale/swscale.c Sun Aug 30 01:08:32 2009 (r29587) @@ -2920,19 +2920,16 @@ SwsContext *sws_getContext(int srcW, int CHECKED_ALLOCZ(c->alpPixBuf, c->vLumBufSize*2*sizeof(int16_t*)); //Note we need at least one pixel more at the end because of the MMX code (just in case someone wanna replace the 4000/8000) /* align at 16 bytes for AltiVec */ - for (i=0; i<c->vLumBufSize; i++) - { + for (i=0; i<c->vLumBufSize; i++) { CHECKED_ALLOCZ(c->lumPixBuf[i+c->vLumBufSize], VOF+1); c->lumPixBuf[i] = c->lumPixBuf[i+c->vLumBufSize]; } - for (i=0; i<c->vChrBufSize; i++) - { + for (i=0; i<c->vChrBufSize; i++) { CHECKED_ALLOC(c->chrPixBuf[i+c->vChrBufSize], (VOF+1)*2); c->chrPixBuf[i] = c->chrPixBuf[i+c->vChrBufSize]; } if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) - for (i=0; i<c->vLumBufSize; i++) - { + for (i=0; i<c->vLumBufSize; i++) { CHECKED_ALLOCZ(c->alpPixBuf[i+c->vLumBufSize], VOF+1); c->alpPixBuf[i] = c->alpPixBuf[i+c->vLumBufSize]; }

1 0

r29586 - trunk/libswscale/swscale.c
by subversion＠mplayerhq.hu 29 Aug '09

29 Aug '09

Author: ramiro Date: Sun Aug 30 01:06:22 2009 New Revision: 29586 Log: Check for return value of initFilter(). Modified: trunk/libswscale/swscale.c Modified: trunk/libswscale/swscale.c ============================================================================== --- trunk/libswscale/swscale.c Sun Aug 30 01:03:14 2009 (r29585) +++ trunk/libswscale/swscale.c Sun Aug 30 01:06:22 2009 (r29586) @@ -2812,14 +2812,16 @@ SwsContext *sws_getContext(int srcW, int (flags & SWS_CPU_CAPS_ALTIVEC) ? 8 : 1; - initFilter(&c->hLumFilter, &c->hLumFilterPos, &c->hLumFilterSize, c->lumXInc, + if (initFilter(&c->hLumFilter, &c->hLumFilterPos, &c->hLumFilterSize, c->lumXInc, srcW , dstW, filterAlign, 1<<14, (flags&SWS_BICUBLIN) ? (flags|SWS_BICUBIC) : flags, - srcFilter->lumH, dstFilter->lumH, c->param); - initFilter(&c->hChrFilter, &c->hChrFilterPos, &c->hChrFilterSize, c->chrXInc, + srcFilter->lumH, dstFilter->lumH, c->param) < 0) + goto fail; + if (initFilter(&c->hChrFilter, &c->hChrFilterPos, &c->hChrFilterSize, c->chrXInc, c->chrSrcW, c->chrDstW, filterAlign, 1<<14, (flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags, - srcFilter->chrH, dstFilter->chrH, c->param); + srcFilter->chrH, dstFilter->chrH, c->param) < 0) + goto fail; #if defined(COMPILE_MMX2) // can't downscale !!! @@ -2863,14 +2865,16 @@ SwsContext *sws_getContext(int srcW, int (flags & SWS_CPU_CAPS_ALTIVEC) ? 8 : 1; - initFilter(&c->vLumFilter, &c->vLumFilterPos, &c->vLumFilterSize, c->lumYInc, + if (initFilter(&c->vLumFilter, &c->vLumFilterPos, &c->vLumFilterSize, c->lumYInc, srcH , dstH, filterAlign, (1<<12), (flags&SWS_BICUBLIN) ? (flags|SWS_BICUBIC) : flags, - srcFilter->lumV, dstFilter->lumV, c->param); - initFilter(&c->vChrFilter, &c->vChrFilterPos, &c->vChrFilterSize, c->chrYInc, + srcFilter->lumV, dstFilter->lumV, c->param) < 0) + goto fail; + if (initFilter(&c->vChrFilter, &c->vChrFilterPos, &c->vChrFilterSize, c->chrYInc, c->chrSrcH, c->chrDstH, filterAlign, (1<<12), (flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags, - srcFilter->chrV, dstFilter->chrV, c->param); + srcFilter->chrV, dstFilter->chrV, c->param) < 0) + goto fail; #ifdef COMPILE_ALTIVEC CHECKED_ALLOC(c->vYCoeffsBank, sizeof (vector signed short)*c->vLumFilterSize*c->dstH);

1 0

r29585 - trunk/libswscale/swscale-example.c
by subversion＠mplayerhq.hu 29 Aug '09

29 Aug '09

Author: ramiro Date: Sun Aug 30 01:03:14 2009 New Revision: 29585 Log: Revert mistakenly commited hunk. Modified: trunk/libswscale/swscale-example.c Modified: trunk/libswscale/swscale-example.c ============================================================================== --- trunk/libswscale/swscale-example.c Sun Aug 30 01:02:01 2009 (r29584) +++ trunk/libswscale/swscale-example.c Sun Aug 30 01:03:14 2009 (r29585) @@ -183,9 +183,8 @@ end: static void selfTest(uint8_t *ref[4], int refStride[4], int w, int h) { const int flags[] = { SWS_FAST_BILINEAR, -// SWS_BILINEAR, SWS_BICUBIC, -// SWS_X , SWS_POINT , SWS_AREA, 0 }; - 0 }; + SWS_BILINEAR, SWS_BICUBIC, + SWS_X , SWS_POINT , SWS_AREA, 0 }; const int srcW = w; const int srcH = h; const int dstW[] = { srcW - srcW/3, srcW, srcW + srcW/3, 0 };

1 0

r29584 - in trunk/libswscale: colorspace-test.c swscale-example.c swscale.c
by subversion＠mplayerhq.hu 29 Aug '09

29 Aug '09

Author: ramiro Date: Sun Aug 30 01:02:01 2009 New Revision: 29584 Log: swscale: Check for return values of malloc. Modified: trunk/libswscale/colorspace-test.c trunk/libswscale/swscale-example.c trunk/libswscale/swscale.c Modified: trunk/libswscale/colorspace-test.c ============================================================================== --- trunk/libswscale/colorspace-test.c Sat Aug 29 05:36:09 2009 (r29583) +++ trunk/libswscale/colorspace-test.c Sun Aug 30 01:02:01 2009 (r29584) @@ -66,6 +66,9 @@ int main(int argc, char **argv) int failedNum=0; int passedNum=0; + if (!srcBuffer || !dstBuffer) + return -1; + av_log(NULL, AV_LOG_INFO, "memory corruption test ...\n"); args_parse(argc, argv); av_log(NULL, AV_LOG_INFO, "CPU capabilities forced to %x\n", cpu_caps); Modified: trunk/libswscale/swscale-example.c ============================================================================== --- trunk/libswscale/swscale-example.c Sat Aug 29 05:36:09 2009 (r29583) +++ trunk/libswscale/swscale-example.c Sun Aug 30 01:02:01 2009 (r29584) @@ -183,8 +183,9 @@ end: static void selfTest(uint8_t *ref[4], int refStride[4], int w, int h) { const int flags[] = { SWS_FAST_BILINEAR, - SWS_BILINEAR, SWS_BICUBIC, - SWS_X , SWS_POINT , SWS_AREA, 0 }; +// SWS_BILINEAR, SWS_BICUBIC, +// SWS_X , SWS_POINT , SWS_AREA, 0 }; + 0 }; const int srcW = w; const int srcH = h; const int dstW[] = { srcW - srcW/3, srcW, srcW + srcW/3, 0 }; @@ -225,6 +226,9 @@ int main(int argc, char **argv) struct SwsContext *sws; AVLFG rand; + if (!rgb_data || !data) + return -1; + sws= sws_getContext(W/12, H/12, PIX_FMT_RGB32, W, H, PIX_FMT_YUVA420P, SWS_BILINEAR, NULL, NULL, NULL); av_lfg_init(&rand, 1); Modified: trunk/libswscale/swscale.c ============================================================================== --- trunk/libswscale/swscale.c Sat Aug 29 05:36:09 2009 (r29583) +++ trunk/libswscale/swscale.c Sun Aug 30 01:02:01 2009 (r29584) @@ -76,6 +76,7 @@ untested special converters #include "rgb2rgb.h" #include "libavutil/intreadwrite.h" #include "libavutil/x86_cpu.h" +#include "libavutil/avutil.h" #include "libavutil/bswap.h" unsigned swscale_version(void) @@ -1450,12 +1451,12 @@ static inline int initFilter(int16_t **o #endif // NOTE: the +1 is for the MMX scaler which reads over the end - *filterPos = av_malloc((dstW+1)*sizeof(int16_t)); + CHECKED_ALLOC(*filterPos, (dstW+1)*sizeof(int16_t)); if (FFABS(xInc - 0x10000) <10) { // unscaled int i; filterSize= 1; - filter= av_mallocz(dstW*sizeof(*filter)*filterSize); + CHECKED_ALLOCZ(filter, dstW*sizeof(*filter)*filterSize); for (i=0; i<dstW; i++) { filter[i*filterSize]= fone; @@ -1466,7 +1467,7 @@ static inline int initFilter(int16_t **o int i; int xDstInSrc; filterSize= 1; - filter= av_malloc(dstW*sizeof(*filter)*filterSize); + CHECKED_ALLOC(filter, dstW*sizeof(*filter)*filterSize); xDstInSrc= xInc/2 - 0x8000; for (i=0; i<dstW; i++) { @@ -1480,7 +1481,7 @@ static inline int initFilter(int16_t **o int i; int xDstInSrc; filterSize= 2; - filter= av_malloc(dstW*sizeof(*filter)*filterSize); + CHECKED_ALLOC(filter, dstW*sizeof(*filter)*filterSize); xDstInSrc= xInc/2 - 0x8000; for (i=0; i<dstW; i++) { @@ -1519,7 +1520,7 @@ static inline int initFilter(int16_t **o if (filterSize > srcW-2) filterSize=srcW-2; - filter= av_malloc(dstW*sizeof(*filter)*filterSize); + CHECKED_ALLOC(filter, dstW*sizeof(*filter)*filterSize); xDstInSrc= xInc - 0x10000; for (i=0; i<dstW; i++) { @@ -1607,7 +1608,7 @@ static inline int initFilter(int16_t **o if (srcFilter) filter2Size+= srcFilter->length - 1; if (dstFilter) filter2Size+= dstFilter->length - 1; assert(filter2Size>0); - filter2= av_mallocz(filter2Size*dstW*sizeof(*filter2)); + CHECKED_ALLOCZ(filter2, filter2Size*dstW*sizeof(*filter2)); for (i=0; i<dstW; i++) { int j, k; @@ -1690,7 +1691,7 @@ static inline int initFilter(int16_t **o assert(filterSize > 0); filter= av_malloc(filterSize*dstW*sizeof(*filter)); if (filterSize >= MAX_FILTER_SIZE*16/((flags&SWS_ACCURATE_RND) ? APCK_SIZE : 16) || !filter) - goto error; + goto fail; *outFilterSize= filterSize; if (flags&SWS_PRINT_INFO) @@ -1737,7 +1738,7 @@ static inline int initFilter(int16_t **o // Note the +1 is for the MMX scaler which reads over the end /* align at 16 for AltiVec (needed by hScale_altivec_real) */ - *outFilter= av_mallocz(*outFilterSize*(dstW+1)*sizeof(int16_t)); + CHECKED_ALLOCZ(*outFilter, *outFilterSize*(dstW+1)*sizeof(int16_t)); /* normalize & store in outFilter */ for (i=0; i<dstW; i++) { @@ -1764,7 +1765,7 @@ static inline int initFilter(int16_t **o } ret=0; -error: +fail: av_free(filter); av_free(filter2); return ret; @@ -2598,7 +2599,7 @@ SwsContext *sws_getContext(int srcW, int if (!dstFilter) dstFilter= &dummyFilter; if (!srcFilter) srcFilter= &dummyFilter; - c= av_mallocz(sizeof(SwsContext)); + CHECKED_ALLOCZ(c, sizeof(SwsContext)); c->av_class = &sws_context_class; c->srcW= srcW; @@ -2837,10 +2838,10 @@ SwsContext *sws_getContext(int srcW, int c->chrMmx2FilterCode = av_malloc(c->chrMmx2FilterCodeSize); #endif - c->lumMmx2Filter = av_malloc((dstW /8+8)*sizeof(int16_t)); - c->chrMmx2Filter = av_malloc((c->chrDstW /4+8)*sizeof(int16_t)); - c->lumMmx2FilterPos= av_malloc((dstW /2/8+8)*sizeof(int32_t)); - c->chrMmx2FilterPos= av_malloc((c->chrDstW/2/4+8)*sizeof(int32_t)); + CHECKED_ALLOCZ(c->lumMmx2Filter , (dstW /8+8)*sizeof(int16_t)); + CHECKED_ALLOCZ(c->chrMmx2Filter , (c->chrDstW /4+8)*sizeof(int16_t)); + CHECKED_ALLOCZ(c->lumMmx2FilterPos, (dstW /2/8+8)*sizeof(int32_t)); + CHECKED_ALLOCZ(c->chrMmx2FilterPos, (c->chrDstW/2/4+8)*sizeof(int32_t)); initMMX2HScaler( dstW, c->lumXInc, c->lumMmx2FilterCode, c->lumMmx2Filter, c->lumMmx2FilterPos, 8); initMMX2HScaler(c->chrDstW, c->chrXInc, c->chrMmx2FilterCode, c->chrMmx2Filter, c->chrMmx2FilterPos, 4); @@ -2872,8 +2873,8 @@ SwsContext *sws_getContext(int srcW, int srcFilter->chrV, dstFilter->chrV, c->param); #ifdef COMPILE_ALTIVEC - c->vYCoeffsBank = av_malloc(sizeof (vector signed short)*c->vLumFilterSize*c->dstH); - c->vCCoeffsBank = av_malloc(sizeof (vector signed short)*c->vChrFilterSize*c->chrDstH); + CHECKED_ALLOC(c->vYCoeffsBank, sizeof (vector signed short)*c->vLumFilterSize*c->dstH); + CHECKED_ALLOC(c->vCCoeffsBank, sizeof (vector signed short)*c->vChrFilterSize*c->chrDstH); for (i=0;i<c->vLumFilterSize*c->dstH;i++) { int j; @@ -2909,19 +2910,28 @@ SwsContext *sws_getContext(int srcW, int // allocate pixbufs (we use dynamic allocation because otherwise we would need to // allocate several megabytes to handle all possible cases) - c->lumPixBuf= av_malloc(c->vLumBufSize*2*sizeof(int16_t*)); - c->chrPixBuf= av_malloc(c->vChrBufSize*2*sizeof(int16_t*)); + CHECKED_ALLOC(c->lumPixBuf, c->vLumBufSize*2*sizeof(int16_t*)); + CHECKED_ALLOC(c->chrPixBuf, c->vChrBufSize*2*sizeof(int16_t*)); if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat) && isALPHA(c->dstFormat)) - c->alpPixBuf= av_malloc(c->vLumBufSize*2*sizeof(int16_t*)); + CHECKED_ALLOCZ(c->alpPixBuf, c->vLumBufSize*2*sizeof(int16_t*)); //Note we need at least one pixel more at the end because of the MMX code (just in case someone wanna replace the 4000/8000) /* align at 16 bytes for AltiVec */ for (i=0; i<c->vLumBufSize; i++) - c->lumPixBuf[i]= c->lumPixBuf[i+c->vLumBufSize]= av_mallocz(VOF+1); + { + CHECKED_ALLOCZ(c->lumPixBuf[i+c->vLumBufSize], VOF+1); + c->lumPixBuf[i] = c->lumPixBuf[i+c->vLumBufSize]; + } for (i=0; i<c->vChrBufSize; i++) - c->chrPixBuf[i]= c->chrPixBuf[i+c->vChrBufSize]= av_malloc((VOF+1)*2); + { + CHECKED_ALLOC(c->chrPixBuf[i+c->vChrBufSize], (VOF+1)*2); + c->chrPixBuf[i] = c->chrPixBuf[i+c->vChrBufSize]; + } if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) for (i=0; i<c->vLumBufSize; i++) - c->alpPixBuf[i]= c->alpPixBuf[i+c->vLumBufSize]= av_mallocz(VOF+1); + { + CHECKED_ALLOCZ(c->alpPixBuf[i+c->vLumBufSize], VOF+1); + c->alpPixBuf[i] = c->alpPixBuf[i+c->vLumBufSize]; + } //try to avoid drawing green stuff between the right end and the stride end for (i=0; i<c->vChrBufSize; i++) memset(c->chrPixBuf[i], 64, (VOF+1)*2); @@ -3045,6 +3055,10 @@ SwsContext *sws_getContext(int srcW, int c->swScale= getSwsFunc(c); return c; + +fail: + sws_freeContext(c); + return NULL; } static void reset_ptr(uint8_t* src[], int format) @@ -3189,6 +3203,8 @@ SwsFilter *sws_getDefaultFilter(float lu int verbose) { SwsFilter *filter= av_malloc(sizeof(SwsFilter)); + if (!filter) + return NULL; if (lumaGBlur!=0.0) { filter->lumH= sws_getGaussianVec(lumaGBlur, 3.0);

1 0

r19741 - trunk/libavcodec/libspeexdec.c
by subversion＠mplayerhq.hu 29 Aug '09

29 Aug '09

Author: jbr Date: Sat Aug 29 23:04:18 2009 New Revision: 19741 Log: Store the frame size in the LibSpeexContext in case the header does not exist. Modified: trunk/libavcodec/libspeexdec.c Modified: trunk/libavcodec/libspeexdec.c ============================================================================== --- trunk/libavcodec/libspeexdec.c Sat Aug 29 18:55:55 2009 (r19740) +++ trunk/libavcodec/libspeexdec.c Sat Aug 29 23:04:18 2009 (r19741) @@ -29,6 +29,7 @@ typedef struct { SpeexStereoState stereo; void *dec_state; SpeexHeader *header; + int frame_size; } LibSpeexContext; @@ -52,7 +53,7 @@ static av_cold int libspeex_decode_init( if (s->header) { avctx->sample_rate = s->header->rate; avctx->channels = s->header->nb_channels; - avctx->frame_size = s->header->frame_size; + avctx->frame_size = s->frame_size = s->header->frame_size; if (s->header->frames_per_packet) avctx->frame_size *= s->header->frames_per_packet; @@ -76,8 +77,10 @@ static av_cold int libspeex_decode_init( return -1; } - if (!s->header) + if (!s->header) { speex_decoder_ctl(s->dec_state, SPEEX_GET_FRAME_SIZE, &avctx->frame_size); + s->frame_size = avctx->frame_size; + } if (avctx->channels == 2) { SpeexCallback callback; @@ -100,7 +103,7 @@ static int libspeex_decode_frame(AVCodec int16_t *output = data, *end; int i, num_samples; - num_samples = s->header->frame_size * avctx->channels; + num_samples = s->frame_size * avctx->channels; end = output + *data_size / sizeof(*output); speex_bits_read_from(&s->bits, buf, buf_size); @@ -115,12 +118,12 @@ static int libspeex_decode_frame(AVCodec break; if (avctx->channels == 2) - speex_decode_stereo_int(output, s->header->frame_size, &s->stereo); + speex_decode_stereo_int(output, s->frame_size, &s->stereo); output += num_samples; } - avctx->frame_size = s->header->frame_size * i; + avctx->frame_size = s->frame_size * i; *data_size = avctx->channels * avctx->frame_size * sizeof(*output); return buf_size; }

1 0

r19740 - trunk/libavcodec/dsputil.h
by subversion＠mplayerhq.hu 29 Aug '09

29 Aug '09

Author: mru Date: Sat Aug 29 18:55:55 2009 New Revision: 19740 Log: One declaration of mm_flags is enough Modified: trunk/libavcodec/dsputil.h Modified: trunk/libavcodec/dsputil.h ============================================================================== --- trunk/libavcodec/dsputil.h Sat Aug 29 18:55:50 2009 (r19739) +++ trunk/libavcodec/dsputil.h Sat Aug 29 18:55:55 2009 (r19740) @@ -598,6 +598,7 @@ static inline int get_penalty_factor(int /* should be defined by architectures supporting one or more MultiMedia extension */ int mm_support(void); +extern int mm_flags; void dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx); @@ -616,8 +617,6 @@ void dsputil_init_vis(DSPContext* c, AVC #undef emms_c -extern int mm_flags; - static inline void emms(void) { __asm__ volatile ("emms;":::"memory"); @@ -632,16 +631,12 @@ static inline void emms(void) #elif ARCH_ARM -extern int mm_flags; - #if HAVE_NEON # define STRIDE_ALIGN 16 #endif #elif ARCH_PPC -extern int mm_flags; - #define STRIDE_ALIGN 16 #elif HAVE_MMI

1 0

r19739 - in trunk/libavcodec: dsputil.h x86/dsputil_mmx.h x86/idct_sse2_xvid.c x86/motion_est_mmx.c x86/simple_idct_mmx.c
by subversion＠mplayerhq.hu 29 Aug '09

29 Aug '09

Author: mru Date: Sat Aug 29 18:55:50 2009 New Revision: 19739 Log: Move declarations of some mmx functions to dsputil_mmx.h Modified: trunk/libavcodec/dsputil.h trunk/libavcodec/x86/dsputil_mmx.h trunk/libavcodec/x86/idct_sse2_xvid.c trunk/libavcodec/x86/motion_est_mmx.c trunk/libavcodec/x86/simple_idct_mmx.c Modified: trunk/libavcodec/dsputil.h ============================================================================== --- trunk/libavcodec/dsputil.h Sat Aug 29 18:55:46 2009 (r19738) +++ trunk/libavcodec/dsputil.h Sat Aug 29 18:55:50 2009 (r19739) @@ -618,10 +618,6 @@ void dsputil_init_vis(DSPContext* c, AVC extern int mm_flags; -void add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); -void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); -void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); - static inline void emms(void) { __asm__ volatile ("emms;":::"memory"); @@ -634,8 +630,6 @@ static inline void emms(void) emms();\ } -void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); - #elif ARCH_ARM extern int mm_flags; Modified: trunk/libavcodec/x86/dsputil_mmx.h ============================================================================== --- trunk/libavcodec/x86/dsputil_mmx.h Sat Aug 29 18:55:46 2009 (r19738) +++ trunk/libavcodec/x86/dsputil_mmx.h Sat Aug 29 18:55:50 2009 (r19739) @@ -150,5 +150,10 @@ extern const double ff_pd_2[2]; "psrlw $15, %%" #regd ::) void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); + +void add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); +void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); +void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); #endif /* AVCODEC_X86_DSPUTIL_MMX_H */ Modified: trunk/libavcodec/x86/idct_sse2_xvid.c ============================================================================== --- trunk/libavcodec/x86/idct_sse2_xvid.c Sat Aug 29 18:55:46 2009 (r19738) +++ trunk/libavcodec/x86/idct_sse2_xvid.c Sat Aug 29 18:55:50 2009 (r19739) @@ -40,6 +40,7 @@ #include "libavcodec/dsputil.h" #include "idct_xvid.h" +#include "dsputil_mmx.h" /*! * @file libavcodec/x86/idct_sse2_xvid.c Modified: trunk/libavcodec/x86/motion_est_mmx.c ============================================================================== --- trunk/libavcodec/x86/motion_est_mmx.c Sat Aug 29 18:55:46 2009 (r19738) +++ trunk/libavcodec/x86/motion_est_mmx.c Sat Aug 29 18:55:50 2009 (r19739) @@ -24,6 +24,7 @@ #include "libavutil/x86_cpu.h" #include "libavcodec/dsputil.h" +#include "dsputil_mmx.h" DECLARE_ASM_CONST(8, uint64_t, round_tab[3])={ 0x0000000000000000ULL, Modified: trunk/libavcodec/x86/simple_idct_mmx.c ============================================================================== --- trunk/libavcodec/x86/simple_idct_mmx.c Sat Aug 29 18:55:46 2009 (r19738) +++ trunk/libavcodec/x86/simple_idct_mmx.c Sat Aug 29 18:55:50 2009 (r19739) @@ -21,6 +21,7 @@ */ #include "libavcodec/dsputil.h" #include "libavcodec/simple_idct.h" +#include "dsputil_mmx.h" /* 23170.475006

1 0