diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-02 21:00:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-02 21:01:10 +0200 |
| commit | 50b0edea9f48c831909313c15b0677957789ff53 (patch) | |
| tree | 9c1dbf2e74e027022cefbba74543b747d8884485 /libavcodec/intrax8.c | |
| parent | 083e65cfd22e44719eedfad4c2d3ed290688661d (diff) | |
| parent | 15616eb04206b64bcf08ad351f4c754e69e00666 (diff) | |
| download | ffmpeg-50b0edea9f48c831909313c15b0677957789ff53.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
intrax8: move functions from dsputil to own context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 dfd325c6fa..fe1e770a18 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -28,6 +28,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) @@ -300,9 +301,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; @@ -636,7 +637,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] ); } @@ -656,10 +657,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; @@ -696,6 +697,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); } /** |