[FFmpeg-cvslog] lavc/aarch64: change h264pred_init structure
Mikhail Nitenko
git at videolan.org
Mon Apr 19 10:09:03 EEST 2021
ffmpeg | branch: master | Mikhail Nitenko <mnitenko at gmail.com> | Thu Apr 15 12:13:51 2021 +0300| [6b2e7dc82862c6f87517c928c3408c3f8d62d671] | committer: Josh Dekker
lavc/aarch64: change h264pred_init structure
Change structure to allow the addition of other bit depths.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b2e7dc82862c6f87517c928c3408c3f8d62d671
---
libavcodec/aarch64/h264pred_init.c | 57 ++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 30 deletions(-)
diff --git a/libavcodec/aarch64/h264pred_init.c b/libavcodec/aarch64/h264pred_init.c
index b144376f90..fc8989ae0d 100644
--- a/libavcodec/aarch64/h264pred_init.c
+++ b/libavcodec/aarch64/h264pred_init.c
@@ -49,38 +49,35 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id,
const int bit_depth,
const int chroma_format_idc)
{
- const int high_depth = bit_depth > 8;
-
- if (high_depth)
- return;
-
- if (chroma_format_idc <= 1) {
- h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon;
- h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon;
- if (codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8)
- h->pred8x8[PLANE_PRED8x8] = ff_pred8x8_plane_neon;
- h->pred8x8[DC_128_PRED8x8 ] = ff_pred8x8_128_dc_neon;
- if (codec_id != AV_CODEC_ID_RV40 && codec_id != AV_CODEC_ID_VP7 &&
- codec_id != AV_CODEC_ID_VP8) {
- h->pred8x8[DC_PRED8x8 ] = ff_pred8x8_dc_neon;
- h->pred8x8[LEFT_DC_PRED8x8] = ff_pred8x8_left_dc_neon;
- h->pred8x8[TOP_DC_PRED8x8 ] = ff_pred8x8_top_dc_neon;
- h->pred8x8[ALZHEIMER_DC_L0T_PRED8x8] = ff_pred8x8_l0t_dc_neon;
- h->pred8x8[ALZHEIMER_DC_0LT_PRED8x8] = ff_pred8x8_0lt_dc_neon;
- h->pred8x8[ALZHEIMER_DC_L00_PRED8x8] = ff_pred8x8_l00_dc_neon;
- h->pred8x8[ALZHEIMER_DC_0L0_PRED8x8] = ff_pred8x8_0l0_dc_neon;
+ if (bit_depth == 8) {
+ if (chroma_format_idc <= 1) {
+ h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon;
+ h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon;
+ if (codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8)
+ h->pred8x8[PLANE_PRED8x8] = ff_pred8x8_plane_neon;
+ h->pred8x8[DC_128_PRED8x8 ] = ff_pred8x8_128_dc_neon;
+ if (codec_id != AV_CODEC_ID_RV40 && codec_id != AV_CODEC_ID_VP7 &&
+ codec_id != AV_CODEC_ID_VP8) {
+ h->pred8x8[DC_PRED8x8 ] = ff_pred8x8_dc_neon;
+ h->pred8x8[LEFT_DC_PRED8x8] = ff_pred8x8_left_dc_neon;
+ h->pred8x8[TOP_DC_PRED8x8 ] = ff_pred8x8_top_dc_neon;
+ h->pred8x8[ALZHEIMER_DC_L0T_PRED8x8] = ff_pred8x8_l0t_dc_neon;
+ h->pred8x8[ALZHEIMER_DC_0LT_PRED8x8] = ff_pred8x8_0lt_dc_neon;
+ h->pred8x8[ALZHEIMER_DC_L00_PRED8x8] = ff_pred8x8_l00_dc_neon;
+ h->pred8x8[ALZHEIMER_DC_0L0_PRED8x8] = ff_pred8x8_0l0_dc_neon;
+ }
}
- }
- h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_neon;
- h->pred16x16[VERT_PRED8x8 ] = ff_pred16x16_vert_neon;
- h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_hor_neon;
- h->pred16x16[LEFT_DC_PRED8x8] = ff_pred16x16_left_dc_neon;
- h->pred16x16[TOP_DC_PRED8x8 ] = ff_pred16x16_top_dc_neon;
- h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon;
- if (codec_id != AV_CODEC_ID_SVQ3 && codec_id != AV_CODEC_ID_RV40 &&
- codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8)
- h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon;
+ h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_neon;
+ h->pred16x16[VERT_PRED8x8 ] = ff_pred16x16_vert_neon;
+ h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_hor_neon;
+ h->pred16x16[LEFT_DC_PRED8x8] = ff_pred16x16_left_dc_neon;
+ h->pred16x16[TOP_DC_PRED8x8 ] = ff_pred16x16_top_dc_neon;
+ h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon;
+ if (codec_id != AV_CODEC_ID_SVQ3 && codec_id != AV_CODEC_ID_RV40 &&
+ codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8)
+ h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon;
+ }
}
av_cold void ff_h264_pred_init_aarch64(H264PredContext *h, int codec_id,
More information about the ffmpeg-cvslog
mailing list