Commit 256ef198 authored by Janne Grunau's avatar Janne Grunau

h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1

parent fc568683
...@@ -54,6 +54,7 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id, ...@@ -54,6 +54,7 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id,
if (high_depth) if (high_depth)
return; return;
if (chroma_format_idc <= 1) {
h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon; h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon;
h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon; h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon;
if (codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8) if (codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8)
...@@ -69,6 +70,7 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id, ...@@ -69,6 +70,7 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id,
h->pred8x8[ALZHEIMER_DC_L00_PRED8x8] = ff_pred8x8_l00_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->pred8x8[ALZHEIMER_DC_0L0_PRED8x8] = ff_pred8x8_0l0_dc_neon;
} }
}
h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_neon; h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_neon;
h->pred16x16[VERT_PRED8x8 ] = ff_pred16x16_vert_neon; h->pred16x16[VERT_PRED8x8 ] = ff_pred16x16_vert_neon;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment