diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-08-25 14:35:52 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-09-02 16:32:57 +0100 |
| commit | 15616eb04206b64bcf08ad351f4c754e69e00666 (patch) | |
| tree | a1c88084e31cf10946f29b19bb0d6acc05aa6893 /libavcodec/intrax8.c | |
| parent | 12c8912de2f2c1a235a7578d6a288e217c3fb504 (diff) | |
intrax8: move functions from dsputil to own context
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/intrax8.c')
| -rw-r--r-- | libavcodec/intrax8.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 17426c510e..fad7ffec05 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -27,6 +27,7 @@ #include "msmpeg4data.h" #include "intrax8huf.h" #include "intrax8.h" +#include "intrax8dsp.h" #define MAX_TABLE_DEPTH(table_bits, max_bits) ((max_bits+table_bits-1)/table_bits) @@ -303,9 +304,9 @@ static int x8_setup_spatial_predictor(IntraX8Context * const w, const int chroma int sum; int quant; - s->dsp.x8_setup_spatial_compensation(s->dest[chroma], s->edge_emu_buffer, - s->current_picture.f.linesize[chroma>0], - &range, &sum, w->edges); + w->dsp.setup_spatial_compensation(s->dest[chroma], s->edge_emu_buffer, + s->current_picture.f.linesize[chroma>0], + &range, &sum, w->edges); if(chroma){ w->orient=w->chroma_orient; quant=w->quant_dc_chroma; @@ -639,7 +640,7 @@ static int x8_decode_intra_mb(IntraX8Context* const w, const int chroma){ if(w->flat_dc){ dsp_x8_put_solidcolor(w->predicted_dc, s->dest[chroma], s->current_picture.f.linesize[!!chroma]); }else{ - s->dsp.x8_spatial_compensation[w->orient]( s->edge_emu_buffer, + w->dsp.spatial_compensation[w->orient]( s->edge_emu_buffer, s->dest[chroma], s->current_picture.f.linesize[!!chroma] ); } @@ -659,10 +660,10 @@ block_placed: int linesize = s->current_picture.f.linesize[!!chroma]; if(!( (w->edges&2) || ( zeros_only && (w->orient|4)==4 ) )){ - s->dsp.x8_h_loop_filter(ptr, linesize, w->quant); + w->dsp.h_loop_filter(ptr, linesize, w->quant); } if(!( (w->edges&1) || ( zeros_only && (w->orient|8)==8 ) )){ - s->dsp.x8_v_loop_filter(ptr, linesize, w->quant); + w->dsp.v_loop_filter(ptr, linesize, w->quant); } } return 0; @@ -699,6 +700,8 @@ av_cold void ff_intrax8_common_init(IntraX8Context * w, MpegEncContext * const s ff_init_scantable(s->dsp.idct_permutation, &w->scantable[0], ff_wmv1_scantable[0]); ff_init_scantable(s->dsp.idct_permutation, &w->scantable[1], ff_wmv1_scantable[2]); ff_init_scantable(s->dsp.idct_permutation, &w->scantable[2], ff_wmv1_scantable[3]); + + ff_intrax8dsp_init(&w->dsp); } /** |