Commit 15932389 authored by Vittorio Giovara's avatar Vittorio Giovara

intrax8: Add a local BlockDSPContext and initialize it

Helps in decoupling this code from mpegvideo.
parent 1eaae7ab
...@@ -1863,7 +1863,7 @@ error_resilience_select="me_cmp" ...@@ -1863,7 +1863,7 @@ error_resilience_select="me_cmp"
faandct_deps="faan fdctdsp" faandct_deps="faan fdctdsp"
faanidct_deps="faan idctdsp" faanidct_deps="faan idctdsp"
h264dsp_select="startcode" h264dsp_select="startcode"
intrax8_select="idctdsp" intrax8_select="blockdsp idctdsp"
mdct_select="fft" mdct_select="fft"
rdft_select="fft" rdft_select="fft"
me_cmp_select="fdctdsp idctdsp pixblockdsp" me_cmp_select="fdctdsp idctdsp pixblockdsp"
......
...@@ -587,7 +587,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) ...@@ -587,7 +587,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma)
int sign; int sign;
assert(w->orient < 12); assert(w->orient < 12);
s->bdsp.clear_block(s->block[0]); w->bdsp.clear_block(s->block[0]);
if (chroma) if (chroma)
dc_mode = 2; dc_mode = 2;
...@@ -762,6 +762,7 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, ...@@ -762,6 +762,7 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
ff_wmv1_scantable[3]); ff_wmv1_scantable[3]);
ff_intrax8dsp_init(&w->dsp); ff_intrax8dsp_init(&w->dsp);
ff_blockdsp_init(&w->bdsp, avctx);
return 0; return 0;
} }
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#ifndef AVCODEC_INTRAX8_H #ifndef AVCODEC_INTRAX8_H
#define AVCODEC_INTRAX8_H #define AVCODEC_INTRAX8_H
#include "blockdsp.h"
#include "get_bits.h" #include "get_bits.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "idctdsp.h" #include "idctdsp.h"
...@@ -41,6 +42,7 @@ typedef struct IntraX8Context { ...@@ -41,6 +42,7 @@ typedef struct IntraX8Context {
MpegEncContext *s; MpegEncContext *s;
IntraX8DSPContext dsp; IntraX8DSPContext dsp;
IDCTDSPContext idsp; IDCTDSPContext idsp;
BlockDSPContext bdsp;
int quant; int quant;
int dquant; int dquant;
int qsum; int qsum;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment