diff options
| author | James Almer <jamrial@gmail.com> | 2019-03-22 16:04:42 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-03-22 16:06:04 -0300 |
| commit | 47e12966b75490cfa5fb8ed65a48a9a3d84a7bce (patch) | |
| tree | 643c37c0dc8e345ba5046aef4fdc170904696d1a /libavcodec/arm/h264dsp_init_arm.c | |
| parent | e704070f61e830064ea5c13e9562d7c455a3729d (diff) | |
| parent | 0676de935b1e81bc5b5698fef3e7d48ff2ea77ff (diff) | |
Merge commit '0676de935b1e81bc5b5698fef3e7d48ff2ea77ff'
* commit '0676de935b1e81bc5b5698fef3e7d48ff2ea77ff':
arm: Implement a NEON version of 422 h264_h_loop_filter_chroma
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/arm/h264dsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/h264dsp_init_arm.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index 8940265930..54e1e38c93 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -33,6 +33,8 @@ void ff_h264_v_loop_filter_chroma_neon(uint8_t *pix, ptrdiff_t stride, int alpha int beta, int8_t *tc0); void ff_h264_h_loop_filter_chroma_neon(uint8_t *pix, ptrdiff_t stride, int alpha, int beta, int8_t *tc0); +void ff_h264_h_loop_filter_chroma422_neon(uint8_t *pix, ptrdiff_t stride, int alpha, + int beta, int8_t *tc0); void ff_weight_h264_pixels_16_neon(uint8_t *dst, int stride, int height, int log2_den, int weight, int offset); @@ -77,9 +79,11 @@ static av_cold void h264dsp_init_neon(H264DSPContext *c, const int bit_depth, c->h264_v_loop_filter_luma = ff_h264_v_loop_filter_luma_neon; c->h264_h_loop_filter_luma = ff_h264_h_loop_filter_luma_neon; c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon; - if(chroma_format_idc == 1){ - c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon; - } + + if (chroma_format_idc <= 1) + c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon; + else + c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma422_neon; c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16_neon; c->weight_h264_pixels_tab[1] = ff_weight_h264_pixels_8_neon; |