[FFmpeg-cvslog] sws: factor out cascaded scaling
Anton Khirnov
git at videolan.org
Sat Jul 3 17:20:07 EEST 2021
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed May 19 11:47:42 2021 +0200| [f136493d03c2bca7518fbcbc9b0a1f3abd27d9d4] | committer: Anton Khirnov
sws: factor out cascaded scaling
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f136493d03c2bca7518fbcbc9b0a1f3abd27d9d4
---
libswscale/swscale.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 72285c3547..867995c9c7 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -842,6 +842,22 @@ static int scale_gamma(SwsContext *c,
return ret;
}
+static int scale_cascaded(SwsContext *c,
+ const uint8_t * const srcSlice[], const int srcStride[],
+ int srcSliceY, int srcSliceH,
+ uint8_t * const dst[], const int dstStride[])
+{
+ int ret = sws_scale(c->cascaded_context[0],
+ srcSlice, srcStride, srcSliceY, srcSliceH,
+ c->cascaded_tmp, c->cascaded_tmpStride);
+ if (ret < 0)
+ return ret;
+ ret = sws_scale(c->cascaded_context[1],
+ (const uint8_t * const * )c->cascaded_tmp, c->cascaded_tmpStride, 0, c->cascaded_context[0]->dstH,
+ dst, dstStride);
+ return ret;
+}
+
/**
* swscale wrapper, so we don't need to export the SwsContext.
* Assumes planar YUV to be in YUV order instead of YVU.
@@ -882,17 +898,8 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
if (c->gamma_flag && c->cascaded_context[0])
return scale_gamma(c, srcSlice, srcStride, srcSliceY, srcSliceH, dst, dstStride);
- if (c->cascaded_context[0] && srcSliceY == 0 && srcSliceH == c->cascaded_context[0]->srcH) {
- ret = sws_scale(c->cascaded_context[0],
- srcSlice, srcStride, srcSliceY, srcSliceH,
- c->cascaded_tmp, c->cascaded_tmpStride);
- if (ret < 0)
- return ret;
- ret = sws_scale(c->cascaded_context[1],
- (const uint8_t * const * )c->cascaded_tmp, c->cascaded_tmpStride, 0, c->cascaded_context[0]->dstH,
- dst, dstStride);
- return ret;
- }
+ if (c->cascaded_context[0] && srcSliceY == 0 && srcSliceH == c->cascaded_context[0]->srcH)
+ return scale_cascaded(c, srcSlice, srcStride, srcSliceY, srcSliceH, dst, dstStride);
memcpy(src2, srcSlice, sizeof(src2));
memcpy(dst2, dst, sizeof(dst2));
More information about the ffmpeg-cvslog
mailing list