RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_opengl: minor simplification to gl_lcms_set_memory_profile() 

Passing the bstr thing as pointer makes no sense. Everywhere else bstr
structs are passed by value because they're so small. Only when it's
supposed to receive a return value they're not.
This commit is contained in:
wm4 2016-06-04 14:50:32 +02:00
parent a9ffe38aa1
commit 2dfea67f3b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
video/out/opengl/lcms.c
View File

@ -143,18 +143,18 @@ void gl_lcms_set_options(struct gl_lcms *p, struct mp_icc_opts *opts)
// Warning: profile.start must point to a ta allocation, and the function
// takes over ownership.
void gl_lcms_set_memory_profile(struct gl_lcms *p, bstr *profile)
void gl_lcms_set_memory_profile(struct gl_lcms *p, bstr profile)
{
if (!p->opts.profile_auto || (p->icc_path && p->icc_path[0])) {
talloc_free(profile->start);
talloc_free(profile.start);
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)
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);
talloc_free(profile.start);
return;
}
@ -165,8 +165,8 @@ void gl_lcms_set_memory_profile(struct gl_lcms *p, bstr *profile)
talloc_free(p->icc_data);
p->icc_data = talloc_steal(p, profile->start);
p->icc_size = profile->len;
p->icc_data = talloc_steal(p, profile.start);
p->icc_size = profile.len;
}
// Return and _reset_ whether the profile or config has changed since the last
@ -436,7 +436,7 @@ 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) { }
void gl_lcms_set_memory_profile(struct gl_lcms *p, bstr profile) { }
bool gl_lcms_has_changed(struct gl_lcms *p, enum mp_csp_prim prim,
enum mp_csp_trc trc)

2
video/out/opengl/lcms.h
View File

@ -28,7 +28,7 @@ struct gl_lcms;
struct gl_lcms *gl_lcms_init(void *talloc_ctx, struct mp_log *log,
struct mpv_global *global);
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);
void gl_lcms_set_memory_profile(struct gl_lcms *p, bstr profile);
bool gl_lcms_get_lut3d(struct gl_lcms *p, struct lut3d **,
enum mp_csp_prim prim, enum mp_csp_trc trc);
bool gl_lcms_has_changed(struct gl_lcms *p, enum mp_csp_prim prim,

2
video/out/opengl/video.c
View File

@ -613,7 +613,7 @@ static void uninit_rendering(struct gl_video *p)
// takes over ownership.
void gl_video_set_icc_profile(struct gl_video *p, bstr icc_data)
{
gl_lcms_set_memory_profile(p->cms, &icc_data);
gl_lcms_set_memory_profile(p->cms, icc_data);
if (p->use_lut_3d)
return;