| Message ID | 20240510163943.109471-1-remi@remlab.net |
|---|---|
| State | Accepted |
| Commit | 38e7b0ecf8bc876072dc1a6caf7cadc2360910f3 |
| Headers | show |
| Series | [FFmpeg-devel,1/3] lavc/vp9dsp: fix indentation | expand |
The patch `lavc/vp9dsp: R-V ipred vert` needs to add `#if HAVE_RV`. How about I modify these `#if HAVE_RVV` indentations together in this patch? Rémi Denis-Courmont <remi@remlab.net> 于2024年5月11日周六 00:39写道： > --- > libavcodec/riscv/vp9dsp_init.c | 50 +++++++++++++++++----------------- > 1 file changed, 25 insertions(+), 25 deletions(-) > > diff --git a/libavcodec/riscv/vp9dsp_init.c > b/libavcodec/riscv/vp9dsp_init.c > index 69ab39004c..6863c486c8 100644 > --- a/libavcodec/riscv/vp9dsp_init.c > +++ b/libavcodec/riscv/vp9dsp_init.c > @@ -26,33 +26,33 @@ > > static av_cold void vp9dsp_intrapred_init_rvv(VP9DSPContext *dsp, int bpp) > { > - #if HAVE_RVV > - int flags = av_get_cpu_flags(); > +#if HAVE_RVV > + int flags = av_get_cpu_flags(); > > - if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I64 && ff_get_rv_vlenb() > >= 16) { > - dsp->intra_pred[TX_8X8][DC_PRED] = ff_dc_8x8_rvv; > - dsp->intra_pred[TX_8X8][LEFT_DC_PRED] = ff_dc_left_8x8_rvv; > - dsp->intra_pred[TX_8X8][DC_127_PRED] = ff_dc_127_8x8_rvv; > - dsp->intra_pred[TX_8X8][DC_128_PRED] = ff_dc_128_8x8_rvv; > - dsp->intra_pred[TX_8X8][DC_129_PRED] = ff_dc_129_8x8_rvv; > - dsp->intra_pred[TX_8X8][TOP_DC_PRED] = ff_dc_top_8x8_rvv; > - } > + if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I64 && ff_get_rv_vlenb() >= > 16) { > + dsp->intra_pred[TX_8X8][DC_PRED] = ff_dc_8x8_rvv; > + dsp->intra_pred[TX_8X8][LEFT_DC_PRED] = ff_dc_left_8x8_rvv; > + dsp->intra_pred[TX_8X8][DC_127_PRED] = ff_dc_127_8x8_rvv; > + dsp->intra_pred[TX_8X8][DC_128_PRED] = ff_dc_128_8x8_rvv; > + dsp->intra_pred[TX_8X8][DC_129_PRED] = ff_dc_129_8x8_rvv; > + dsp->intra_pred[TX_8X8][TOP_DC_PRED] = ff_dc_top_8x8_rvv; > + } > > - if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() > >= 16) { > - dsp->intra_pred[TX_32X32][DC_PRED] = ff_dc_32x32_rvv; > - dsp->intra_pred[TX_16X16][DC_PRED] = ff_dc_16x16_rvv; > - dsp->intra_pred[TX_32X32][LEFT_DC_PRED] = > ff_dc_left_32x32_rvv; > - dsp->intra_pred[TX_16X16][LEFT_DC_PRED] = > ff_dc_left_16x16_rvv; > - dsp->intra_pred[TX_32X32][DC_127_PRED] = ff_dc_127_32x32_rvv; > - dsp->intra_pred[TX_16X16][DC_127_PRED] = ff_dc_127_16x16_rvv; > - dsp->intra_pred[TX_32X32][DC_128_PRED] = ff_dc_128_32x32_rvv; > - dsp->intra_pred[TX_16X16][DC_128_PRED] = ff_dc_128_16x16_rvv; > - dsp->intra_pred[TX_32X32][DC_129_PRED] = ff_dc_129_32x32_rvv; > - dsp->intra_pred[TX_16X16][DC_129_PRED] = ff_dc_129_16x16_rvv; > - dsp->intra_pred[TX_32X32][TOP_DC_PRED] = ff_dc_top_32x32_rvv; > - dsp->intra_pred[TX_16X16][TOP_DC_PRED] = ff_dc_top_16x16_rvv; > - } > - #endif > + if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= > 16) { > + dsp->intra_pred[TX_32X32][DC_PRED] = ff_dc_32x32_rvv; > + dsp->intra_pred[TX_16X16][DC_PRED] = ff_dc_16x16_rvv; > + dsp->intra_pred[TX_32X32][LEFT_DC_PRED] = ff_dc_left_32x32_rvv; > + dsp->intra_pred[TX_16X16][LEFT_DC_PRED] = ff_dc_left_16x16_rvv; > + dsp->intra_pred[TX_32X32][DC_127_PRED] = ff_dc_127_32x32_rvv; > + dsp->intra_pred[TX_16X16][DC_127_PRED] = ff_dc_127_16x16_rvv; > + dsp->intra_pred[TX_32X32][DC_128_PRED] = ff_dc_128_32x32_rvv; > + dsp->intra_pred[TX_16X16][DC_128_PRED] = ff_dc_128_16x16_rvv; > + dsp->intra_pred[TX_32X32][DC_129_PRED] = ff_dc_129_32x32_rvv; > + dsp->intra_pred[TX_16X16][DC_129_PRED] = ff_dc_129_16x16_rvv; > + dsp->intra_pred[TX_32X32][TOP_DC_PRED] = ff_dc_top_32x32_rvv; > + dsp->intra_pred[TX_16X16][TOP_DC_PRED] = ff_dc_top_16x16_rvv; > + } > +#endif > } > > av_cold void ff_vp9dsp_init_riscv(VP9DSPContext *dsp, int bpp, int > bitexact) > -- > 2.43.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c index 69ab39004c..6863c486c8 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -26,33 +26,33 @@ static av_cold void vp9dsp_intrapred_init_rvv(VP9DSPContext *dsp, int bpp) { - #if HAVE_RVV - int flags = av_get_cpu_flags(); +#if HAVE_RVV + int flags = av_get_cpu_flags(); - if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I64 && ff_get_rv_vlenb() >= 16) { - dsp->intra_pred[TX_8X8][DC_PRED] = ff_dc_8x8_rvv; - dsp->intra_pred[TX_8X8][LEFT_DC_PRED] = ff_dc_left_8x8_rvv; - dsp->intra_pred[TX_8X8][DC_127_PRED] = ff_dc_127_8x8_rvv; - dsp->intra_pred[TX_8X8][DC_128_PRED] = ff_dc_128_8x8_rvv; - dsp->intra_pred[TX_8X8][DC_129_PRED] = ff_dc_129_8x8_rvv; - dsp->intra_pred[TX_8X8][TOP_DC_PRED] = ff_dc_top_8x8_rvv; - } + if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I64 && ff_get_rv_vlenb() >= 16) { + dsp->intra_pred[TX_8X8][DC_PRED] = ff_dc_8x8_rvv; + dsp->intra_pred[TX_8X8][LEFT_DC_PRED] = ff_dc_left_8x8_rvv; + dsp->intra_pred[TX_8X8][DC_127_PRED] = ff_dc_127_8x8_rvv; + dsp->intra_pred[TX_8X8][DC_128_PRED] = ff_dc_128_8x8_rvv; + dsp->intra_pred[TX_8X8][DC_129_PRED] = ff_dc_129_8x8_rvv; + dsp->intra_pred[TX_8X8][TOP_DC_PRED] = ff_dc_top_8x8_rvv; + } - if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) { - dsp->intra_pred[TX_32X32][DC_PRED] = ff_dc_32x32_rvv; - dsp->intra_pred[TX_16X16][DC_PRED] = ff_dc_16x16_rvv; - dsp->intra_pred[TX_32X32][LEFT_DC_PRED] = ff_dc_left_32x32_rvv; - dsp->intra_pred[TX_16X16][LEFT_DC_PRED] = ff_dc_left_16x16_rvv; - dsp->intra_pred[TX_32X32][DC_127_PRED] = ff_dc_127_32x32_rvv; - dsp->intra_pred[TX_16X16][DC_127_PRED] = ff_dc_127_16x16_rvv; - dsp->intra_pred[TX_32X32][DC_128_PRED] = ff_dc_128_32x32_rvv; - dsp->intra_pred[TX_16X16][DC_128_PRED] = ff_dc_128_16x16_rvv; - dsp->intra_pred[TX_32X32][DC_129_PRED] = ff_dc_129_32x32_rvv; - dsp->intra_pred[TX_16X16][DC_129_PRED] = ff_dc_129_16x16_rvv; - dsp->intra_pred[TX_32X32][TOP_DC_PRED] = ff_dc_top_32x32_rvv; - dsp->intra_pred[TX_16X16][TOP_DC_PRED] = ff_dc_top_16x16_rvv; - } - #endif + if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) { + dsp->intra_pred[TX_32X32][DC_PRED] = ff_dc_32x32_rvv; + dsp->intra_pred[TX_16X16][DC_PRED] = ff_dc_16x16_rvv; + dsp->intra_pred[TX_32X32][LEFT_DC_PRED] = ff_dc_left_32x32_rvv; + dsp->intra_pred[TX_16X16][LEFT_DC_PRED] = ff_dc_left_16x16_rvv; + dsp->intra_pred[TX_32X32][DC_127_PRED] = ff_dc_127_32x32_rvv; + dsp->intra_pred[TX_16X16][DC_127_PRED] = ff_dc_127_16x16_rvv; + dsp->intra_pred[TX_32X32][DC_128_PRED] = ff_dc_128_32x32_rvv; + dsp->intra_pred[TX_16X16][DC_128_PRED] = ff_dc_128_16x16_rvv; + dsp->intra_pred[TX_32X32][DC_129_PRED] = ff_dc_129_32x32_rvv; + dsp->intra_pred[TX_16X16][DC_129_PRED] = ff_dc_129_16x16_rvv; + dsp->intra_pred[TX_32X32][TOP_DC_PRED] = ff_dc_top_32x32_rvv; + dsp->intra_pred[TX_16X16][TOP_DC_PRED] = ff_dc_top_16x16_rvv; + } +#endif } av_cold void ff_vp9dsp_init_riscv(VP9DSPContext *dsp, int bpp, int bitexact)