#include "asset.h"
#include "assets.h"
#include "autoconf.h"
+#include "awindowgui.h"
#include "bccmodels.h"
#include "bchash.h"
#include "clip.h"
for(int i = 0; i < ASSET_COLUMNS; i++)
asset_columns[i] = 100;
auto_conf = new AutoConf;
+ awindow_folder = AW_MEDIA_FOLDER;
aspect_w = 4; aspect_h = 3;
audio_channels = 2;
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 = BC_ILACE_MODE_UNDETECTED;
+ interlace_mode = ILACE_MODE_UNDETECTED;
crop_x1 = 0; crop_x2 = 320;
crop_y1 = 0; crop_y2 = 240;
eyedrop_radius = 0;
ruler_x1 = ruler_y1 = 0.0;
ruler_x2 = ruler_y2 = 0.0;
- strcpy(current_folder, "");
cursor_on_frames = 1;
typeless_keyframes = 0;
cwindow_dest = 0;
playback_buffer = 4096;
playback_cursor_visible = 0;
playback_preload = 0;
+ proxy_scale = 1;
decode_subtitles = 0;
subtitle_number = 0;
label_cells = 0;
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;
for(int i = 0; i < MAXCHANNELS; i++) {
(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));
}
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->mpeg4_deblock != mpeg4_deblock ||
+ session->decode_subtitles != decode_subtitles ||
+ session->subtitle_number != subtitle_number ||
+ session->proxy_scale != proxy_scale )
*result = 0;
// If it's before the current brender_start, render extra data.
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);
ilacemode_to_xmltext(string, interlace_mode);
const char *ilace_mode = defaults->get("INTERLACE_MODE",string);
- interlace_mode = ilacemode_from_xmltext(ilace_mode, BC_ILACE_MODE_NOTINTERLACED);
+ interlace_mode = ilacemode_from_xmltext(ilace_mode, ILACE_MODE_NOTINTERLACED);
crop_x1 = defaults->get("CROP_X1", 0);
crop_x2 = defaults->get("CROP_X2", 320);
crop_y1 = defaults->get("CROP_Y1", 0);
ruler_x2 = defaults->get("RULER_X2", 0.0);
ruler_y1 = defaults->get("RULER_Y1", 0.0);
ruler_y2 = defaults->get("RULER_Y2", 0.0);
- sprintf(current_folder, MEDIA_FOLDER);
- defaults->get("CURRENT_FOLDER", current_folder);
+ awindow_folder = defaults->get("AWINDOW_FOLDER", awindow_folder);
cursor_on_frames = defaults->get("CURSOR_ON_FRAMES", 1);
typeless_keyframes = defaults->get("TYPELESS_KEYFRAMES", 0);
cwindow_dest = defaults->get("CWINDOW_DEST", 0);
delete playback_config;
playback_config = new PlaybackConfig;
playback_config->load_defaults(defaults);
+// proxy_scale = defaults->get("PROXY_SCALE", 1);
real_time_playback = defaults->get("PLAYBACK_REALTIME", 0);
real_time_record = defaults->get("REALTIME_RECORD", 0);
record_positioning = defaults->get("RECORD_POSITIONING", 1);
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);
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);
defaults->update("RULER_X2", ruler_x2);
defaults->update("RULER_Y1", ruler_y1);
defaults->update("RULER_Y2", ruler_y2);
- defaults->update("CURRENT_FOLDER", current_folder);
+ defaults->update("AWINDOW_FOLDER", awindow_folder);
defaults->update("CURSOR_ON_FRAMES", cursor_on_frames);
defaults->update("TYPELESS_KEYFRAMES", typeless_keyframes);
defaults->update("CWINDOW_DEST", cwindow_dest);
defaults->update("PLAYBACK_SOFTWARE_POSITION", playback_software_position);
playback_config->save_defaults(defaults);
defaults->update("PLAYBACK_REALTIME", real_time_playback);
+// defaults->update("PROXY_SCALE", proxy_scale);
defaults->update("REALTIME_RECORD", real_time_record);
defaults->update("RECORD_POSITIONING", record_positioning);
defaults->update("RECORD_RAW_STREAM", record_raw_stream);
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);
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);
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);
// Correct framerates
frame_rate = Units::fix_framerate(frame_rate);
BC_CModels::to_text(string, color_model);
color_model = BC_CModels::from_text(file->tag.get_property("COLORMODEL", string));
const char *ilace_mode = file->tag.get_property("INTERLACE_MODE");
- interlace_mode = ilacemode_from_xmltext(ilace_mode, BC_ILACE_MODE_NOTINTERLACED);
+ interlace_mode = ilacemode_from_xmltext(ilace_mode, ILACE_MODE_NOTINTERLACED);
video_channels = file->tag.get_property("CHANNELS", video_channels);
for(int i = 0; i < video_channels; i++)
{
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);
return 0;
}
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);
ruler_y1 = file->tag.get_property("RULER_Y1", ruler_y1);
ruler_x2 = file->tag.get_property("RULER_X2", ruler_x2);
ruler_y2 = file->tag.get_property("RULER_Y2", ruler_y2);
- file->tag.get_property("CURRENT_FOLDER", current_folder);
+ string[0] = 0;
+ file->tag.get_property("CURRENT_FOLDER", string);
+ if( string[0] ) {
+ awindow_folder = AWindowGUI::folder_number(string);
+ if( awindow_folder < 0 ) awindow_folder = AW_MEDIA_FOLDER;
+ }
+ file->tag.get_property("AWINDOW_FOLDER", awindow_folder);
cursor_on_frames = file->tag.get_property("CURSOR_ON_FRAMES", cursor_on_frames);
typeless_keyframes = file->tag.get_property("TYPELESS_KEYFRAMES", typeless_keyframes);
cwindow_dest = file->tag.get_property("CWINDOW_DEST", cwindow_dest);
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);
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);
file->tag.set_property("RULER_Y1", ruler_y1);
file->tag.set_property("RULER_X2", ruler_x2);
file->tag.set_property("RULER_Y2", ruler_y2);
- file->tag.set_property("CURRENT_FOLDER", current_folder);
+ file->tag.set_property("AWINDOW_FOLDER", awindow_folder);
file->tag.set_property("CURSOR_ON_FRAMES", cursor_on_frames);
file->tag.set_property("TYPELESS_KEYFRAMES", typeless_keyframes);
file->tag.set_property("CWINDOW_DEST", cwindow_dest);
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);
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->append_tag();
file->tag.set_title("/VIDEO");
file->append_tag();
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;
ruler_y1 = session->ruler_y1;
ruler_x2 = session->ruler_x2;
ruler_y2 = session->ruler_y2;
- strcpy(current_folder, session->current_folder);
+ awindow_folder = session->awindow_folder;
cursor_on_frames = session->cursor_on_frames;
typeless_keyframes = session->typeless_keyframes;
cwindow_dest = session->cwindow_dest;
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++) {
view_follows_playback = session->view_follows_playback;
vwindow_meter = session->vwindow_meter;
vwindow_zoom = session->vwindow_zoom;
+ proxy_scale = session->proxy_scale;
subtitle_number = session->subtitle_number;
decode_subtitles = session->decode_subtitles;
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",
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);
}
projects / goodguy / history.git / blobdiff