summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libswscale/swscale_internal.h4
-rw-r--r--libswscale/utils.c13
2 files changed, 12 insertions, 5 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 36ce1ea661..c4ea26f694 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -478,8 +478,8 @@ typedef struct SwsContext {
/* pre defined color-spaces gamma */
#define XYZ_GAMMA (2.6f)
#define RGB_GAMMA (2.2f)
- int16_t xyzgamma[4096];
- int16_t rgbgamma[4096];
+ int16_t *xyzgamma;
+ int16_t *rgbgamma;
int16_t xyz2rgb_matrix[3][4];
/* function pointers for swScale() */
diff --git a/libswscale/utils.c b/libswscale/utils.c
index f13fec8977..f0139401fc 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -904,13 +904,20 @@ static void fill_xyztables(struct SwsContext *c)
{13270, -6295, -2041},
{-3969, 7682, 170},
{ 228, -835, 4329} };
+ static int16_t xyzgamma_tab[4096], rgbgamma_tab[4096];
+
+ memcpy(c->xyz2rgb_matrix, xyz2rgb_matrix, sizeof(c->xyz2rgb_matrix));
+ c->xyzgamma = xyzgamma_tab;
+ c->rgbgamma = rgbgamma_tab;
+
+ if (rgbgamma_tab[4095])
+ return;
/* set gamma vectors */
for (i = 0; i < 4096; i++) {
- c->xyzgamma[i] = lrint(pow(i / 4095.0, xyzgamma) * 4095.0);
- c->rgbgamma[i] = lrint(pow(i / 4095.0, rgbgamma) * 4095.0);
+ xyzgamma_tab[i] = lrint(pow(i / 4095.0, xyzgamma) * 4095.0);
+ rgbgamma_tab[i] = lrint(pow(i / 4095.0, rgbgamma) * 4095.0);
}
- memcpy(c->xyz2rgb_matrix, xyz2rgb_matrix, sizeof(c->xyz2rgb_matrix));
}
int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],