mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-17 20:28:30 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: sparc: dsputil: Simplify high_bit_depth checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
f98598942f
@ -3501,16 +3501,14 @@ av_cold void ff_dsputil_init_vis(DSPContext *c, AVCodecContext *avctx)
|
|||||||
int accel = vis_level ();
|
int accel = vis_level ();
|
||||||
const int high_bit_depth = avctx->bits_per_raw_sample > 8;
|
const int high_bit_depth = avctx->bits_per_raw_sample > 8;
|
||||||
|
|
||||||
if (accel & ACCEL_SPARC_VIS) {
|
if (accel & ACCEL_SPARC_VIS && !high_bit_depth) {
|
||||||
if (avctx->bits_per_raw_sample <= 8 &&
|
if (avctx->idct_algo == FF_IDCT_SIMPLEVIS) {
|
||||||
avctx->idct_algo == FF_IDCT_SIMPLEVIS) {
|
|
||||||
c->idct_put = ff_simple_idct_put_vis;
|
c->idct_put = ff_simple_idct_put_vis;
|
||||||
c->idct_add = ff_simple_idct_add_vis;
|
c->idct_add = ff_simple_idct_add_vis;
|
||||||
c->idct = ff_simple_idct_vis;
|
c->idct = ff_simple_idct_vis;
|
||||||
c->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
|
c->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!high_bit_depth) {
|
|
||||||
c->put_pixels_tab[0][0] = MC_put_o_16_vis;
|
c->put_pixels_tab[0][0] = MC_put_o_16_vis;
|
||||||
c->put_pixels_tab[0][1] = MC_put_x_16_vis;
|
c->put_pixels_tab[0][1] = MC_put_x_16_vis;
|
||||||
c->put_pixels_tab[0][2] = MC_put_y_16_vis;
|
c->put_pixels_tab[0][2] = MC_put_y_16_vis;
|
||||||
@ -3545,6 +3543,5 @@ av_cold void ff_dsputil_init_vis(DSPContext *c, AVCodecContext *avctx)
|
|||||||
c->avg_no_rnd_pixels_tab[1] = MC_avg_no_round_x_16_vis;
|
c->avg_no_rnd_pixels_tab[1] = MC_avg_no_round_x_16_vis;
|
||||||
c->avg_no_rnd_pixels_tab[2] = MC_avg_no_round_y_16_vis;
|
c->avg_no_rnd_pixels_tab[2] = MC_avg_no_round_y_16_vis;
|
||||||
c->avg_no_rnd_pixels_tab[3] = MC_avg_no_round_xy_16_vis;
|
c->avg_no_rnd_pixels_tab[3] = MC_avg_no_round_xy_16_vis;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user