diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 12:12:42 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 12:13:42 +0100 |
commit | 6321e02896350f3ff3a3531dc5484e145c4ea524 (patch) | |
tree | 89e73ef5c3fd7b702e568efc28e48af968b9a9d6 /libavcodec/sh4 | |
parent | f540851ce320bc69621ea70b89857c54129c82c2 (diff) | |
parent | ccb59c106a4361b9655aa094b042863d655860c4 (diff) | |
download | ffmpeg-streaming-6321e02896350f3ff3a3531dc5484e145c4ea524.zip ffmpeg-streaming-6321e02896350f3ff3a3531dc5484e145c4ea524.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec: Remove an outdated todo comment
rtpdec: Rename a static variable to normal naming conventions
sh4: dsputil: remove duplicate of ff_gmc_c()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sh4')
-rw-r--r-- | libavcodec/sh4/dsputil_align.c | 1 | ||||
-rw-r--r-- | libavcodec/sh4/qpel.c | 57 |
2 files changed, 0 insertions, 58 deletions
diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c index a545e55..31f8bdf 100644 --- a/libavcodec/sh4/dsputil_align.c +++ b/libavcodec/sh4/dsputil_align.c @@ -434,7 +434,6 @@ void ff_dsputil_init_align(DSPContext* c, AVCodecContext *avctx) c->put_mspel_pixels_tab[7]= put_mspel8_mc32_sh4; c->gmc1 = gmc1_c; - c->gmc = gmc_c; #endif } diff --git a/libavcodec/sh4/qpel.c b/libavcodec/sh4/qpel.c index 5ad0290..dab834f 100644 --- a/libavcodec/sh4/qpel.c +++ b/libavcodec/sh4/qpel.c @@ -359,63 +359,6 @@ static void gmc1_c(uint8_t *dst, uint8_t *src, int stride, int h, int x16, int y }while(--h); } -static void gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy, - int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height) -{ - int y, vx, vy; - const int s= 1<<shift; - - width--; - height--; - - for(y=0; y<h; y++){ - int x; - - vx= ox; - vy= oy; - for(x=0; x<8; x++){ //XXX FIXME optimize - int src_x, src_y, frac_x, frac_y, index; - - src_x= vx>>16; - src_y= vy>>16; - frac_x= src_x&(s-1); - frac_y= src_y&(s-1); - src_x>>=shift; - src_y>>=shift; - - if((unsigned)src_x < width){ - if((unsigned)src_y < height){ - index= src_x + src_y*stride; - dst[y*stride + x]= ( ( src[index ]*(s-frac_x) - + src[index +1]* frac_x )*(s-frac_y) - + ( src[index+stride ]*(s-frac_x) - + src[index+stride+1]* frac_x )* frac_y - + r)>>(shift*2); - }else{ - index= src_x + av_clip(src_y, 0, height)*stride; - dst[y*stride + x]= ( ( src[index ]*(s-frac_x) - + src[index +1]* frac_x )*s - + r)>>(shift*2); - } - }else{ - if((unsigned)src_y < height){ - index= av_clip(src_x, 0, width) + src_y*stride; - dst[y*stride + x]= ( ( src[index ]*(s-frac_y) - + src[index+stride ]* frac_y )*s - + r)>>(shift*2); - }else{ - index= av_clip(src_x, 0, width) + av_clip(src_y, 0, height)*stride; - dst[y*stride + x]= src[index ]; - } - } - - vx+= dxx; - vy+= dyx; - } - ox += dxy; - oy += dyy; - } -} #define H264_CHROMA_MC(OPNAME, OP)\ static void OPNAME ## h264_chroma_mc2_sh4(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int x, int y){\ const int A=(8-x)*(8-y);\ |