Mercurial > libavcodec.hg

changeset 10651:abcff3c8c463 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplified deblocking checks. Patch by Dark Shikari
author cehoyos
date Sun, 06 Dec 2009 15:38:05 +0000
parents e267d3e4b964
children b6116b343122
files vp3.c
diffstat 1 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/vp3.c	Sun Dec 06 15:33:48 2009 +0000
+++ b/vp3.c	Sun Dec 06 15:38:05 2009 +0000
@@ -1641,17 +1641,21 @@
         for (y = 0; y < height; y++) {
 
             for (x = 0; x < width; x++) {
+                /* This code basically just deblocks on the edges of coded blocks.
+                 * However, it has to be much more complicated because of the
+                 * braindamaged deblock ordering used in VP3/Theora. Order matters
+                 * because some pixels get filtered twice. */
+                if( s->all_fragments[fragment].coding_method != MODE_COPY )
+                {
                 /* do not perform left edge filter for left columns frags */
-                if ((x > 0) &&
-                    (s->all_fragments[fragment].coding_method != MODE_COPY)) {
+                    if (x > 0) {
                     s->dsp.vp3_h_loop_filter(
                         plane_data + s->all_fragments[fragment].first_pixel,
                         stride, bounding_values);
                 }
 
                 /* do not perform top edge filter for top row fragments */
-                if ((y > 0) &&
-                    (s->all_fragments[fragment].coding_method != MODE_COPY)) {
+                    if (y > 0) {
                     s->dsp.vp3_v_loop_filter(
                         plane_data + s->all_fragments[fragment].first_pixel,
                         stride, bounding_values);
@@ -1661,7 +1665,6 @@
                  * fragments or if right fragment neighbor is also coded
                  * in this frame (it will be filtered in next iteration) */
                 if ((x < width - 1) &&
-                    (s->all_fragments[fragment].coding_method != MODE_COPY) &&
                     (s->all_fragments[fragment + 1].coding_method == MODE_COPY)) {
                     s->dsp.vp3_h_loop_filter(
                         plane_data + s->all_fragments[fragment + 1].first_pixel,
@@ -1672,12 +1675,12 @@
                  * fragments or if bottom fragment neighbor is also coded
                  * in this frame (it will be filtered in the next row) */
                 if ((y < height - 1) &&
-                    (s->all_fragments[fragment].coding_method != MODE_COPY) &&
                     (s->all_fragments[fragment + width].coding_method == MODE_COPY)) {
                     s->dsp.vp3_v_loop_filter(
                         plane_data + s->all_fragments[fragment + width].first_pixel,
                         stride, bounding_values);
                 }
+                }
 
                 fragment++;
             }