[FFmpeg-cvslog] intrax8: Add a local BlockDSPContext and initialize it
Vittorio Giovara
git at videolan.org
Sun Apr 24 13:47:42 CEST 2016
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Sat Feb 20 00:46:49 2016 -0500| [159323897f545e7405fb9db234e0ba123e174376] | committer: Vittorio Giovara
intrax8: Add a local BlockDSPContext and initialize it
Helps in decoupling this code from mpegvideo.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=159323897f545e7405fb9db234e0ba123e174376
---
configure | 2 +-
libavcodec/intrax8.c | 3 ++-
libavcodec/intrax8.h | 2 ++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 99b9405..e5f5046 100755
--- a/configure
+++ b/configure
@@ -1863,7 +1863,7 @@ error_resilience_select="me_cmp"
faandct_deps="faan fdctdsp"
faanidct_deps="faan idctdsp"
h264dsp_select="startcode"
-intrax8_select="idctdsp"
+intrax8_select="blockdsp idctdsp"
mdct_select="fft"
rdft_select="fft"
me_cmp_select="fdctdsp idctdsp pixblockdsp"
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index b35d252..e7eda24 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -587,7 +587,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma)
int sign;
assert(w->orient < 12);
- s->bdsp.clear_block(s->block[0]);
+ w->bdsp.clear_block(s->block[0]);
if (chroma)
dc_mode = 2;
@@ -762,6 +762,7 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
ff_wmv1_scantable[3]);
ff_intrax8dsp_init(&w->dsp);
+ ff_blockdsp_init(&w->bdsp, avctx);
return 0;
}
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index 7a0eaf7..44954e1 100644
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -19,6 +19,7 @@
#ifndef AVCODEC_INTRAX8_H
#define AVCODEC_INTRAX8_H
+#include "blockdsp.h"
#include "get_bits.h"
#include "mpegvideo.h"
#include "idctdsp.h"
@@ -41,6 +42,7 @@ typedef struct IntraX8Context {
MpegEncContext *s;
IntraX8DSPContext dsp;
IDCTDSPContext idsp;
+ BlockDSPContext bdsp;
int quant;
int dquant;
int qsum;
More information about the ffmpeg-cvslog
mailing list