21 Dec 2021, 20:18 by andreas.rheinha...@outlook.com:
> Lynne:
>
>>
>> + if (filterSize > 4) {
>> + int16_t *tmp2 = av_malloc(dstW * filterSize * 2);
>> + if (!tmp2)
>> + return AVERROR(ENOMEM);
>> +
>> + memcpy(tmp2, filter, dstW * filterSize * 2);
>>
>
> Could use av_memdup().
>
v2 attached, also fixed lack of return value on 32-bit systems
>From c51f30db86912e400a886de71e5e208062cb98de Mon Sep 17 00:00:00 2001
From: Lynne <d...@lynne.ee>
Date: Tue, 21 Dec 2021 19:14:56 +0100
Subject: [PATCH v2] swscale: fix style issues and check malloc in
ff_shuffle_filter_coefficients
---
libswscale/swscale_internal.h | 2 +-
libswscale/utils.c | 65 +++++++++++++++++++++--------------
2 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 64aa0b9804..e834f2aa91 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -1106,5 +1106,5 @@ void ff_sws_slice_worker(void *priv, int jobnr, int threadnr,
#define MAX_LINES_AHEAD 4
//shuffle filter and filterPos for hyScale and hcScale filters in avx2
-void ff_shuffle_filter_coefficients(SwsContext *c, int* filterPos, int filterSize, int16_t *filter, int dstW);
+int ff_shuffle_filter_coefficients(SwsContext *c, int* filterPos, int filterSize, int16_t *filter, int dstW);
#endif /* SWSCALE_SWSCALE_INTERNAL_H */
diff --git a/libswscale/utils.c b/libswscale/utils.c
index d4a72d3ce1..c3ccc99be1 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -278,39 +278,43 @@ static const FormatEntry format_entries[] = {
[AV_PIX_FMT_P416LE] = { 1, 0 },
};
-void ff_shuffle_filter_coefficients(SwsContext *c, int *filterPos, int filterSize, int16_t *filter, int dstW){
+int ff_shuffle_filter_coefficients(SwsContext *c, int *filterPos,
+ int filterSize, int16_t *filter, int dstW)
+{
#if ARCH_X86_64
- int i, j, k, l;
int cpu_flags = av_get_cpu_flags();
- if (EXTERNAL_AVX2_FAST(cpu_flags)){
- if ((c->srcBpc == 8) && (c->dstBpc <= 14)){
- if (dstW % 16 == 0){
- if (filter != NULL){
- for (i = 0; i < dstW; i += 8){
- FFSWAP(int, filterPos[i + 2], filterPos[i+4]);
- FFSWAP(int, filterPos[i + 3], filterPos[i+5]);
- }
- if (filterSize > 4){
- int16_t *tmp2 = av_malloc(dstW * filterSize * 2);
- memcpy(tmp2, filter, dstW * filterSize * 2);
- for (i = 0; i < dstW; i += 16){//pixel
- for (k = 0; k < filterSize / 4; ++k){//fcoeff
- for (j = 0; j < 16; ++j){//inner pixel
- for (l = 0; l < 4; ++l){//coeff
- int from = i * filterSize + j * filterSize + k * 4 + l;
- int to = (i) * filterSize + j * 4 + l + k * 64;
- filter[to] = tmp2[from];
- }
- }
- }
+
+ if (!EXTERNAL_AVX2_FAST(cpu_flags))
+ return 0;
+
+ if ((c->srcBpc == 8) && (c->dstBpc <= 14) && !(dstW % 16) && filter) {
+ for (int i = 0; i < dstW; i += 8) {
+ FFSWAP(int, filterPos[i + 2], filterPos[i+4]);
+ FFSWAP(int, filterPos[i + 3], filterPos[i+5]);
+ }
+
+ if (filterSize > 4) {
+ int16_t *tmp2 = av_memdup(filter, dstW * filterSize * 2);
+ if (!tmp2)
+ return AVERROR(ENOMEM);
+
+ for (int i = 0; i < dstW; i += 16) { //pixel
+ for (int k = 0; k < filterSize / 4; k++) { //fcoeff
+ for (int j = 0; j < 16; j++) { //inner pixel
+ for (int l = 0; l < 4; l++) { //coeff
+ int from = i * filterSize + j * filterSize + k * 4 + l;
+ int to = (i) * filterSize + j * 4 + l + k * 64;
+ filter[to] = tmp2[from];
}
- av_free(tmp2);
}
}
}
+ av_free(tmp2);
}
}
#endif
+
+ return 0;
}
int sws_isSupportedInput(enum AVPixelFormat pix_fmt)
@@ -1836,7 +1840,12 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
get_local_pos(c, 0, 0, 0),
get_local_pos(c, 0, 0, 0))) < 0)
goto fail;
- ff_shuffle_filter_coefficients(c, c->hLumFilterPos, c->hLumFilterSize, c->hLumFilter, dstW);
+
+ if ((ret = ff_shuffle_filter_coefficients(c, c->hLumFilterPos,
+ c->hLumFilterSize,
+ c->hLumFilter, dstW)))
+ goto fail;
+
if ((ret = initFilter(&c->hChrFilter, &c->hChrFilterPos,
&c->hChrFilterSize, c->chrXInc,
c->chrSrcW, c->chrDstW, filterAlign, 1 << 14,
@@ -1846,7 +1855,11 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
get_local_pos(c, c->chrSrcHSubSample, c->src_h_chr_pos, 0),
get_local_pos(c, c->chrDstHSubSample, c->dst_h_chr_pos, 0))) < 0)
goto fail;
- ff_shuffle_filter_coefficients(c, c->hChrFilterPos, c->hChrFilterSize, c->hChrFilter, c->chrDstW);
+
+ if ((ret = ff_shuffle_filter_coefficients(c, c->hChrFilterPos,
+ c->hChrFilterSize,
+ c->hChrFilter, c->chrDstW)))
+ goto fail;
}
} // initialize horizontal stuff
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
