[FFmpeg-cvslog] swscale/utils: Detect and skip unneeded sws_setColorspaceDetails() calls
Michael Niedermayer
git at videolan.org
Fri Jan 15 16:37:59 CET 2016
ffmpeg | branch: release/2.7 | Michael Niedermayer <michael at niedermayer.cc> | Thu Jan 14 15:11:48 2016 +0100| [119659b759a6840d7121340313d06cdc83215d7b] | committer: Michael Niedermayer
swscale/utils: Detect and skip unneeded sws_setColorspaceDetails() calls
This avoids running various table inits unnecessarily
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit cc538e9dbd14b61d1ac8c9fa687d83289673fe90)
Conflicts:
libswscale/utils.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=119659b759a6840d7121340313d06cdc83215d7b
---
libswscale/utils.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 66bce60..8dcc116 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -829,8 +829,6 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
const AVPixFmtDescriptor *desc_dst;
const AVPixFmtDescriptor *desc_src;
int need_reinit = 0;
- memmove(c->srcColorspaceTable, inv_table, sizeof(int) * 4);
- memmove(c->dstColorspaceTable, table, sizeof(int) * 4);
handle_formats(c);
desc_dst = av_pix_fmt_desc_get(c->dstFormat);
@@ -841,11 +839,24 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
if(!isYUV(c->srcFormat) && !isGray(c->srcFormat))
srcRange = 0;
+ if (c->srcRange != srcRange ||
+ c->dstRange != dstRange ||
+ c->brightness != brightness ||
+ c->contrast != contrast ||
+ c->saturation != saturation ||
+ memcmp(c->srcColorspaceTable, inv_table, sizeof(int) * 4) ||
+ memcmp(c->dstColorspaceTable, table, sizeof(int) * 4)
+ )
+ need_reinit = 1;
+
+ memmove(c->srcColorspaceTable, inv_table, sizeof(int) * 4);
+ memmove(c->dstColorspaceTable, table, sizeof(int) * 4);
+
+
+
c->brightness = brightness;
c->contrast = contrast;
c->saturation = saturation;
- if (c->srcRange != srcRange || c->dstRange != dstRange)
- need_reinit = 1;
c->srcRange = srcRange;
c->dstRange = dstRange;
@@ -860,6 +871,9 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
c->dstFormatBpp = av_get_bits_per_pixel(desc_dst);
c->srcFormatBpp = av_get_bits_per_pixel(desc_src);
+ if (!need_reinit)
+ return 0;
+
if (!isYUV(c->dstFormat) && !isGray(c->dstFormat)) {
ff_yuv2rgb_c_init_tables(c, inv_table, srcRange, brightness,
contrast, saturation);
More information about the ffmpeg-cvslog
mailing list