X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.C;h=5b35292404b0f040ae6ae333433c479ba5a6ca60;hb=114b45040c8027671cbe50e7d6cecb28bf73b35f;hp=085384ae9b8ad3f2b165062f349897ff53acb7b3;hpb=d66e2dde00fcfbe27c461a9956e66753faa62c95;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C index 085384ae..5b352924 100644 --- a/cinelerra-5.1/cinelerra/render.C +++ b/cinelerra-5.1/cinelerra/render.C @@ -187,40 +187,12 @@ void MainPackageRenderer::set_progress(int64_t value) // If non interactive, print progress out if(!render->progress) - { - int64_t current_eta = render->progress_timer->get_scaled_difference(1000); - if(current_eta - render->last_eta > 1000) - { - double eta = 0; - - - if(render->total_rendered) - { - eta = current_eta / - 1000 * - render->progress_max / - render->total_rendered - - current_eta / - 1000; - } - - char string[BCTEXTLEN]; - Units::totext(string, - eta, - TIME_HMS2); - - printf("\r%d%% %s: %s ", - (int)(100 * (float)render->total_rendered / render->progress_max), - _("ETA"), string); - fflush(stdout); - render->last_eta = current_eta; - } - } + render->show_progress(); render->counter_lock->unlock(); -// This locks the preferences - if(mwindow) mwindow->preferences->copy_rates_from(preferences); + if( mwindow ) + mwindow->preferences->copy_rates_from(preferences); } int MainPackageRenderer::progress_cancelled() @@ -236,13 +208,13 @@ Render::Render(MWindow *mwindow) this->mwindow = mwindow; in_progress = 0; progress = 0; - preferences = 0; elapsed_time = 0.0; package_lock = new Mutex("Render::package_lock"); counter_lock = new Mutex("Render::counter_lock"); completion = new Condition(0, "Render::completion"); progress_timer = new Timer; range_type = RANGE_BACKCOMPAT; + preferences = new Preferences(); thread = new RenderThread(mwindow, this); render_window = 0; asset = 0; @@ -255,9 +227,7 @@ Render::~Render() delete package_lock; delete counter_lock; delete completion; -// May be owned by someone else. This is owned by mwindow, so we don't care -// about deletion. -// delete preferences; + delete preferences; delete progress_timer; if( asset ) asset->Garbage::remove_user(); delete thread; @@ -271,7 +241,7 @@ void Render::start_interactive() } else if( in_progress ) { int cx, cy; - mwindow->gui->get_abs_cursor_xy(cx, cy, 1); + mwindow->gui->get_abs_cursor(cx, cy, 1); ErrorBox error_box(_(PROGRAM_NAME ": Error"), cx, cy); error_box.create_objects(_("Already rendering")); error_box.raise_window(); @@ -295,7 +265,7 @@ void Render::start_batches(ArrayList *jobs) } else if( in_progress ) { int cx, cy; - mwindow->gui->get_abs_cursor_xy(cx, cy, 1); + mwindow->gui->get_abs_cursor(cx, cy, 1); ErrorBox error_box(_(PROGRAM_NAME ": Error"), cx, cy); error_box.create_objects("Already rendering"); error_box.raise_window(); @@ -308,19 +278,15 @@ void Render::start_batches(ArrayList *jobs) } void Render::start_batches(ArrayList *jobs, - BC_Hash *boot_defaults, - Preferences *preferences) + BC_Hash *boot_defaults, Preferences *batch_prefs) { mode = Render::BATCH; batch_cancelled = 0; + preferences->copy_from(batch_prefs); this->jobs = jobs; - this->preferences = preferences; completion->reset(); -PRINT_TRACE thread->run(); -PRINT_TRACE - this->preferences = 0; } @@ -351,6 +317,7 @@ void Render::handle_done_event(int result) // add to recentlist only on OK render_window->render_format->path_recent-> add_item(File::formattostr(asset->format), asset->path); + setenv("CIN_RENDER", asset->path, 1); } render_window = 0; } @@ -394,7 +361,7 @@ void Render::handle_close_event(int result) } if( err_msg ) { int cx, cy; - mwindow->gui->get_abs_cursor_xy(cx, cy, 1); + mwindow->gui->get_abs_cursor(cx, cy, 1); ErrorBox error_box(_(PROGRAM_NAME ": Error"),cx, cy); error_box.create_objects(err_msg); error_box.raise_window(); @@ -436,8 +403,6 @@ void Render::stop_operation() } } - - int Render::check_asset(EDL *edl, Asset &asset) { if(asset.video_data && @@ -477,25 +442,15 @@ int Render::check_asset(EDL *edl, Asset &asset) return 0; } -int Render::fix_strategy(int strategy, int use_renderfarm) +int Render::get_strategy(int use_renderfarm, int use_labels) { - if(use_renderfarm) - { - if(strategy == FILE_PER_LABEL) - strategy = FILE_PER_LABEL_FARM; - else - if(strategy == SINGLE_PASS) - strategy = SINGLE_PASS_FARM; - } - else - { - if(strategy == FILE_PER_LABEL_FARM) - strategy = FILE_PER_LABEL; - else - if(strategy == SINGLE_PASS_FARM) - strategy = SINGLE_PASS; - } - return strategy; + return use_renderfarm ? + (use_labels ? FILE_PER_LABEL_FARM : SINGLE_PASS_FARM) : + (use_labels ? FILE_PER_LABEL : SINGLE_PASS ) ; +} +int Render::get_strategy() +{ + return get_strategy(preferences->use_renderfarm, use_labels); } void Render::start_progress() @@ -543,6 +498,19 @@ void Render::stop_progress() progress = 0; } +void Render::show_progress() +{ + int64_t current_eta = progress_timer->get_scaled_difference(1000); + if (current_eta - last_eta < 1000 ) return; + double eta = !total_rendered ? 0 : + current_eta / 1000. * (progress_max / (double)total_rendered - 1.); + char string[BCTEXTLEN]; Units::totext(string, eta, TIME_HMS2); + printf("\r%d%% %s: %s ", + (int)(100 * (float)total_rendered / progress_max), _("ETA"), string); + fflush(stdout); + last_eta = current_eta; +} + void Render::start_render() @@ -632,7 +600,7 @@ void Render::get_starting_number(char *path, int Render::load_defaults(Asset *asset) { - strategy = mwindow->defaults->get("RENDER_STRATEGY", SINGLE_PASS); + use_labels = mwindow->defaults->get("RENDER_FILE_PER_LABEL", 0); load_mode = mwindow->defaults->get("RENDER_LOADMODE", LOADMODE_NEW_TRACKS); range_type = mwindow->defaults->get("RENDER_RANGE_TYPE", RANGE_PROJECT); @@ -651,8 +619,8 @@ int Render::load_defaults(Asset *asset) int Render::load_profile(int profile_slot, Asset *asset) { char string_name[100]; - sprintf(string_name, "RENDER_%i_STRATEGY", profile_slot); - strategy = mwindow->defaults->get(string_name, SINGLE_PASS); + sprintf(string_name, "RENDER_%i_FILE_PER_LABEL", profile_slot); + use_labels = mwindow->defaults->get(string_name, 0); // Load mode is not part of the profile // printf(string_name, "RENDER_%i_LOADMODE", profile_slot); // load_mode = mwindow->defaults->get(string_name, LOADMODE_NEW_TRACKS); @@ -668,7 +636,7 @@ int Render::load_profile(int profile_slot, Asset *asset) int Render::save_defaults(Asset *asset) { - mwindow->defaults->update("RENDER_STRATEGY", strategy); + mwindow->defaults->update("RENDER_FILE_PER_LABEL", use_labels); mwindow->defaults->update("RENDER_LOADMODE", load_mode); mwindow->defaults->update("RENDER_RANGE_TYPE", range_type); @@ -705,7 +673,6 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl, double total_length; RenderFarmServer *farm_server = 0; FileSystem fs; - //int done = 0; const int debug = 0; render->in_progress = 1; @@ -715,15 +682,6 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl, render->progress = 0; render->result = 0; - if(mwindow) - { - if(!render->preferences) - render->preferences = new Preferences; - - render->preferences->copy_from(mwindow->preferences); - } - - // Create rendering command TransportCommand *command = new TransportCommand; command->command = NORMAL_FWD; @@ -785,7 +743,6 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl, if(mwindow) mwindow->stop_brender(); fs.complete_path(render->default_asset->path); - strategy = Render::fix_strategy(strategy, render->preferences->use_renderfarm); render->result = render->packages->create_packages(mwindow, command->get_edl(), @@ -797,7 +754,6 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl, test_overwrite); } - //done = 0; render->total_rendered = 0; if(!render->result) @@ -889,15 +845,9 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl, // Exit point if(!package) { - //done = 1; break; } - - - Timer timer; - timer.update(); - if(package_renderer.render_package(package)) render->result = 1; @@ -912,8 +862,14 @@ printf("Render::render_single: Session finished.\n"); - if(strategy == SINGLE_PASS_FARM || strategy == FILE_PER_LABEL_FARM) - { + if( strategy == SINGLE_PASS_FARM || + strategy == FILE_PER_LABEL_FARM ) { + if( !render->progress ) { + while( farm_server->active_clients() > 0 ) { + sleep(1); + render->show_progress(); + } + } farm_server->wait_clients(); render->result |= render->packages->packages_are_done(); } @@ -930,7 +886,7 @@ if(debug) printf("Render::render %d\n", __LINE__); { if(debug) printf("Render::render %d\n", __LINE__); int cx, cy; - mwindow->gui->get_abs_cursor_xy(cx, cy, 1); + mwindow->gui->get_abs_cursor(cx, cy, 1); ErrorBox error_box(_(PROGRAM_NAME ": Error"), cx, cy); error_box.create_objects(_("Error rendering data.")); error_box.raise_window(); @@ -1036,10 +992,13 @@ if(debug) printf("Render::render %d\n", __LINE__); void RenderThread::run() { + if( mwindow ) + render->preferences->copy_from(mwindow->preferences); + if(render->mode == Render::INTERACTIVE) { render_single(1, render->asset, mwindow->edl, - render->strategy, render->range_type); + render->get_strategy(), render->range_type); } else if(render->mode == Render::BATCH) @@ -1077,9 +1036,8 @@ void RenderThread::run() edl->create_objects(); file->read_from_file(job->edl_path); edl->load_xml(file, LOAD_ALL); - //PRINT_TRACE - render_single(0, job->asset, edl, job->strategy, RANGE_BACKCOMPAT); + render_single(0, job->asset, edl, job->get_strategy(), RANGE_BACKCOMPAT); //PRINT_TRACE edl->Garbage::remove_user(); @@ -1135,6 +1093,9 @@ RenderWindow::RenderWindow(MWindow *mwindow, this->mwindow = mwindow; this->render = render; this->asset = asset; + render_format = 0; + loadmode = 0; + renderprofile = 0; rangeproject = 0; rangeselection = 0; rangeinout = 0; @@ -1143,15 +1104,11 @@ RenderWindow::RenderWindow(MWindow *mwindow, RenderWindow::~RenderWindow() { -SET_TRACE lock_window("RenderWindow::~RenderWindow"); -SET_TRACE delete render_format; -SET_TRACE delete loadmode; -SET_TRACE + delete renderprofile; unlock_window(); -SET_TRACE } @@ -1159,7 +1116,7 @@ void RenderWindow::load_profile(int profile_slot) { render->load_profile(profile_slot, asset); update_range_type(render->range_type); - render_format->update(asset, &render->strategy); + render_format->update(asset, &render->use_labels); } @@ -1168,15 +1125,14 @@ void RenderWindow::create_objects() int x = 10, y = 10; lock_window("RenderWindow::create_objects"); add_subwindow(new BC_Title(x, y, - (char*)((render->strategy == FILE_PER_LABEL || - render->strategy == FILE_PER_LABEL_FARM) ? + (char*)(render->use_labels ? _("Select the first file to render to:") : _("Select a file to render to:")))); y += 25; render_format = new RenderFormat(mwindow, this, asset); render_format->create_objects(x, y, - 1, 1, 1, 1, 0, 1, 0, 0, &render->strategy, 0); + 1, 1, 1, 1, 0, 1, 0, 0, &render->use_labels, 0); BC_Title *title; add_subwindow(title = new BC_Title(x, y, _("Render range:")));