[09/27] mimic: Use hpeldsp instead of dsputil for half-pel functions

Message ID 1365583975-73297-9-git-send-email-martin@martin.st
State Committed
Commit c10470035e607bb3586e31bb32d7b840d5abe49b
Headers show

Commit Message

Martin Storsjö April 10, 2013, 8:52 a.m.
From: "Ronald S. Bultje" <rsbultje@gmail.com>

---
 configure          |    2 +-
 libavcodec/mimic.c |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

Comments

Kostya Shishkov April 10, 2013, 9:11 a.m. | #1
On Wed, Apr 10, 2013 at 11:52:37AM +0300, Martin Storsjö wrote:
> From: "Ronald S. Bultje" <rsbultje@gmail.com>
> 
> ---
>  configure          |    2 +-
>  libavcodec/mimic.c |    7 +++++--
>  2 files changed, 6 insertions(+), 3 deletions(-)

looks OK

Patch

diff --git a/configure b/configure
index 2abcf8f..a9b0d92 100755
--- a/configure
+++ b/configure
@@ -1587,7 +1587,7 @@  lagarith_decoder_select="dsputil"
 ljpeg_encoder_select="aandcttables mpegvideoenc"
 loco_decoder_select="golomb"
 mdec_decoder_select="dsputil error_resilience mpegvideo"
-mimic_decoder_select="dsputil"
+mimic_decoder_select="dsputil hpeldsp"
 mjpeg_decoder_select="dsputil"
 mjpegb_decoder_select="dsputil"
 mjpeg_encoder_select="aandcttables dsputil mpegvideoenc"
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index 0fe8313..84e3391 100644
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -28,6 +28,7 @@ 
 #include "get_bits.h"
 #include "bytestream.h"
 #include "dsputil.h"
+#include "hpeldsp.h"
 #include "thread.h"
 
 #define MIMIC_HEADER_SIZE   20
@@ -52,6 +53,7 @@  typedef struct {
     GetBitContext   gb;
     ScanTable       scantable;
     DSPContext      dsp;
+    HpelDSPContext  hdsp;
     VLC             vlc;
 
     /* Kept in the context so multithreading can have a constant to read from */
@@ -144,6 +146,7 @@  static av_cold int mimic_decode_init(AVCodecContext *avctx)
         return ret;
     }
     ff_dsputil_init(&ctx->dsp, avctx);
+    ff_hpeldsp_init(&ctx->hdsp, avctx->flags);
     ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, col_zag);
 
     for (i = 0; i < FF_ARRAY_ELEMS(ctx->frames); i++) {
@@ -304,7 +307,7 @@  static int decode(MimicContext *ctx, int quality, int num_coeffs,
                                                      cur_row, 0);
                             p += src -
                                  ctx->flipped_ptrs[ctx->prev_index].data[plane];
-                            ctx->dsp.put_pixels_tab[1][0](dst, p, stride, 8);
+                            ctx->hdsp.put_pixels_tab[1][0](dst, p, stride, 8);
                         } else {
                             av_log(ctx->avctx, AV_LOG_ERROR,
                                      "No such backreference! Buggy sample.\n");
@@ -313,7 +316,7 @@  static int decode(MimicContext *ctx, int quality, int num_coeffs,
                 } else {
                     ff_thread_await_progress(&ctx->frames[ctx->prev_index],
                                              cur_row, 0);
-                    ctx->dsp.put_pixels_tab[1][0](dst, src, stride, 8);
+                    ctx->hdsp.put_pixels_tab[1][0](dst, src, stride, 8);
                 }
                 src += 8;
                 dst += 8;