diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-14 15:11:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-14 15:46:55 +0100 |
| commit | cc538e9dbd14b61d1ac8c9fa687d83289673fe90 (patch) | |
| tree | ff846770cbefb3ba81d43aeb559e4d12e8eff98b | |
| parent | 8f3a9a8c278acf886f70a1d743bc07b6f9c7b51a (diff) | |
swscale/utils: Detect and skip unneeded sws_setColorspaceDetails() calls
This avoids running various table inits unnecessarily
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libswscale/utils.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index 1875a54772..74f0bd321e 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -832,8 +832,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); @@ -844,11 +842,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; @@ -863,6 +874,9 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], if (c->cascaded_context[c->cascaded_mainindex]) return sws_setColorspaceDetails(c->cascaded_context[c->cascaded_mainindex],inv_table, srcRange,table, dstRange, brightness, contrast, saturation); + if (!need_reinit) + return 0; + if ((isYUV(c->dstFormat) || isGray(c->dstFormat)) && (isYUV(c->srcFormat) || isGray(c->srcFormat))) { if (!c->cascaded_context[0] && memcmp(c->dstColorspaceTable, c->srcColorspaceTable, sizeof(int) * 4) && |