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.
This commit is contained in:
parent
05feb7a26b
commit
3e098cca6e
|
@ -42,15 +42,14 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[],
|
||||||
uint8_t *dst[], int dstStride[]) { \
|
uint8_t *dst[], int dstStride[]) { \
|
||||||
const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
|
const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
|
||||||
\
|
\
|
||||||
ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
|
return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
|
||||||
dst[0] + srcSliceY * dstStride[0], dstStride[0], \
|
dst[0] + srcSliceY * dstStride[0], dstStride[0], \
|
||||||
src[0], srcStride[0], \
|
src[0], srcStride[0], \
|
||||||
src[1], srcStride[1], \
|
src[1], srcStride[1], \
|
||||||
src[2], srcStride[2], \
|
src[2], srcStride[2], \
|
||||||
yuv2rgb_table, \
|
yuv2rgb_table, \
|
||||||
c->yuv2rgb_y_offset >> 6, \
|
c->yuv2rgb_y_offset >> 6, \
|
||||||
c->yuv2rgb_y_coeff); \
|
c->yuv2rgb_y_coeff); \
|
||||||
return 0; \
|
|
||||||
} \
|
} \
|
||||||
|
|
||||||
#define DECLARE_FF_YUVX_TO_ALL_RGBX_FUNCS(yuvx) \
|
#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[]) { \
|
uint8_t *dst[], int dstStride[]) { \
|
||||||
const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
|
const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
|
||||||
\
|
\
|
||||||
ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
|
return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
|
||||||
dst[0] + srcSliceY * dstStride[0], dstStride[0], \
|
dst[0] + srcSliceY * dstStride[0], dstStride[0], \
|
||||||
src[0], srcStride[0], src[1], srcStride[1], \
|
src[0], srcStride[0], src[1], srcStride[1], \
|
||||||
yuv2rgb_table, \
|
yuv2rgb_table, \
|
||||||
c->yuv2rgb_y_offset >> 6, \
|
c->yuv2rgb_y_offset >> 6, \
|
||||||
c->yuv2rgb_y_coeff); \
|
c->yuv2rgb_y_coeff); \
|
||||||
\
|
|
||||||
return 0; \
|
|
||||||
} \
|
} \
|
||||||
|
|
||||||
#define DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx) \
|
#define DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx) \
|
||||||
|
|
|
@ -142,6 +142,7 @@
|
||||||
.macro declare_func ifmt ofmt
|
.macro declare_func ifmt ofmt
|
||||||
function ff_\ifmt\()_to_\ofmt\()_neon, export=1
|
function ff_\ifmt\()_to_\ofmt\()_neon, export=1
|
||||||
load_args_\ifmt
|
load_args_\ifmt
|
||||||
|
mov w9, w1
|
||||||
1:
|
1:
|
||||||
mov w8, w0 // w8 = width
|
mov w8, w0 // w8 = width
|
||||||
2:
|
2:
|
||||||
|
@ -193,6 +194,7 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1
|
||||||
increment_\ifmt
|
increment_\ifmt
|
||||||
subs w1, w1, #1 // height -= 1
|
subs w1, w1, #1 // height -= 1
|
||||||
b.gt 1b
|
b.gt 1b
|
||||||
|
mov w0, w9
|
||||||
ret
|
ret
|
||||||
endfunc
|
endfunc
|
||||||
.endm
|
.endm
|
||||||
|
|
Loading…
Reference in New Issue