diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-04 17:20:24 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-12 08:15:25 +0000 |
| commit | 8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b (patch) | |
| tree | 788d8d7549712682703a0310ca4a0f0860d4802b /chromium/third_party/ffmpeg/libswresample | |
| parent | 606d85f2a5386472314d39923da28c70c60dc8e7 (diff) | |
| download | qtwebengine-chromium-8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b.tar.gz | |
BASELINE: Update Chromium to 98.0.4758.90
Change-Id: Ib7c41539bf8a8e0376bd639f27d68294de90f3c8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/ffmpeg/libswresample')
3 files changed, 7 insertions, 5 deletions
diff --git a/chromium/third_party/ffmpeg/libswresample/aarch64/audio_convert_neon.S b/chromium/third_party/ffmpeg/libswresample/aarch64/audio_convert_neon.S index 74feff448a3..6d789b16d26 100644 --- a/chromium/third_party/ffmpeg/libswresample/aarch64/audio_convert_neon.S +++ b/chromium/third_party/ffmpeg/libswresample/aarch64/audio_convert_neon.S @@ -23,6 +23,7 @@ #include "libavutil/aarch64/asm.S" function swri_oldapi_conv_flt_to_s16_neon, export=1 +oldapi_conv_flt_to_s16_neon: subs x2, x2, #8 ld1 {v0.4s}, [x1], #16 fcvtzs v4.4s, v0.4s, #31 @@ -67,6 +68,7 @@ function swri_oldapi_conv_flt_to_s16_neon, export=1 endfunc function swri_oldapi_conv_fltp_to_s16_2ch_neon, export=1 +oldapi_conv_fltp_to_s16_2ch_neon: ldp x4, x5, [x1] subs x2, x2, #8 ld1 {v0.4s}, [x4], #16 @@ -131,10 +133,10 @@ endfunc function swri_oldapi_conv_fltp_to_s16_nch_neon, export=1 cmp w3, #2 - b.eq X(swri_oldapi_conv_fltp_to_s16_2ch_neon) + b.eq oldapi_conv_fltp_to_s16_2ch_neon b.gt 1f ldr x1, [x1] - b X(swri_oldapi_conv_flt_to_s16_neon) + b oldapi_conv_flt_to_s16_neon 1: cmp w3, #4 lsl x12, x3, #1 diff --git a/chromium/third_party/ffmpeg/libswresample/swresample.c b/chromium/third_party/ffmpeg/libswresample/swresample.c index a7bb69dd4fd..22c2c336730 100644 --- a/chromium/third_party/ffmpeg/libswresample/swresample.c +++ b/chromium/third_party/ffmpeg/libswresample/swresample.c @@ -415,7 +415,7 @@ int swri_realloc_audio(AudioData *a, int count){ av_assert0(a->bps); av_assert0(a->ch_count); - a->data= av_mallocz_array(countb, a->ch_count); + a->data = av_calloc(countb, a->ch_count); if(!a->data) return AVERROR(ENOMEM); for(i=0; i<a->ch_count; i++){ diff --git a/chromium/third_party/ffmpeg/libswresample/x86/rematrix_init.c b/chromium/third_party/ffmpeg/libswresample/x86/rematrix_init.c index e515e4bcff3..0608c74e7f5 100644 --- a/chromium/third_party/ffmpeg/libswresample/x86/rematrix_init.c +++ b/chromium/third_party/ffmpeg/libswresample/x86/rematrix_init.c @@ -51,7 +51,7 @@ av_cold int swri_rematrix_init_x86(struct SwrContext *s){ s->mix_1_1_simd = ff_mix_1_1_a_int16_sse2; s->mix_2_1_simd = ff_mix_2_1_a_int16_sse2; } - s->native_simd_matrix = av_mallocz_array(num, 2 * sizeof(int16_t)); + s->native_simd_matrix = av_calloc(num, 2 * sizeof(int16_t)); s->native_simd_one = av_mallocz(2 * sizeof(int16_t)); if (!s->native_simd_matrix || !s->native_simd_one) return AVERROR(ENOMEM); @@ -78,7 +78,7 @@ av_cold int swri_rematrix_init_x86(struct SwrContext *s){ s->mix_1_1_simd = ff_mix_1_1_a_float_avx; s->mix_2_1_simd = ff_mix_2_1_a_float_avx; } - s->native_simd_matrix = av_mallocz_array(num, sizeof(float)); + s->native_simd_matrix = av_calloc(num, sizeof(float)); s->native_simd_one = av_mallocz(sizeof(float)); if (!s->native_simd_matrix || !s->native_simd_one) return AVERROR(ENOMEM); |