X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.C;h=69ac0f73032561ed44056fa72fd60636cedb5412;hb=74afbc29ac4ce9d94d53e10342979f2c59f1f193;hp=0930dd0593b185b5c2f1b4136dd22dd03a2d83d5;hpb=49f85559268fc040fe7ba5611cc0520793cf728b;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C index 0930dd05..69ac0f73 100644 --- a/cinelerra-5.1/cinelerra/edlsession.C +++ b/cinelerra-5.1/cinelerra/edlsession.C @@ -53,7 +53,7 @@ EDLSession::EDLSession(EDL *edl) audio_tracks = 2; autos_follow_edits = 1; // this is needed for predictability auto_keyframes = 0; - brender_start = 0.0; + brender_start = brender_end = 0.0; clipboard_length = 0; // unused color_model = BC_RGBA8888; interlace_mode = ILACE_MODE_UNDETECTED; @@ -87,7 +87,6 @@ EDLSession::EDLSession(EDL *edl) interpolate_raw = 1; white_balance_raw = 1; labels_follow_edits = 1; - mpeg4_deblock = 1; plugins_follow_edits = 1; single_standalone = 1; meter_format = METER_DB; @@ -98,6 +97,9 @@ EDLSession::EDLSession(EDL *edl) playback_buffer = 4096; playback_cursor_visible = 0; playback_preload = 0; + proxy_scale = 1; + proxy_use_scaler = 0; + proxy_auto_scale = 1; decode_subtitles = 0; subtitle_number = 0; label_cells = 0; @@ -114,17 +116,15 @@ EDLSession::EDLSession(EDL *edl) record_write_length = 131072; record_realtime_toc = 1; - safe_regions = 0; + safe_regions = 0; sample_rate = 48000; - scrub_speed = 2.; - show_assets = 1; - show_titles = 1; + scrub_speed = 2.; + show_assets = 1; + show_titles = 1; test_playback_edits = 1; time_format = TIME_HMSF; - for(int i = 0; i < 4; i++) - timecode_offset[i] = 0; - nudge_format = 1; - tool_window = 0; + nudge_format = 1; + tool_window = 0; for(int i = 0; i < MAXCHANNELS; i++) { vchannel_x[i] = 64*i; vchannel_y[i] = 0; @@ -133,13 +133,13 @@ EDLSession::EDLSession(EDL *edl) aconfig_in = new AudioInConfig; vconfig_in = new VideoInConfig; recording_format = new Asset; - video_every_frame = 0; - video_asynchronous = 0; + video_every_frame = 0; +// video_asynchronous = 0; video_tracks = 1; video_write_length = 30; - view_follows_playback = 1; - vwindow_meter = 0; - vwindow_zoom = 1.; + view_follows_playback = 1; + vwindow_meter = 0; + vwindow_zoom = 1.; playback_config = new PlaybackConfig; } @@ -159,7 +159,7 @@ int EDLSession::need_rerender(EDLSession *ptr) return ((playback_preload != ptr->playback_preload) || (interpolation_type != ptr->interpolation_type) || (video_every_frame != ptr->video_every_frame) || - (video_asynchronous != ptr->video_asynchronous) || +// (video_asynchronous != ptr->video_asynchronous) || (real_time_playback != ptr->real_time_playback) || (playback_software_position != ptr->playback_software_position) || (test_playback_edits != ptr->test_playback_edits) || @@ -167,21 +167,24 @@ int EDLSession::need_rerender(EDLSession *ptr) (decode_subtitles != ptr->decode_subtitles) || (subtitle_number != ptr->subtitle_number) || (interpolate_raw != ptr->interpolate_raw) || - (white_balance_raw != ptr->white_balance_raw)); + (white_balance_raw != ptr->white_balance_raw) || + (proxy_scale != ptr->proxy_scale) || + (proxy_use_scaler != ptr->proxy_use_scaler)); } void EDLSession::equivalent_output(EDLSession *session, double *result) { - if(session->output_w != output_w || - session->output_h != output_h || - !EQUIV(session->frame_rate, frame_rate) || - session->color_model != color_model || - session->interpolation_type != interpolation_type || - session->interpolate_raw != interpolate_raw || - session->white_balance_raw != white_balance_raw || - session->mpeg4_deblock != mpeg4_deblock || - session->decode_subtitles != decode_subtitles || - session->subtitle_number != subtitle_number) + if( session->output_w != output_w || + session->output_h != output_h || + !EQUIV(session->frame_rate, frame_rate) || + session->color_model != color_model || + session->interpolation_type != interpolation_type || + session->interpolate_raw != interpolate_raw || + session->white_balance_raw != white_balance_raw || + session->decode_subtitles != decode_subtitles || + session->subtitle_number != subtitle_number || + session->proxy_scale != proxy_scale || + session->proxy_use_scaler != proxy_use_scaler ) *result = 0; // If it's before the current brender_start, render extra data. @@ -191,25 +194,16 @@ void EDLSession::equivalent_output(EDLSession *session, double *result) *result = brender_start; } - int EDLSession::load_defaults(BC_Hash *defaults) { char string[BCTEXTLEN]; + audio_channels = defaults->get("ACHANNELS", audio_channels); + audio_tracks = defaults->get("ATRACKS", audio_tracks); // Default channel positions - for(int i = 0; i < MAXCHANNELS; i++) - { + for( int i=0; iget(string, default_position); + achannel_positions[i] = defaults->get(string, + default_audio_channel_position(i, audio_channels)); } aconfig_in->load_defaults(defaults); assetlist_format = defaults->get("ASSETLIST_FORMAT", ASSETS_ICONS); @@ -220,11 +214,10 @@ int EDLSession::load_defaults(BC_Hash *defaults) sprintf(string, "ASSET_COLUMN%d", i); asset_columns[i] = defaults->get(string, 100); } - audio_channels = defaults->get("ACHANNELS", audio_channels); - audio_tracks = defaults->get("ATRACKS", audio_tracks); auto_conf->load_defaults(defaults); autos_follow_edits = defaults->get("AUTOS_FOLLOW_EDITS", 1); brender_start = defaults->get("BRENDER_START", brender_start); + brender_end = defaults->get("BRENDER_END", brender_end); BC_CModels::to_text(string, BC_RGBA8888); color_model = BC_CModels::from_text(defaults->get("COLOR_MODEL", string)); eyedrop_radius = defaults->get("EYEDROP_RADIUS", 0); @@ -274,7 +267,6 @@ int EDLSession::load_defaults(BC_Hash *defaults) meter_format = defaults->get("METER_FORMAT", METER_DB); min_meter_db = defaults->get("MIN_METER_DB", -85); max_meter_db = defaults->get("MAX_METER_DB", 6); - mpeg4_deblock = defaults->get("MPEG4_DEBLOCK", mpeg4_deblock); output_w = defaults->get("OUTPUTW", output_w); output_h = defaults->get("OUTPUTH", output_h); playback_buffer = defaults->get("PLAYBACK_BUFFER", 4096); @@ -315,10 +307,6 @@ int EDLSession::load_defaults(BC_Hash *defaults) show_titles = defaults->get("SHOW_TITLES", 1); // test_playback_edits = defaults->get("TEST_PLAYBACK_EDITS", 1); time_format = defaults->get("TIME_FORMAT", TIME_HMSF); - for(int i = 0; i < 4; i++) { - sprintf(string, "TIMECODE_OFFSET_%d", i); - timecode_offset[i] = defaults->get(string, 0); - } nudge_format = defaults->get("NUDGE_FORMAT", 1); tool_window = defaults->get("TOOL_WINDOW", 0); vconfig_in->load_defaults(defaults); @@ -331,7 +319,7 @@ int EDLSession::load_defaults(BC_Hash *defaults) } video_channels = defaults->get("VCHANNELS", video_channels); video_every_frame = defaults->get("VIDEO_EVERY_FRAME", 0); - video_asynchronous = defaults->get("VIDEO_ASYNCHRONOUS", 0); +// video_asynchronous = defaults->get("VIDEO_ASYNCHRONOUS", 0); video_tracks = defaults->get("VTRACKS", video_tracks); video_write_length = defaults->get("VIDEO_WRITE_LENGTH", 30); view_follows_playback = defaults->get("VIEW_FOLLOWS_PLAYBACK", 1); @@ -372,6 +360,7 @@ int EDLSession::save_defaults(BC_Hash *defaults) defaults->update("ATRACKS", audio_tracks); defaults->update("AUTOS_FOLLOW_EDITS", autos_follow_edits); defaults->update("BRENDER_START", brender_start); + defaults->update("BRENDER_END", brender_end); BC_CModels::to_text(string, color_model); defaults->update("COLOR_MODEL", string); ilacemode_to_xmltext(string, interlace_mode); @@ -419,7 +408,6 @@ int EDLSession::save_defaults(BC_Hash *defaults) defaults->update("METER_FORMAT", meter_format); defaults->update("MIN_METER_DB", min_meter_db); defaults->update("MAX_METER_DB", max_meter_db); - defaults->update("MPEG4_DEBLOCK", mpeg4_deblock); defaults->update("OUTPUTW", output_w); defaults->update("OUTPUTH", output_h); defaults->update("PLAYBACK_BUFFER", playback_buffer); @@ -444,16 +432,12 @@ int EDLSession::save_defaults(BC_Hash *defaults) defaults->update("SAFE_REGIONS", safe_regions); defaults->update("SAMPLERATE", sample_rate); defaults->update("SCRUB_SPEED", scrub_speed); - defaults->update("SI_USEDURATION",si_useduration); + defaults->update("SI_USEDURATION",si_useduration); defaults->update("SI_DURATION",si_duration); defaults->update("SHOW_ASSETS", show_assets); defaults->update("SHOW_TITLES", show_titles); // defaults->update("TEST_PLAYBACK_EDITS", test_playback_edits); defaults->update("TIME_FORMAT", time_format); - for(int i = 0; i < 4; i++) { - sprintf(string, "TIMECODE_OFFSET_%d", i); - defaults->update(string, timecode_offset[i]); - } defaults->update("NUDGE_FORMAT", nudge_format); defaults->update("TOOL_WINDOW", tool_window); vconfig_in->save_defaults(defaults); @@ -465,7 +449,7 @@ int EDLSession::save_defaults(BC_Hash *defaults) } defaults->update("VCHANNELS", video_channels); defaults->update("VIDEO_EVERY_FRAME", video_every_frame); - defaults->update("VIDEO_ASYNCHRONOUS", video_asynchronous); +// defaults->update("VIDEO_ASYNCHRONOUS", video_asynchronous); defaults->update("VTRACKS", video_tracks); defaults->update("VIDEO_WRITE_LENGTH", video_write_length); defaults->update("VIEW_FOLLOWS_PLAYBACK", view_follows_playback); @@ -497,6 +481,7 @@ void EDLSession::boundaries() Workarounds::clamp(min_meter_db, -80, -20); Workarounds::clamp(max_meter_db, 0, 10); Workarounds::clamp(frames_per_foot, 1, 32); + Workarounds::clamp(proxy_scale, 1, 32); Workarounds::clamp(output_w, 16, (int)BC_INFINITY); Workarounds::clamp(output_h, 16, (int)BC_INFINITY); Workarounds::clamp(video_write_length, 1, 1000); @@ -516,6 +501,7 @@ void EDLSession::boundaries() Workarounds::clamp(ruler_y1, 0.0, output_h); Workarounds::clamp(ruler_y2, 0.0, output_h); if(brender_start < 0) brender_start = 0.0; + if(brender_end < 0) brender_end = 0.0; Workarounds::clamp(subtitle_number, 0, 31); Workarounds::clamp(awindow_folder, 0, AWINDOW_FOLDERS - 1); @@ -553,6 +539,9 @@ int EDLSession::load_video_config(FileXML *file, int append_mode, uint32_t load_ output_h = file->tag.get_property("OUTPUTH", output_h); aspect_w = file->tag.get_property("ASPECTW", aspect_w); aspect_h = file->tag.get_property("ASPECTH", aspect_h); + proxy_scale = file->tag.get_property("PROXY_SCALE", proxy_scale); + proxy_use_scaler = file->tag.get_property("PROXY_USE_SCALER", proxy_use_scaler); + proxy_auto_scale = file->tag.get_property("PROXY_AUTO_SCALE", proxy_auto_scale); return 0; } @@ -562,8 +551,6 @@ int EDLSession::load_audio_config(FileXML *file, int append_mode, uint32_t load_ // load channels setting if(append_mode) return 0; audio_channels = file->tag.get_property("CHANNELS", (int64_t)audio_channels); - - for(int i = 0; i < audio_channels; i++) { sprintf(string, "ACHANNEL_ANGLE_%d", i); @@ -595,6 +582,7 @@ int EDLSession::load_xml(FileXML *file, auto_keyframes = file->tag.get_property("AUTO_KEYFRAMES", auto_keyframes); autos_follow_edits = file->tag.get_property("AUTOS_FOLLOW_EDITS", autos_follow_edits); brender_start = file->tag.get_property("BRENDER_START", brender_start); + brender_end = file->tag.get_property("BRENDER_END", brender_end); eyedrop_radius = file->tag.get_property("EYEDROP_RADIUS", eyedrop_radius); crop_x1 = file->tag.get_property("CROP_X1", crop_x1); crop_y1 = file->tag.get_property("CROP_Y1", crop_y1); @@ -625,7 +613,6 @@ int EDLSession::load_xml(FileXML *file, folderlist_format = file->tag.get_property("FOLDERLIST_FORMAT", folderlist_format); highlighted_track = file->tag.get_property("HIGHLIGHTED_TRACK", 0); labels_follow_edits = file->tag.get_property("LABELS_FOLLOW_EDITS", labels_follow_edits); - mpeg4_deblock = file->tag.get_property("MPEG4_DEBLOCK", mpeg4_deblock); plugins_follow_edits = file->tag.get_property("PLUGINS_FOLLOW_EDITS", plugins_follow_edits); single_standalone = file->tag.get_property("SINGLE_STANDALONE", single_standalone); playback_preload = file->tag.get_property("PLAYBACK_PRELOAD", playback_preload); @@ -634,10 +621,6 @@ int EDLSession::load_xml(FileXML *file, show_titles = file->tag.get_property("SHOW_TITLES", 1); // test_playback_edits = file->tag.get_property("TEST_PLAYBACK_EDITS", test_playback_edits); time_format = file->tag.get_property("TIME_FORMAT", time_format); - for(int i = 0; i < 4; i++) { - sprintf(string, "TIMECODE_OFFSET_%d", i); - timecode_offset[i] = file->tag.get_property(string, timecode_offset[i]); - } nudge_format = file->tag.get_property("NUDGE_FORMAT", nudge_format); tool_window = file->tag.get_property("TOOL_WINDOW", tool_window); vwindow_meter = file->tag.get_property("VWINDOW_METER", vwindow_meter); @@ -668,6 +651,7 @@ int EDLSession::save_xml(FileXML *file) file->tag.set_property("AUTO_KEYFRAMES", auto_keyframes); file->tag.set_property("AUTOS_FOLLOW_EDITS", autos_follow_edits); file->tag.set_property("BRENDER_START", brender_start); + file->tag.set_property("BRENDER_END", brender_end); file->tag.set_property("EYEDROP_RADIUS", eyedrop_radius); file->tag.set_property("CROP_X1", crop_x1); file->tag.set_property("CROP_Y1", crop_y1); @@ -692,7 +676,6 @@ int EDLSession::save_xml(FileXML *file) file->tag.set_property("FOLDERLIST_FORMAT", folderlist_format); file->tag.set_property("HIGHLIGHTED_TRACK", highlighted_track); file->tag.set_property("LABELS_FOLLOW_EDITS", labels_follow_edits); - file->tag.set_property("MPEG4_DEBLOCK", mpeg4_deblock); file->tag.set_property("PLUGINS_FOLLOW_EDITS", plugins_follow_edits); file->tag.set_property("SINGLE_STANDALONE", single_standalone); file->tag.set_property("PLAYBACK_PRELOAD", playback_preload); @@ -701,10 +684,6 @@ int EDLSession::save_xml(FileXML *file) file->tag.set_property("SHOW_TITLES", show_titles); file->tag.set_property("TEST_PLAYBACK_EDITS", test_playback_edits); file->tag.set_property("TIME_FORMAT", time_format); - for(int i = 0; i < 4; i++) { - sprintf(string, "TIMECODE_OFFSET_%d", i); - file->tag.set_property(string, timecode_offset[i]); - } file->tag.set_property("NUDGE_FORMAT", nudge_format); file->tag.set_property("TOOL_WINDOW", tool_window); file->tag.set_property("VWINDOW_METER", vwindow_meter); @@ -733,7 +712,7 @@ int EDLSession::save_video_config(FileXML *file) file->tag.set_property("COLORMODEL", string); ilacemode_to_xmltext(string, interlace_mode); file->tag.set_property("INTERLACE_MODE",string); - file->tag.set_property("CHANNELS", video_channels); + file->tag.set_property("CHANNELS", video_channels); for(int i = 0; i < video_channels; i++) { sprintf(string, "VCHANNEL_X_%d", i); @@ -748,6 +727,9 @@ int EDLSession::save_video_config(FileXML *file) file->tag.set_property("OUTPUTH", output_h); file->tag.set_property("ASPECTW", aspect_w); file->tag.set_property("ASPECTH", aspect_h); + file->tag.set_property("PROXY_SCALE", proxy_scale); + file->tag.set_property("PROXY_USE_SCALER", proxy_use_scaler); + file->tag.set_property("PROXY_AUTO_SCALE", proxy_auto_scale); file->append_tag(); file->tag.set_title("/VIDEO"); file->append_tag(); @@ -797,6 +779,7 @@ int EDLSession::copy(EDLSession *session) audio_tracks = session->audio_tracks; autos_follow_edits = session->autos_follow_edits; brender_start = session->brender_start; + brender_end = session->brender_end; color_model = session->color_model; interlace_mode = session->interlace_mode; eyedrop_radius = session->eyedrop_radius; @@ -842,7 +825,6 @@ int EDLSession::copy(EDLSession *session) meter_format = session->meter_format; min_meter_db = session->min_meter_db; max_meter_db = session->max_meter_db; - mpeg4_deblock = session->mpeg4_deblock; output_w = session->output_w; output_h = session->output_h; playback_buffer = session->playback_buffer; @@ -870,9 +852,6 @@ int EDLSession::copy(EDLSession *session) show_titles = session->show_titles; test_playback_edits = session->test_playback_edits; time_format = session->time_format; - for(int i = 0; i < 4; i++) { - timecode_offset[i] = session->timecode_offset[i]; - } nudge_format = session->nudge_format; tool_window = session->tool_window; for(int i = 0; i < MAXCHANNELS; i++) { @@ -882,12 +861,15 @@ int EDLSession::copy(EDLSession *session) video_channels = session->video_channels; *vconfig_in = *session->vconfig_in; video_every_frame = session->video_every_frame; - video_asynchronous = session->video_asynchronous; +// video_asynchronous = session->video_asynchronous; video_tracks = session->video_tracks; video_write_length = session->video_write_length; view_follows_playback = session->view_follows_playback; vwindow_meter = session->vwindow_meter; vwindow_zoom = session->vwindow_zoom; + proxy_scale = session->proxy_scale; + proxy_use_scaler = session->proxy_use_scaler; + proxy_auto_scale = session->proxy_auto_scale; subtitle_number = session->subtitle_number; decode_subtitles = session->decode_subtitles; @@ -897,20 +879,16 @@ int EDLSession::copy(EDLSession *session) return 0; } -int64_t EDLSession::get_frame_offset() -{ - return int64_t((timecode_offset[3] * 3600 + timecode_offset[2] * 60 + - timecode_offset[1]) * frame_rate + timecode_offset[0]); -} - void EDLSession::dump() { printf("EDLSession::dump\n"); printf(" audio_tracks=%d audio_channels=%d sample_rate=%jd\n" " video_tracks=%d frame_rate=%f output_w=%d output_h=%d aspect_w=%f aspect_h=%f\n" - " decode subtitles=%d subtitle_number=%d label_cells=%d program_no=%d\n", + " decode subtitles=%d subtitle_number=%d label_cells=%d program_no=%d\n" + " proxy_scale=%d\n proxy_use_scaler=%d, proxy_auto_scale=%d\n", audio_tracks, audio_channels, sample_rate, video_tracks, frame_rate, output_w, output_h, aspect_w, aspect_h, - decode_subtitles, subtitle_number, label_cells, program_no); + decode_subtitles, subtitle_number, label_cells, program_no, + proxy_scale, proxy_use_scaler, proxy_auto_scale); }