Commit b0c8e1b8 authored by Kostya Shishkov's avatar Kostya Shishkov

Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab

Originally committed as revision 6151 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e34350a3
...@@ -879,8 +879,15 @@ static void vc1_mc_1mv(VC1Context *v, int dir) ...@@ -879,8 +879,15 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
if(s->flags & CODEC_FLAG_GRAY) return; if(s->flags & CODEC_FLAG_GRAY) return;
/* Chroma MC always uses qpel bilinear */ /* Chroma MC always uses qpel bilinear */
uvdxy = ((uvmy & 3) << 2) | (uvmx & 3); uvdxy = ((uvmy & 3) << 2) | (uvmx & 3);
dsp->put_vc1_qpel_pixels_tab[uvdxy](s->dest[1], srcU, s->uvlinesize, v->rnd); uvmx = (uvmx&3)<<1;
dsp->put_vc1_qpel_pixels_tab[uvdxy](s->dest[2], srcV, s->uvlinesize, v->rnd); uvmy = (uvmy&3)<<1;
if(!v->rnd){
dsp->put_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
dsp->put_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
}else{
dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
}
} }
/** Do motion compensation for 4-MV macroblock - luminance block /** Do motion compensation for 4-MV macroblock - luminance block
...@@ -1077,8 +1084,15 @@ static void vc1_mc_4mv_chroma(VC1Context *v) ...@@ -1077,8 +1084,15 @@ static void vc1_mc_4mv_chroma(VC1Context *v)
/* Chroma MC always uses qpel bilinear */ /* Chroma MC always uses qpel bilinear */
uvdxy = ((uvmy & 3) << 2) | (uvmx & 3); uvdxy = ((uvmy & 3) << 2) | (uvmx & 3);
dsp->put_vc1_qpel_pixels_tab[uvdxy](s->dest[1], srcU, s->uvlinesize, v->rnd); uvmx = (uvmx&3)<<1;
dsp->put_vc1_qpel_pixels_tab[uvdxy](s->dest[2], srcV, s->uvlinesize, v->rnd); uvmy = (uvmy&3)<<1;
if(!v->rnd){
dsp->put_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
dsp->put_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
}else{
dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
}
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment