| Message ID | 1515707230-8243-1-git-send-email-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 7dbbb75ee32f87108ca9e15f5551dbbe69fe2641 |
| Headers | show |
lgtm, resolves the issue on our end. - dale On Thu, Jan 11, 2018 at 1:47 PM, Michael Niedermayer <michael@niedermayer.cc > wrote: > Fixes high pitched shriek > Fixes: 25420848_1478428308873746_4255813235963330560_n.mp4 > > Reported-by: Dale Curtis <dalecurtis@google.com> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/arm/sbrdsp_neon.S | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/arm/sbrdsp_neon.S b/libavcodec/arm/sbrdsp_neon.S > index e66abd6..003b04e 100644 > --- a/libavcodec/arm/sbrdsp_neon.S > +++ b/libavcodec/arm/sbrdsp_neon.S > @@ -336,11 +336,11 @@ function ff_sbr_hf_apply_noise_0_neon, export=1 > vld1.32 {d0}, [r0,:64] > vld1.32 {d6}, [lr,:64] > vld1.32 {d2[]}, [r1,:32]! > - vld1.32 {d3[]}, [r2,:32]! > + vld1.32 {d18[]}, [r2,:32]! > vceq.f32 d4, d2, #0 > veor d2, d2, d3 > vmov d1, d0 > - vmla.f32 d0, d6, d3 > + vmla.f32 d0, d6, d18 > vadd.f32 s2, s2, s4 > vbif d0, d1, d4 > vst1.32 {d0}, [r0,:64]! > -- > 2.7.4 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >
On Fri, Jan 12, 2018 at 11:47:32AM -0800, Dale Curtis wrote:
> lgtm, resolves the issue on our end.
will apply
thanks
[...]
diff --git a/libavcodec/arm/sbrdsp_neon.S b/libavcodec/arm/sbrdsp_neon.S index e66abd6..003b04e 100644 --- a/libavcodec/arm/sbrdsp_neon.S +++ b/libavcodec/arm/sbrdsp_neon.S @@ -336,11 +336,11 @@ function ff_sbr_hf_apply_noise_0_neon, export=1 vld1.32 {d0}, [r0,:64] vld1.32 {d6}, [lr,:64] vld1.32 {d2[]}, [r1,:32]! - vld1.32 {d3[]}, [r2,:32]! + vld1.32 {d18[]}, [r2,:32]! vceq.f32 d4, d2, #0 veor d2, d2, d3 vmov d1, d0 - vmla.f32 d0, d6, d3 + vmla.f32 d0, d6, d18 vadd.f32 s2, s2, s4 vbif d0, d1, d4 vst1.32 {d0}, [r0,:64]!
Fixes high pitched shriek Fixes: 25420848_1478428308873746_4255813235963330560_n.mp4 Reported-by: Dale Curtis <dalecurtis@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/arm/sbrdsp_neon.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)