RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-26 17:12:36 +00:00
Code Issues Releases Wiki Activity

vo_opengl: gl_lcms: implement change detection for memory profiles

Browse Source 
This affects OSX, where memory profiles are updated e.g. on fullscreen
switches. The profile most likely doesn't change, but the LUT will
be generated and reloaded anyway.

Somewhat of a regression from commit f811348.

Fixes #1439.
This commit is contained in:
wm4 2015-01-08 01:00:42 +01:00
parent ae8a91d6b6
commit d6aac7f930
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
video/out/gl_lcms.c
View File

@ -44,6 +44,7 @@ struct gl_lcms {
void *icc_data;
size_t icc_size;
char *icc_path;
bool changed;
struct mp_log *log;
struct mpv_global *global;
@ -134,6 +135,7 @@ struct gl_lcms *gl_lcms_init(void *talloc_ctx, struct mp_log *log,
*p = (struct gl_lcms) {
.global = global,
.log = log,
.changed = true,
};
return p;
}
@ -143,6 +145,7 @@ void gl_lcms_set_options(struct gl_lcms *p, struct mp_icc_opts *opts)
p->opts = *opts;
p->icc_path = talloc_strdup(p, p->opts.profile);
load_profile(p);
p->changed = true; // probably
}
// Warning: profile.start must point to a ta allocation, and the function
@ -152,6 +155,16 @@ void gl_lcms_set_memory_profile(struct gl_lcms *p, bstr *profile)
if (!p->opts.profile_auto)
return;
if (!p->icc_path && p->icc_data && profile->start &&
profile->len == p->icc_size &&
memcmp(profile->start, p->icc_data, p->icc_size) == 0)
{
talloc_free(profile->start);
return;
}
p->changed = true;
talloc_free(p->icc_path);
p->icc_path = NULL;
@ -161,6 +174,15 @@ void gl_lcms_set_memory_profile(struct gl_lcms *p, bstr *profile)
p->icc_size = profile->len;
}
// Return and _reset_ whether the lookul table has changed since the last call.
// If it has changed, gl_lcms_get_lut3d() should be called.
bool gl_lcms_has_changed(struct gl_lcms *p)
{
bool change = p->changed;
p->changed = false;
return change;
}
#define LUT3D_CACHE_HEADER "mpv 3dlut cache 1.0\n"
bool gl_lcms_get_lut3d(struct gl_lcms *p, struct lut3d **result_lut3d)
@ -313,5 +335,6 @@ struct gl_lcms *gl_lcms_init(void *talloc_ctx, struct mp_log *log,
void gl_lcms_set_options(struct gl_lcms *p, struct mp_icc_opts *opts) { }
void gl_lcms_set_memory_profile(struct gl_lcms *p, bstr *profile) { }
bool gl_lcms_get_lut3d(struct gl_lcms *p, struct lut3d **x) { return false; }
bool gl_lcms_has_changed(struct gl_lcms *p) { return false; }
#endif

1
video/out/gl_lcms.h
View File

@ -25,5 +25,6 @@ struct gl_lcms *gl_lcms_init(void *talloc_ctx, struct mp_log *log,
void gl_lcms_set_options(struct gl_lcms *p, struct mp_icc_opts *opts);
void gl_lcms_set_memory_profile(struct gl_lcms *p, bstr *profile);
bool gl_lcms_get_lut3d(struct gl_lcms *p, struct lut3d **);
bool gl_lcms_has_changed(struct gl_lcms *p);
#endif

2
video/out/vo_opengl.c
View File

@ -244,6 +244,8 @@ static void call_request_hwdec_api(struct mp_hwdec_info *info,
static bool update_icc_profile(struct gl_priv *p)
{
struct lut3d *lut3d = NULL;
if (!gl_lcms_has_changed(p->cms))
return true;
if (gl_lcms_get_lut3d(p->cms, &lut3d) && !lut3d)
return false;
gl_video_set_lut3d(p->renderer, lut3d);