revert r1783

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1785 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 58 insertions, 70 deletions

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/wmv2.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/wmv2.c
index a88e55926..6cb7c8477 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/wmv2.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/wmv2.c
@@ -25,68 +25,63 @@
 #include "wmv2.h"

 

 

-av_cold void ff_wmv2_common_init(Wmv2Context * w)

-{

-    MpegEncContext * const s = &w->s;

+av_cold void ff_wmv2_common_init(Wmv2Context * w){

+    MpegEncContext * const s= &w->s;

 

     ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0], wmv2_scantableA);

     ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1], wmv2_scantableB);

 }

 

-static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n)

-{

-    MpegEncContext * const s = &w->s;

-

-    if(s->block_last_index[n] >= 0)

-    {

-        switch(w->abt_type_table[n])

-        {

-        case 0:

-            s->dsp.idct_add(dst, stride, block1);

-            break;

-        case 1:

-            ff_simple_idct84_add(dst           , stride, block1);

-            ff_simple_idct84_add(dst + 4 * stride, stride, w->abt_block2[n]);

-            s->dsp.clear_block(w->abt_block2[n]);

-            break;

-        case 2:

-            ff_simple_idct48_add(dst           , stride, block1);

-            ff_simple_idct48_add(dst + 4       , stride, w->abt_block2[n]);

-            s->dsp.clear_block(w->abt_block2[n]);

-            break;

-        default:

-            av_log(s->avctx, AV_LOG_ERROR, "internal error in WMV2 abt\n");

-        }

+static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n){

+    MpegEncContext * const s= &w->s;

+

+  if (s->block_last_index[n] >= 0) {

+    switch(w->abt_type_table[n]){

+    case 0:

+        s->dsp.idct_add (dst, stride, block1);

+        break;

+    case 1:

+        ff_simple_idct84_add(dst           , stride, block1);

+        ff_simple_idct84_add(dst + 4*stride, stride, w->abt_block2[n]);

+        s->dsp.clear_block(w->abt_block2[n]);

+        break;

+    case 2:

+        ff_simple_idct48_add(dst           , stride, block1);

+        ff_simple_idct48_add(dst + 4       , stride, w->abt_block2[n]);

+        s->dsp.clear_block(w->abt_block2[n]);

+        break;

+    default:

+        av_log(s->avctx, AV_LOG_ERROR, "internal error in WMV2 abt\n");

     }

+  }

 }

 

-void ff_wmv2_add_mb(MpegEncContext *s, DCTELEM block1[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr)

-{

-    Wmv2Context * const w = (Wmv2Context*)s;

+void ff_wmv2_add_mb(MpegEncContext *s, DCTELEM block1[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr){

+    Wmv2Context * const w= (Wmv2Context*)s;

 

     wmv2_add_block(w, block1[0], dest_y                    , s->linesize, 0);

     wmv2_add_block(w, block1[1], dest_y + 8                , s->linesize, 1);

-    wmv2_add_block(w, block1[2], dest_y +     8 * s->linesize, s->linesize, 2);

-    wmv2_add_block(w, block1[3], dest_y + 8 + 8 * s->linesize, s->linesize, 3);

+    wmv2_add_block(w, block1[2], dest_y +     8*s->linesize, s->linesize, 2);

+    wmv2_add_block(w, block1[3], dest_y + 8 + 8*s->linesize, s->linesize, 3);

 

-    if(s->flags & CODEC_FLAG_GRAY) return;

+    if(s->flags&CODEC_FLAG_GRAY) return;

 

     wmv2_add_block(w, block1[4], dest_cb                   , s->uvlinesize, 4);

     wmv2_add_block(w, block1[5], dest_cr                   , s->uvlinesize, 5);

 }

 

 void ff_mspel_motion(MpegEncContext *s,

-                     uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,

-                     uint8_t **ref_picture, op_pixels_func(*pix_op)[4],

-                     int motion_x, int motion_y, int h)

+                               uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,

+                               uint8_t **ref_picture, op_pixels_func (*pix_op)[4],

+                               int motion_x, int motion_y, int h)

 {

-    Wmv2Context * const w = (Wmv2Context*)s;

+    Wmv2Context * const w= (Wmv2Context*)s;

     uint8_t *ptr;

     int dxy, offset, mx, my, src_x, src_y, v_edge_pos, linesize, uvlinesize;

-    int emu = 0;

+    int emu=0;

 

     dxy = ((motion_y & 1) << 1) | (motion_x & 1);

-    dxy = 2 * dxy + w->hshift;

+    dxy = 2*dxy + w->hshift;

     src_x = s->mb_x * 16 + (motion_x >> 1);

     src_y = s->mb_y * 16 + (motion_y >> 1);

 

@@ -95,46 +90,41 @@ void ff_mspel_motion(MpegEncContext *s,
     src_x = av_clip(src_x, -16, s->width);

     src_y = av_clip(src_y, -16, s->height);

 

-    if(src_x <= -16 || src_x >= s->width)

+    if(src_x<=-16 || src_x >= s->width)

         dxy &= ~3;

-    if(src_y <= -16 || src_y >= s->height)

+    if(src_y<=-16 || src_y >= s->height)

         dxy &= ~4;

 

     linesize   = s->linesize;

     uvlinesize = s->uvlinesize;

     ptr = ref_picture[0] + (src_y * linesize) + src_x;

 

-    if(s->flags & CODEC_FLAG_EMU_EDGE)

-    {

-        if(src_x < 1 || src_y < 1 || src_x + 17  >= s->h_edge_pos

-           || src_y + h + 1 >= v_edge_pos)

-        {

+    if(s->flags&CODEC_FLAG_EMU_EDGE){

+        if(src_x<1 || src_y<1 || src_x + 17  >= s->h_edge_pos

+                              || src_y + h+1 >= v_edge_pos){

             ff_emulated_edge_mc(s->edge_emu_buffer, ptr - 1 - s->linesize, s->linesize, 19, 19,

-                                src_x - 1, src_y - 1, s->h_edge_pos, s->v_edge_pos);

-            ptr = s->edge_emu_buffer + 1 + s->linesize;

-            emu = 1;

+                             src_x-1, src_y-1, s->h_edge_pos, s->v_edge_pos);

+            ptr= s->edge_emu_buffer + 1 + s->linesize;

+            emu=1;

         }

     }

 

     s->dsp.put_mspel_pixels_tab[dxy](dest_y             , ptr             , linesize);

-    s->dsp.put_mspel_pixels_tab[dxy](dest_y + 8           , ptr + 8           , linesize);

-    s->dsp.put_mspel_pixels_tab[dxy](dest_y  + 8 * linesize, ptr  + 8 * linesize, linesize);

-    s->dsp.put_mspel_pixels_tab[dxy](dest_y + 8 + 8 * linesize, ptr + 8 + 8 * linesize, linesize);

+    s->dsp.put_mspel_pixels_tab[dxy](dest_y+8           , ptr+8           , linesize);

+    s->dsp.put_mspel_pixels_tab[dxy](dest_y  +8*linesize, ptr  +8*linesize, linesize);

+    s->dsp.put_mspel_pixels_tab[dxy](dest_y+8+8*linesize, ptr+8+8*linesize, linesize);

 

-    if(s->flags & CODEC_FLAG_GRAY) return;

+    if(s->flags&CODEC_FLAG_GRAY) return;

 

-    if(s->out_format == FMT_H263)

-    {

+    if (s->out_format == FMT_H263) {

         dxy = 0;

-        if((motion_x & 3) != 0)

+        if ((motion_x & 3) != 0)

             dxy |= 1;

-        if((motion_y & 3) != 0)

+        if ((motion_y & 3) != 0)

             dxy |= 2;

         mx = motion_x >> 2;

         my = motion_y >> 2;

-    }

-    else

-    {

+    } else {

         mx = motion_x / 2;

         my = motion_y / 2;

         dxy = ((my & 1) << 1) | (mx & 1);

@@ -145,27 +135,25 @@ void ff_mspel_motion(MpegEncContext *s,
     src_x = s->mb_x * 8 + mx;

     src_y = s->mb_y * 8 + my;

     src_x = av_clip(src_x, -8, s->width >> 1);

-    if(src_x == (s->width >> 1))

+    if (src_x == (s->width >> 1))

         dxy &= ~1;

     src_y = av_clip(src_y, -8, s->height >> 1);

-    if(src_y == (s->height >> 1))

+    if (src_y == (s->height >> 1))

         dxy &= ~2;

     offset = (src_y * uvlinesize) + src_x;

     ptr = ref_picture[1] + offset;

-    if(emu)

-    {

+    if(emu){

         ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9,

-                            src_x, src_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);

-        ptr = s->edge_emu_buffer;

+                         src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);

+        ptr= s->edge_emu_buffer;

     }

     pix_op[1][dxy](dest_cb, ptr, uvlinesize, h >> 1);

 

     ptr = ref_picture[2] + offset;

-    if(emu)

-    {

+    if(emu){

         ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9,

-                            src_x, src_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);

-        ptr = s->edge_emu_buffer;

+                         src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);

+        ptr= s->edge_emu_buffer;

     }

     pix_op[1][dxy](dest_cr, ptr, uvlinesize, h >> 1);

 }