-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
vo_opengl: split into multiple files, convert to new option API
gl_video.c contains all rendering code, gl_lcms.c the .icc loader and creation of 3D LUT (and all LittleCMS specific code). vo_opengl.c is reduced to interfacing between the various parts.
- Loading branch information
wm4
committed
Mar 28, 2013
1 parent
16e951c
commit 6ef06aa
Showing
12 changed files
with
2,195 additions
and
1,970 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,212 @@ | ||
| /* | ||
| * This file is part of mpv. | ||
| * | ||
| * mpv is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * mpv is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along | ||
| * with mpv. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * You can alternatively redistribute this file and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| */ | ||
|
|
||
| #include <string.h> | ||
| #include <lcms2.h> | ||
|
|
||
| #include "talloc.h" | ||
|
|
||
| #include "config.h" | ||
|
|
||
| #include "stream/stream.h" | ||
| #include "core/mp_common.h" | ||
| #include "core/bstr.h" | ||
| #include "core/mp_msg.h" | ||
| #include "core/m_option.h" | ||
|
|
||
| #include "gl_video.h" | ||
| #include "gl_lcms.h" | ||
|
|
||
| static bool parse_3dlut_size(const char *s, int *p1, int *p2, int *p3) | ||
| { | ||
| if (sscanf(s, "%dx%dx%d", p1, p2, p3) != 3) | ||
| return false; | ||
| for (int n = 0; n < 3; n++) { | ||
| int s = ((int[]) { *p1, *p2, *p3 })[n]; | ||
| if (s < 2 || s > 256 || ((s - 1) & s)) | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| static int validate_3dlut_size_opt(const m_option_t *opt, struct bstr name, | ||
| struct bstr param) | ||
| { | ||
| int p1, p2, p3; | ||
| char s[20]; | ||
| snprintf(s, sizeof(s), "%.*s", BSTR_P(param)); | ||
| return parse_3dlut_size(s, &p1, &p2, &p3); | ||
| } | ||
|
|
||
| #define OPT_BASE_STRUCT struct mp_icc_opts | ||
| const struct m_sub_options mp_icc_conf = { | ||
| .opts = (m_option_t[]) { | ||
| OPT_STRING("icc-profile", profile, 0), | ||
| OPT_STRING("icc-cache", cache, 0), | ||
| OPT_INT("icc-intent", intent, 0), | ||
| OPT_STRING_VALIDATE("3dlut-size", size_str, 0, validate_3dlut_size_opt), | ||
| {0} | ||
| }, | ||
| .size = sizeof(struct mp_icc_opts), | ||
| .defaults = &(const struct mp_icc_opts) { | ||
| .size_str = "128x256x64", | ||
| .intent = INTENT_ABSOLUTE_COLORIMETRIC, | ||
| }, | ||
| }; | ||
|
|
||
| #ifdef CONFIG_LCMS2 | ||
|
|
||
| static void lcms2_error_handler(cmsContext ctx, cmsUInt32Number code, | ||
| const char *msg) | ||
| { | ||
| mp_msg(MSGT_VO, MSGL_ERR, "[gl] lcms2: %s\n", msg); | ||
| } | ||
|
|
||
| static struct bstr load_file(void *talloc_ctx, const char *filename) | ||
| { | ||
| struct bstr res = {0}; | ||
| stream_t *s = open_stream(filename, NULL, NULL); | ||
| if (s) { | ||
| res = stream_read_complete(s, talloc_ctx, 1000000000, 0); | ||
| free_stream(s); | ||
| } | ||
| return res; | ||
| } | ||
|
|
||
| #define LUT3D_CACHE_HEADER "mpv 3dlut cache 1.0\n" | ||
|
|
||
| struct lut3d *mp_load_icc(struct mp_icc_opts *opts) | ||
| { | ||
| int s_r, s_g, s_b; | ||
| if (!parse_3dlut_size(opts->size_str, &s_r, &s_g, &s_b)) | ||
| return NULL; | ||
|
|
||
| if (!opts->profile) | ||
| return NULL; | ||
|
|
||
| void *tmp = talloc_new(NULL); | ||
| uint16_t *output = talloc_array(tmp, uint16_t, s_r * s_g * s_b * 3); | ||
|
|
||
| mp_msg(MSGT_VO, MSGL_INFO, "[gl] Opening ICC profile '%s'\n", opts->profile); | ||
| struct bstr iccdata = load_file(tmp, opts->profile); | ||
| if (!iccdata.len) | ||
| goto error_exit; | ||
|
|
||
| char *cache_info = talloc_asprintf(tmp, "intent=%d, size=%dx%dx%d\n", | ||
| opts->intent, s_r, s_g, s_b); | ||
|
|
||
| // check cache | ||
| if (opts->cache) { | ||
| mp_msg(MSGT_VO, MSGL_INFO, "[gl] Opening 3D LUT cache in file '%s'.\n", | ||
| opts->cache); | ||
| struct bstr cachedata = load_file(tmp, opts->cache); | ||
| if (bstr_eatstart(&cachedata, bstr0(LUT3D_CACHE_HEADER)) | ||
| && bstr_eatstart(&cachedata, bstr0(cache_info)) | ||
| && bstr_eatstart(&cachedata, iccdata) | ||
| && cachedata.len == talloc_get_size(output)) | ||
| { | ||
| memcpy(output, cachedata.start, cachedata.len); | ||
| goto done; | ||
| } else { | ||
| mp_msg(MSGT_VO, MSGL_WARN, "[gl] 3D LUT cache invalid!\n"); | ||
| } | ||
| } | ||
|
|
||
| cmsSetLogErrorHandler(lcms2_error_handler); | ||
|
|
||
| cmsHPROFILE profile = cmsOpenProfileFromMem(iccdata.start, iccdata.len); | ||
| if (!profile) | ||
| goto error_exit; | ||
|
|
||
| cmsCIExyY d65; | ||
| cmsWhitePointFromTemp(&d65, 6504); | ||
| static const cmsCIExyYTRIPLE bt709prim = { | ||
| .Red = {0.64, 0.33, 1.0}, | ||
| .Green = {0.30, 0.60, 1.0}, | ||
| .Blue = {0.15, 0.06, 1.0}, | ||
| }; | ||
| cmsToneCurve *tonecurve = cmsBuildGamma(NULL, 1.0/0.45); | ||
| cmsHPROFILE vid_profile = cmsCreateRGBProfile(&d65, &bt709prim, | ||
| (cmsToneCurve*[3]){tonecurve, tonecurve, tonecurve}); | ||
| cmsFreeToneCurve(tonecurve); | ||
| cmsHTRANSFORM trafo = cmsCreateTransform(vid_profile, TYPE_RGB_16, | ||
| profile, TYPE_RGB_16, | ||
| opts->intent, | ||
| cmsFLAGS_HIGHRESPRECALC); | ||
| cmsCloseProfile(profile); | ||
| cmsCloseProfile(vid_profile); | ||
|
|
||
| if (!trafo) | ||
| goto error_exit; | ||
|
|
||
| // transform a (s_r)x(s_g)x(s_b) cube, with 3 components per channel | ||
| uint16_t *input = talloc_array(tmp, uint16_t, s_r * 3); | ||
| for (int b = 0; b < s_b; b++) { | ||
| for (int g = 0; g < s_g; g++) { | ||
| for (int r = 0; r < s_r; r++) { | ||
| input[r * 3 + 0] = r * 65535 / (s_r - 1); | ||
| input[r * 3 + 1] = g * 65535 / (s_g - 1); | ||
| input[r * 3 + 2] = b * 65535 / (s_b - 1); | ||
| } | ||
| size_t base = (b * s_r * s_g + g * s_r) * 3; | ||
| cmsDoTransform(trafo, input, output + base, s_r); | ||
| } | ||
| } | ||
|
|
||
| cmsDeleteTransform(trafo); | ||
|
|
||
| if (opts->cache) { | ||
| FILE *out = fopen(opts->cache, "wb"); | ||
| if (out) { | ||
| fprintf(out, "%s%s", LUT3D_CACHE_HEADER, cache_info); | ||
| fwrite(iccdata.start, iccdata.len, 1, out); | ||
| fwrite(output, talloc_get_size(output), 1, out); | ||
| fclose(out); | ||
| } | ||
| } | ||
|
|
||
| done: ; | ||
|
|
||
| struct lut3d *lut = talloc_ptrtype(NULL, lut); | ||
| *lut = (struct lut3d) { | ||
| .data = talloc_steal(lut, output), | ||
| .size = {s_r, s_g, s_b}, | ||
| }; | ||
|
|
||
| talloc_free(tmp); | ||
| return lut; | ||
|
|
||
| error_exit: | ||
| mp_msg(MSGT_VO, MSGL_FATAL, "[gl] Error loading ICC profile.\n"); | ||
| talloc_free(tmp); | ||
| return NULL; | ||
| } | ||
|
|
||
| #else /* CONFIG_LCMS2 */ | ||
|
|
||
| struct lut3d *mp_load_icc(struct mp_icc_opts *opts) | ||
| { | ||
| mp_msg(MSGT_VO, MSGL_FATAL, "[gl] LCMS2 support not compiled.\n"); | ||
| return NULL; | ||
| } | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #ifndef MP_GL_LCMS_H | ||
| #define MP_GL_LCMS_H | ||
|
|
||
| extern const struct m_sub_options mp_icc_conf; | ||
|
|
||
| struct mp_icc_opts { | ||
| char *profile; | ||
| char *cache; | ||
| char *size_str; | ||
| int intent; | ||
| }; | ||
|
|
||
| struct lut3d; | ||
| struct lut3d *mp_load_icc(struct mp_icc_opts *opts); | ||
|
|
||
| #endif |
Oops, something went wrong.