summaryrefslogtreecommitdiff
path: root/libavcodec/h261.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-05 21:25:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-05 21:25:49 +0200
commit3d73be071dfbe21f73644b85a57a52f86acd6589 (patch)
treed20e7f41cf8ab6bd461287353855c6e461203c8f /libavcodec/h261.c
parentfa871b1bde42abaeeee48d866b93cfabc7669e21 (diff)
parented16c2dbf47cdd7c48825b4da6e7036698e5dde1 (diff)
downloadffmpeg-3d73be071dfbe21f73644b85a57a52f86acd6589.tar.gz
Merge commit 'ed16c2dbf47cdd7c48825b4da6e7036698e5dde1'
* commit 'ed16c2dbf47cdd7c48825b4da6e7036698e5dde1': h261: Remove H.261 loop filter from dsputil Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261.c')
-rw-r--r--libavcodec/h261.c40
1 files changed, 34 insertions, 6 deletions
diff --git a/libavcodec/h261.c b/libavcodec/h261.c
index f89d5c7741..6536a549ff 100644
--- a/libavcodec/h261.c
+++ b/libavcodec/h261.c
@@ -32,6 +32,34 @@
uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3];
+static void h261_loop_filter(uint8_t *src, int stride)
+{
+ int x,y,xy,yz;
+ int temp[64];
+
+ for(x=0; x<8; x++){
+ temp[x ] = 4*src[x ];
+ temp[x + 7*8] = 4*src[x + 7*stride];
+ }
+ for(y=1; y<7; y++){
+ for(x=0; x<8; x++){
+ xy = y * stride + x;
+ yz = y * 8 + x;
+ temp[yz] = src[xy - stride] + 2*src[xy] + src[xy + stride];
+ }
+ }
+
+ for(y=0; y<8; y++){
+ src[ y*stride] = (temp[ y*8] + 2)>>2;
+ src[7+y*stride] = (temp[7+y*8] + 2)>>2;
+ for(x=1; x<7; x++){
+ xy = y * stride + x;
+ yz = y * 8 + x;
+ src[xy] = (temp[yz-1] + 2*temp[yz] + temp[yz+1] + 8)>>4;
+ }
+ }
+}
+
void ff_h261_loop_filter(MpegEncContext *s){
H261Context * h= (H261Context*)s;
const int linesize = s->linesize;
@@ -43,10 +71,10 @@ void ff_h261_loop_filter(MpegEncContext *s){
if(!(IS_FIL (h->mtype)))
return;
- s->dsp.h261_loop_filter(dest_y , linesize);
- s->dsp.h261_loop_filter(dest_y + 8, linesize);
- s->dsp.h261_loop_filter(dest_y + 8 * linesize , linesize);
- s->dsp.h261_loop_filter(dest_y + 8 * linesize + 8, linesize);
- s->dsp.h261_loop_filter(dest_cb, uvlinesize);
- s->dsp.h261_loop_filter(dest_cr, uvlinesize);
+ h261_loop_filter(dest_y, linesize);
+ h261_loop_filter(dest_y + 8, linesize);
+ h261_loop_filter(dest_y + 8 * linesize, linesize);
+ h261_loop_filter(dest_y + 8 * linesize + 8, linesize);
+ h261_loop_filter(dest_cb, uvlinesize);
+ h261_loop_filter(dest_cr, uvlinesize);
}