Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2022-03-18 23:28:04 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-03-21 18:38:13 +0300
commit8530e48f8692f4b92c43489029f2d2ef67c7cb62 (patch)
treed335479baf037b897ddf14f42c238184f65d0472 /source/blender/render
parentb96462519f748fcf04028084354fbbf97eb8ce92 (diff)
Cleanup: move render image and multilayer EXR write code to image_save.cc
These share a lot of logic with regular image saving and should be unified more in the future.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/RE_pipeline.h31
-rw-r--r--source/blender/render/intern/pipeline.c171
-rw-r--r--source/blender/render/intern/render_result.c199
-rw-r--r--source/blender/render/intern/render_result.h1
4 files changed, 34 insertions, 368 deletions
diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h
index a8436772299..f093f1f6e15 100644
--- a/source/blender/render/RE_pipeline.h
+++ b/source/blender/render/RE_pipeline.h
@@ -242,10 +242,13 @@ void RE_AcquiredResultGet32(struct Render *re,
unsigned int *rect,
int view_id);
+struct ImBuf *RE_render_result_rect_to_ibuf(struct RenderResult *rr,
+ const struct ImageFormatData *imf,
+ const float dither,
+ const int view_id);
void RE_render_result_rect_from_ibuf(struct RenderResult *rr,
- struct RenderData *rd,
- struct ImBuf *ibuf,
- int view_id);
+ const struct ImBuf *ibuf,
+ const int view_id);
struct RenderLayer *RE_GetRenderLayer(struct RenderResult *rr, const char *name);
float *RE_RenderLayerGetPass(struct RenderLayer *rl, const char *name, const char *viewname);
@@ -305,11 +308,6 @@ void RE_GetViewPlane(struct Render *re, rctf *r_viewplane, rcti *r_disprect);
*/
void RE_init_threadcount(Render *re);
-bool RE_WriteRenderViewsImage(struct ReportList *reports,
- struct RenderResult *rr,
- struct Scene *scene,
- bool stamp,
- char *name);
bool RE_WriteRenderViewsMovie(struct ReportList *reports,
struct RenderResult *rr,
struct Scene *scene,
@@ -372,16 +370,7 @@ void RE_PreviewRender(struct Render *re, struct Main *bmain, struct Scene *scene
* Only the temp file!
*/
bool RE_ReadRenderResult(struct Scene *scene, struct Scene *scenode);
-/**
- * Called from the UI and render pipeline, to save multi-layer and multi-view
- * images, optionally isolating a specific, view, layer or RGBA/Z pass.
- */
-bool RE_WriteRenderResult(struct ReportList *reports,
- RenderResult *rr,
- const char *filename,
- struct ImageFormatData *imf,
- const char *view,
- int layer);
+
struct RenderResult *RE_MultilayerConvert(
void *exrhandle, const char *colorspace, bool predivide, int rectx, int recty);
@@ -463,9 +452,9 @@ bool RE_allow_render_generic_object(struct Object *ob);
/******* defined in render_result.c *********/
-bool RE_HasCombinedLayer(RenderResult *res);
-bool RE_HasFloatPixels(RenderResult *res);
-bool RE_RenderResult_is_stereo(RenderResult *res);
+bool RE_HasCombinedLayer(const RenderResult *res);
+bool RE_HasFloatPixels(const RenderResult *res);
+bool RE_RenderResult_is_stereo(const RenderResult *res);
struct RenderView *RE_RenderViewGetById(struct RenderResult *rr, int view_id);
struct RenderView *RE_RenderViewGetByName(struct RenderResult *rr, const char *viewname);
diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c
index 614c03eba11..0ca2ca82cf7 100644
--- a/source/blender/render/intern/pipeline.c
+++ b/source/blender/render/intern/pipeline.c
@@ -45,6 +45,7 @@
#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_image_format.h"
+#include "BKE_image_save.h"
#include "BKE_layer.h"
#include "BKE_lib_id.h"
#include "BKE_lib_remap.h"
@@ -223,41 +224,6 @@ static void stats_background(void *UNUSED(arg), RenderStats *rs)
fflush(stdout);
}
-static void render_print_save_message(ReportList *reports, const char *name, int ok, int err)
-{
- if (ok) {
- /* no need to report, just some helpful console info */
- printf("Saved: '%s'\n", name);
- }
- else {
- /* report on error since users will want to know what failed */
- BKE_reportf(reports, RPT_ERROR, "Render error (%s) cannot save: '%s'", strerror(err), name);
- }
-}
-
-static int render_imbuf_write_stamp_test(ReportList *reports,
- Scene *scene,
- struct RenderResult *rr,
- ImBuf *ibuf,
- const char *name,
- const ImageFormatData *imf,
- bool stamp)
-{
- int ok;
-
- if (stamp) {
- /* writes the name of the individual cameras */
- ok = BKE_imbuf_write_stamp(scene, rr, ibuf, name, imf);
- }
- else {
- ok = BKE_imbuf_write(ibuf, name, imf);
- }
-
- render_print_save_message(reports, name, ok, errno);
-
- return ok;
-}
-
void RE_FreeRenderResult(RenderResult *rr)
{
render_result_free(rr);
@@ -1385,7 +1351,7 @@ static void do_render_sequencer(Render *re)
if (ibuf_arr[view_id]) {
/* copy ibuf into combined pixel rect */
- RE_render_result_rect_from_ibuf(rr, &re->r, ibuf_arr[view_id], view_id);
+ RE_render_result_rect_from_ibuf(rr, ibuf_arr[view_id], view_id);
if (ibuf_arr[view_id]->metadata && (re->r.stamp & R_STAMP_STRIPMETA)) {
/* ensure render stamp info first */
@@ -1979,129 +1945,6 @@ void RE_RenderFreestyleExternal(Render *re)
/** \name Read/Write Render Result (Images & Movies)
* \{ */
-bool RE_WriteRenderViewsImage(
- ReportList *reports, RenderResult *rr, Scene *scene, const bool stamp, char *name)
-{
- bool ok = true;
- RenderData *rd = &scene->r;
-
- if (!rr) {
- return false;
- }
-
- bool is_mono = BLI_listbase_count_at_most(&rr->views, 2) < 2;
- bool is_exr_rr = ELEM(rd->im_format.imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER) &&
- RE_HasFloatPixels(rr);
-
- if (rd->im_format.views_format == R_IMF_VIEWS_MULTIVIEW && is_exr_rr) {
- ok = RE_WriteRenderResult(reports, rr, name, &rd->im_format, NULL, -1);
- render_print_save_message(reports, name, ok, errno);
- }
-
- /* mono, legacy code */
- else if (is_mono || (rd->im_format.views_format == R_IMF_VIEWS_INDIVIDUAL)) {
- RenderView *rv;
- int view_id;
- char filepath[FILE_MAX];
-
- BLI_strncpy(filepath, name, sizeof(filepath));
-
- for (view_id = 0, rv = rr->views.first; rv; rv = rv->next, view_id++) {
- if (!is_mono) {
- BKE_scene_multiview_view_filepath_get(&scene->r, filepath, rv->name, name);
- }
-
- if (is_exr_rr) {
- ok = RE_WriteRenderResult(reports, rr, name, &rd->im_format, rv->name, -1);
- render_print_save_message(reports, name, ok, errno);
-
- /* optional preview images for exr */
- if (ok && (rd->im_format.flag & R_IMF_FLAG_PREVIEW_JPG)) {
- ImageFormatData imf = rd->im_format;
- imf.imtype = R_IMF_IMTYPE_JPEG90;
-
- if (BLI_path_extension_check(name, ".exr")) {
- name[strlen(name) - 4] = 0;
- }
- BKE_image_path_ensure_ext_from_imformat(name, &imf);
-
- ImBuf *ibuf = render_result_rect_to_ibuf(rr, rd, view_id);
- ibuf->planes = 24;
- IMB_colormanagement_imbuf_for_write(
- ibuf, true, false, &scene->view_settings, &scene->display_settings, &imf);
-
- ok = render_imbuf_write_stamp_test(reports, scene, rr, ibuf, name, &imf, stamp);
-
- IMB_freeImBuf(ibuf);
- }
- }
- else {
- ImBuf *ibuf = render_result_rect_to_ibuf(rr, rd, view_id);
-
- IMB_colormanagement_imbuf_for_write(
- ibuf, true, false, &scene->view_settings, &scene->display_settings, &rd->im_format);
-
- ok = render_imbuf_write_stamp_test(reports, scene, rr, ibuf, name, &rd->im_format, stamp);
-
- /* imbuf knows which rects are not part of ibuf */
- IMB_freeImBuf(ibuf);
- }
- }
- }
- else { /* R_IMF_VIEWS_STEREO_3D */
- BLI_assert(scene->r.im_format.views_format == R_IMF_VIEWS_STEREO_3D);
-
- if (rd->im_format.imtype == R_IMF_IMTYPE_MULTILAYER) {
- printf("Stereo 3D not supported for MultiLayer image: %s\n", name);
- }
- else {
- ImBuf *ibuf_arr[3] = {NULL};
- const char *names[2] = {STEREO_LEFT_NAME, STEREO_RIGHT_NAME};
- int i;
-
- for (i = 0; i < 2; i++) {
- int view_id = BLI_findstringindex(&rr->views, names[i], offsetof(RenderView, name));
- ibuf_arr[i] = render_result_rect_to_ibuf(rr, rd, view_id);
- IMB_colormanagement_imbuf_for_write(ibuf_arr[i],
- true,
- false,
- &scene->view_settings,
- &scene->display_settings,
- &scene->r.im_format);
- IMB_prepare_write_ImBuf(IMB_isfloat(ibuf_arr[i]), ibuf_arr[i]);
- }
-
- ibuf_arr[2] = IMB_stereo3d_ImBuf(&scene->r.im_format, ibuf_arr[0], ibuf_arr[1]);
-
- ok = render_imbuf_write_stamp_test(
- reports, scene, rr, ibuf_arr[2], name, &rd->im_format, stamp);
-
- /* optional preview images for exr */
- if (ok && is_exr_rr && (rd->im_format.flag & R_IMF_FLAG_PREVIEW_JPG)) {
- ImageFormatData imf = rd->im_format;
- imf.imtype = R_IMF_IMTYPE_JPEG90;
-
- if (BLI_path_extension_check(name, ".exr")) {
- name[strlen(name) - 4] = 0;
- }
-
- BKE_image_path_ensure_ext_from_imformat(name, &imf);
- ibuf_arr[2]->planes = 24;
-
- ok = render_imbuf_write_stamp_test(
- reports, scene, rr, ibuf_arr[2], name, &rd->im_format, stamp);
- }
-
- /* imbuf knows which rects are not part of ibuf */
- for (i = 0; i < 3; i++) {
- IMB_freeImBuf(ibuf_arr[i]);
- }
- }
- }
-
- return ok;
-}
-
bool RE_WriteRenderViewsMovie(ReportList *reports,
RenderResult *rr,
Scene *scene,
@@ -2111,20 +1954,20 @@ bool RE_WriteRenderViewsMovie(ReportList *reports,
const int totvideos,
bool preview)
{
- bool is_mono;
bool ok = true;
if (!rr) {
return false;
}
- is_mono = BLI_listbase_count_at_most(&rr->views, 2) < 2;
+ const bool is_mono = BLI_listbase_count_at_most(&rr->views, 2) < 2;
+ const float dither = scene->r.dither_intensity;
if (is_mono || (scene->r.im_format.views_format == R_IMF_VIEWS_INDIVIDUAL)) {
int view_id;
for (view_id = 0; view_id < totvideos; view_id++) {
const char *suffix = BKE_scene_multiview_view_id_suffix_get(&scene->r, view_id);
- ImBuf *ibuf = render_result_rect_to_ibuf(rr, &scene->r, view_id);
+ ImBuf *ibuf = RE_render_result_rect_to_ibuf(rr, &rd->im_format, dither, view_id);
IMB_colormanagement_imbuf_for_write(
ibuf, true, false, &scene->view_settings, &scene->display_settings, &scene->r.im_format);
@@ -2153,7 +1996,7 @@ bool RE_WriteRenderViewsMovie(ReportList *reports,
for (i = 0; i < 2; i++) {
int view_id = BLI_findstringindex(&rr->views, names[i], offsetof(RenderView, name));
- ibuf_arr[i] = render_result_rect_to_ibuf(rr, &scene->r, view_id);
+ ibuf_arr[i] = RE_render_result_rect_to_ibuf(rr, &rd->im_format, dither, view_id);
IMB_colormanagement_imbuf_for_write(ibuf_arr[i],
true,
@@ -2225,7 +2068,7 @@ static int do_write_image_or_movie(Render *re,
}
/* write images as individual images or stereo */
- ok = RE_WriteRenderViewsImage(re->reports, &rres, scene, true, name);
+ ok = BKE_image_render_write(re->reports, &rres, scene, true, name);
}
RE_ReleaseResultImageViews(re, &rres);
diff --git a/source/blender/render/intern/render_result.c b/source/blender/render/intern/render_result.c
index f4ae3caa77b..d938c15e35e 100644
--- a/source/blender/render/intern/render_result.c
+++ b/source/blender/render/intern/render_result.c
@@ -27,6 +27,7 @@
#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_image_format.h"
+#include "BKE_image_save.h"
#include "BKE_report.h"
#include "BKE_scene.h"
@@ -749,12 +750,6 @@ void render_result_views_new(RenderResult *rr, const RenderData *rd)
}
}
-bool render_result_has_views(const RenderResult *rr)
-{
- const RenderView *rv = rr->views.first;
- return (rv && (rv->next || rv->name[0]));
-}
-
/*********************************** Merge ***********************************/
static void do_merge_tile(
@@ -809,162 +804,6 @@ void render_result_merge(RenderResult *rr, RenderResult *rrpart)
}
}
-bool RE_WriteRenderResult(ReportList *reports,
- RenderResult *rr,
- const char *filename,
- ImageFormatData *imf,
- const char *view,
- int layer)
-{
- void *exrhandle = IMB_exr_get_handle();
- const bool half_float = (imf && imf->depth == R_IMF_CHAN_DEPTH_16);
- const bool multi_layer = !(imf && imf->imtype == R_IMF_IMTYPE_OPENEXR);
- const bool write_z = !multi_layer && (imf && (imf->flag & R_IMF_FLAG_ZBUF));
-
- /* Write first layer if not multilayer and no layer was specified. */
- if (!multi_layer && layer == -1) {
- layer = 0;
- }
-
- /* First add views since IMB_exr_add_channel checks number of views. */
- if (render_result_has_views(rr)) {
- LISTBASE_FOREACH (RenderView *, rview, &rr->views) {
- if (!view || STREQ(view, rview->name)) {
- IMB_exr_add_view(exrhandle, rview->name);
- }
- }
- }
-
- /* Compositing result. */
- if (rr->have_combined) {
- LISTBASE_FOREACH (RenderView *, rview, &rr->views) {
- if (!rview->rectf) {
- continue;
- }
-
- const char *viewname = rview->name;
- if (view) {
- if (!STREQ(view, viewname)) {
- continue;
- }
-
- viewname = "";
- }
-
- /* Skip compositing if only a single other layer is requested. */
- if (!multi_layer && layer != 0) {
- continue;
- }
-
- for (int a = 0; a < 4; a++) {
- char passname[EXR_PASS_MAXNAME];
- char layname[EXR_PASS_MAXNAME];
- const char *chan_id = "RGBA";
-
- if (multi_layer) {
- IMB_exr_channel_name(passname, NULL, "Combined", NULL, chan_id, a);
- BLI_strncpy(layname, "Composite", sizeof(layname));
- }
- else {
- passname[0] = chan_id[a];
- passname[1] = '\0';
- layname[0] = '\0';
- }
-
- IMB_exr_add_channel(exrhandle,
- layname,
- passname,
- viewname,
- 4,
- 4 * rr->rectx,
- rview->rectf + a,
- half_float);
- }
-
- if (write_z && rview->rectz) {
- const char *layname = (multi_layer) ? "Composite" : "";
- IMB_exr_add_channel(exrhandle, layname, "Z", viewname, 1, rr->rectx, rview->rectz, false);
- }
- }
- }
-
- /* Other render layers. */
- int nr = (rr->have_combined) ? 1 : 0;
- for (RenderLayer *rl = rr->layers.first; rl; rl = rl->next, nr++) {
- /* Skip other render layers if requested. */
- if (!multi_layer && nr != layer) {
- continue;
- }
-
- LISTBASE_FOREACH (RenderPass *, rp, &rl->passes) {
- /* Skip non-RGBA and Z passes if not using multi layer. */
- if (!multi_layer && !(STREQ(rp->name, RE_PASSNAME_COMBINED) || STREQ(rp->name, "") ||
- (STREQ(rp->name, RE_PASSNAME_Z) && write_z))) {
- continue;
- }
-
- /* Skip pass if it does not match the requested view(s). */
- const char *viewname = rp->view;
- if (view) {
- if (!STREQ(view, viewname)) {
- continue;
- }
-
- viewname = "";
- }
-
- /* We only store RGBA passes as half float, for
- * others precision loss can be problematic. */
- bool pass_half_float = half_float &&
- (STR_ELEM(rp->chan_id, "RGB", "RGBA", "R", "G", "B", "A"));
-
- for (int a = 0; a < rp->channels; a++) {
- /* Save Combined as RGBA if single layer save. */
- char passname[EXR_PASS_MAXNAME];
- char layname[EXR_PASS_MAXNAME];
-
- if (multi_layer) {
- IMB_exr_channel_name(passname, NULL, rp->name, NULL, rp->chan_id, a);
- BLI_strncpy(layname, rl->name, sizeof(layname));
- }
- else {
- passname[0] = rp->chan_id[a];
- passname[1] = '\0';
- layname[0] = '\0';
- }
-
- IMB_exr_add_channel(exrhandle,
- layname,
- passname,
- viewname,
- rp->channels,
- rp->channels * rr->rectx,
- rp->rect + a,
- pass_half_float);
- }
- }
- }
-
- errno = 0;
-
- BLI_make_existing_file(filename);
-
- int compress = (imf ? imf->exr_codec : 0);
- bool success = IMB_exr_begin_write(
- exrhandle, filename, rr->rectx, rr->recty, compress, rr->stamp_data);
- if (success) {
- IMB_exr_write_channels(exrhandle);
- }
- else {
- /* TODO: get the error from openexr's exception. */
- BKE_reportf(
- reports, RPT_ERROR, "Error writing render result, %s (see console)", strerror(errno));
- }
-
- IMB_exr_close(exrhandle);
- return success;
-}
-
/**************************** Single Layer Rendering *************************/
void render_result_single_layer_begin(Render *re)
@@ -1117,7 +956,7 @@ void render_result_exr_file_cache_write(Render *re)
render_result_exr_file_cache_path(re->scene, root, str);
printf("Caching exr file, %dx%d, %s\n", rr->rectx, rr->recty, str);
- RE_WriteRenderResult(NULL, rr, str, NULL, NULL, -1);
+ BKE_image_render_write_exr(NULL, rr, str, NULL, NULL, -1);
}
bool render_result_exr_file_cache_read(Render *re)
@@ -1153,9 +992,12 @@ bool render_result_exr_file_cache_read(Render *re)
/*************************** Combined Pixel Rect *****************************/
-ImBuf *render_result_rect_to_ibuf(RenderResult *rr, const RenderData *rd, const int view_id)
+ImBuf *RE_render_result_rect_to_ibuf(RenderResult *rr,
+ const ImageFormatData *imf,
+ const float dither,
+ const int view_id)
{
- ImBuf *ibuf = IMB_allocImBuf(rr->rectx, rr->recty, rd->im_format.planes, 0);
+ ImBuf *ibuf = IMB_allocImBuf(rr->rectx, rr->recty, imf->planes, 0);
RenderView *rv = RE_RenderViewGetById(rr, view_id);
/* if not exists, BKE_imbuf_write makes one */
@@ -1164,15 +1006,15 @@ ImBuf *render_result_rect_to_ibuf(RenderResult *rr, const RenderData *rd, const
ibuf->zbuf_float = rv->rectz;
/* float factor for random dither, imbuf takes care of it */
- ibuf->dither = rd->dither_intensity;
+ ibuf->dither = dither;
/* prepare to gamma correct to sRGB color space
* note that sequence editor can generate 8bpc render buffers
*/
if (ibuf->rect) {
- if (BKE_imtype_valid_depths(rd->im_format.imtype) &
+ if (BKE_imtype_valid_depths(imf->imtype) &
(R_IMF_CHAN_DEPTH_12 | R_IMF_CHAN_DEPTH_16 | R_IMF_CHAN_DEPTH_24 | R_IMF_CHAN_DEPTH_32)) {
- if (rd->im_format.depth == R_IMF_CHAN_DEPTH_8) {
+ if (imf->depth == R_IMF_CHAN_DEPTH_8) {
/* Higher depth bits are supported but not needed for current file output. */
ibuf->rect_float = NULL;
}
@@ -1188,7 +1030,7 @@ ImBuf *render_result_rect_to_ibuf(RenderResult *rr, const RenderData *rd, const
/* Color -> gray-scale. */
/* editing directly would alter the render view */
- if (rd->im_format.planes == R_IMF_PLANES_BW) {
+ if (imf->planes == R_IMF_PLANES_BW) {
ImBuf *ibuf_bw = IMB_dupImBuf(ibuf);
IMB_color_to_bw(ibuf_bw);
IMB_freeImBuf(ibuf);
@@ -1198,10 +1040,7 @@ ImBuf *render_result_rect_to_ibuf(RenderResult *rr, const RenderData *rd, const
return ibuf;
}
-void RE_render_result_rect_from_ibuf(RenderResult *rr,
- RenderData *UNUSED(rd),
- ImBuf *ibuf,
- const int view_id)
+void RE_render_result_rect_from_ibuf(RenderResult *rr, const ImBuf *ibuf, const int view_id)
{
RenderView *rv = RE_RenderViewGetById(rr, view_id);
@@ -1278,15 +1117,13 @@ void render_result_rect_get_pixels(RenderResult *rr,
/*************************** multiview functions *****************************/
-bool RE_HasCombinedLayer(RenderResult *rr)
+bool RE_HasCombinedLayer(const RenderResult *rr)
{
- RenderView *rv;
-
if (rr == NULL) {
return false;
}
- rv = rr->views.first;
+ const RenderView *rv = rr->views.first;
if (rv == NULL) {
return false;
}
@@ -1294,11 +1131,9 @@ bool RE_HasCombinedLayer(RenderResult *rr)
return (rv->rect32 || rv->rectf);
}
-bool RE_HasFloatPixels(RenderResult *rr)
+bool RE_HasFloatPixels(const RenderResult *rr)
{
- RenderView *rview;
-
- for (rview = rr->views.first; rview; rview = rview->next) {
+ for (const RenderView *rview = rr->views.first; rview; rview = rview->next) {
if (rview->rect32 && !rview->rectf) {
return false;
}
@@ -1307,7 +1142,7 @@ bool RE_HasFloatPixels(RenderResult *rr)
return true;
}
-bool RE_RenderResult_is_stereo(RenderResult *rr)
+bool RE_RenderResult_is_stereo(const RenderResult *rr)
{
if (!BLI_findstring(&rr->views, STEREO_LEFT_NAME, offsetof(RenderView, name))) {
return false;
diff --git a/source/blender/render/intern/render_result.h b/source/blender/render/intern/render_result.h
index 07929f4351f..30f49775562 100644
--- a/source/blender/render/intern/render_result.h
+++ b/source/blender/render/intern/render_result.h
@@ -131,7 +131,6 @@ void render_result_views_shallowcopy(struct RenderResult *dst, struct RenderResu
* Free the views created temporarily.
*/
void render_result_views_shallowdelete(struct RenderResult *rr);
-bool render_result_has_views(const struct RenderResult *rr);
#define FOREACH_VIEW_LAYER_TO_RENDER_BEGIN(re_, iter_) \
{ \