ffmpeg: add to fix return value of swscale on aarch64 neon
this broke e.g. animated emoji on telegram-desktop
This commit is contained in:
parent
b0eadd39d3
commit
0ed9202e5c
2 changed files with 84 additions and 1 deletions
|
@ -0,0 +1,83 @@
|
|||
Upstream: Yes, https://github.com/FFmpeg/FFmpeg/commit/3e098cca6e51db0f19928c12d0348deaa17137b3
|
||||
From 3e098cca6e51db0f19928c12d0348deaa17137b3 Mon Sep 17 00:00:00 2001
|
||||
From: Lynne <dev@lynne.ee>
|
||||
Date: Tue, 7 Jul 2020 16:01:58 +0100
|
||||
Subject: [PATCH] aarch64/yuv2rgb_neon: fix return value
|
||||
|
||||
We return 0 for this particular architecture but should instead be
|
||||
returning the number of lines.
|
||||
Fixes users who check the return value matches what they expect.
|
||||
---
|
||||
libswscale/aarch64/swscale_unscaled.c | 31 ++++++++++++---------------
|
||||
libswscale/aarch64/yuv2rgb_neon.S | 2 ++
|
||||
2 files changed, 16 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/libswscale/aarch64/swscale_unscaled.c b/libswscale/aarch64/swscale_unscaled.c
|
||||
index 551daad9e353..c7a2a1037df8 100644
|
||||
--- libswscale/aarch64/swscale_unscaled.c
|
||||
+++ libswscale/aarch64/swscale_unscaled.c
|
||||
@@ -42,15 +42,14 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[],
|
||||
uint8_t *dst[], int dstStride[]) { \
|
||||
const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
|
||||
\
|
||||
- ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
|
||||
- dst[0] + srcSliceY * dstStride[0], dstStride[0], \
|
||||
- src[0], srcStride[0], \
|
||||
- src[1], srcStride[1], \
|
||||
- src[2], srcStride[2], \
|
||||
- yuv2rgb_table, \
|
||||
- c->yuv2rgb_y_offset >> 6, \
|
||||
- c->yuv2rgb_y_coeff); \
|
||||
- return 0; \
|
||||
+ return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
|
||||
+ dst[0] + srcSliceY * dstStride[0], dstStride[0], \
|
||||
+ src[0], srcStride[0], \
|
||||
+ src[1], srcStride[1], \
|
||||
+ src[2], srcStride[2], \
|
||||
+ yuv2rgb_table, \
|
||||
+ c->yuv2rgb_y_offset >> 6, \
|
||||
+ c->yuv2rgb_y_coeff); \
|
||||
} \
|
||||
|
||||
#define DECLARE_FF_YUVX_TO_ALL_RGBX_FUNCS(yuvx) \
|
||||
@@ -76,14 +75,12 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[],
|
||||
uint8_t *dst[], int dstStride[]) { \
|
||||
const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
|
||||
\
|
||||
- ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
|
||||
- dst[0] + srcSliceY * dstStride[0], dstStride[0], \
|
||||
- src[0], srcStride[0], src[1], srcStride[1], \
|
||||
- yuv2rgb_table, \
|
||||
- c->yuv2rgb_y_offset >> 6, \
|
||||
- c->yuv2rgb_y_coeff); \
|
||||
- \
|
||||
- return 0; \
|
||||
+ return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
|
||||
+ dst[0] + srcSliceY * dstStride[0], dstStride[0], \
|
||||
+ src[0], srcStride[0], src[1], srcStride[1], \
|
||||
+ yuv2rgb_table, \
|
||||
+ c->yuv2rgb_y_offset >> 6, \
|
||||
+ c->yuv2rgb_y_coeff); \
|
||||
} \
|
||||
|
||||
#define DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx) \
|
||||
diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S
|
||||
index b7446aa10511..f4b220fb608e 100644
|
||||
--- libswscale/aarch64/yuv2rgb_neon.S
|
||||
+++ libswscale/aarch64/yuv2rgb_neon.S
|
||||
@@ -142,6 +142,7 @@
|
||||
.macro declare_func ifmt ofmt
|
||||
function ff_\ifmt\()_to_\ofmt\()_neon, export=1
|
||||
load_args_\ifmt
|
||||
+ mov w9, w1
|
||||
1:
|
||||
mov w8, w0 // w8 = width
|
||||
2:
|
||||
@@ -193,6 +194,7 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1
|
||||
increment_\ifmt
|
||||
subs w1, w1, #1 // height -= 1
|
||||
b.gt 1b
|
||||
+ mov w0, w9
|
||||
ret
|
||||
endfunc
|
||||
.endm
|
|
@ -2,7 +2,7 @@
|
|||
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
|
||||
pkgname=ffmpeg
|
||||
version=4.3.1
|
||||
revision=3
|
||||
revision=4
|
||||
short_desc="Decoding, encoding and streaming software"
|
||||
maintainer="Johannes <johannes.brechtmann@gmail.com>"
|
||||
license="GPL-3.0-or-later"
|
||||
|
|
Loading…
Reference in a new issue