projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
proxy.C
diff --git
a/cinelerra-5.1/cinelerra/proxy.C
b/cinelerra-5.1/cinelerra/proxy.C
index a53dcf6c6bf29aba38d0eae04c26b196658d091d..a0f5fa72cf4a258fd32042daa4453b85da9d1e73 100644
(file)
--- a/
cinelerra-5.1/cinelerra/proxy.C
+++ b/
cinelerra-5.1/cinelerra/proxy.C
@@
-88,6
+88,7
@@
ProxyDialog::ProxyDialog(MWindow *mwindow)
strcpy(asset->fformat, "mpeg");
strcpy(asset->vcodec, "mpeg.mpeg");
asset->ff_video_bitrate = 2000000;
strcpy(asset->fformat, "mpeg");
strcpy(asset->vcodec, "mpeg.mpeg");
asset->ff_video_bitrate = 2000000;
+ asset->video_data = 1;
bzero(size_text, sizeof(char*) * MAX_SIZES);
bzero(size_factors, sizeof(int) * MAX_SIZES);
bzero(size_text, sizeof(char*) * MAX_SIZES);
bzero(size_factors, sizeof(int) * MAX_SIZES);
@@
-137,9
+138,6
@@
void ProxyDialog::calculate_sizes()
}
total_sizes = 1;
}
total_sizes = 1;
- int orig_w = mwindow->edl->session->output_w * orig_scale;
- int orig_h = mwindow->edl->session->output_h * orig_scale;
-
if( !use_scaler ) {
// w,h should stay even for yuv
int ow = orig_w, oh = orig_h;
if( !use_scaler ) {
// w,h should stay even for yuv
int ow = orig_w, oh = orig_h;
@@
-233,10
+231,11
@@
int ProxyRender::from_proxy_path(char *new_path, Indexable *indexable, int scale
return 0;
}
return 0;
}
-ProxyRender::ProxyRender(MWindow *mwindow, Asset *format_asset)
+ProxyRender::ProxyRender(MWindow *mwindow, Asset *format_asset
, int asset_scale
)
{
this->mwindow = mwindow;
this->format_asset = format_asset;
{
this->mwindow = mwindow;
this->format_asset = format_asset;
+ this->asset_scale = asset_scale;
progress = 0;
counter_lock = new Mutex("ProxyDialog::counter_lock");
total_rendered = 0;
progress = 0;
counter_lock = new Mutex("ProxyDialog::counter_lock");
total_rendered = 0;
@@
-340,7
+339,7
@@
int ProxyRender::create_needed_proxies(int new_scale)
ProxyFarm engine(mwindow, this, &needed_idxbls, &needed_proxies);
engine.process_packages();
ProxyFarm engine(mwindow, this, &needed_idxbls, &needed_proxies);
engine.process_packages();
-printf("failed=%d canceled=%d\n", failed, progress->is_cancelled());
+printf("
proxy:
failed=%d canceled=%d\n", failed, progress->is_cancelled());
// stop progress bar
canceled = progress->is_cancelled();
// stop progress bar
canceled = progress->is_cancelled();
@@
-381,6
+380,12
@@
void ProxyWindow::create_objects()
dialog->auto_scale = mwindow->edl->session->proxy_auto_scale;
dialog->beep = mwindow->edl->session->proxy_beep;
dialog->new_scale = dialog->orig_scale;
dialog->auto_scale = mwindow->edl->session->proxy_auto_scale;
dialog->beep = mwindow->edl->session->proxy_beep;
dialog->new_scale = dialog->orig_scale;
+ dialog->orig_w = mwindow->edl->session->output_w;
+ dialog->orig_h = mwindow->edl->session->output_h;
+ if( !dialog->use_scaler ) {
+ dialog->orig_w *= dialog->orig_scale;
+ dialog->orig_h *= dialog->orig_scale;
+ }
int x = margin;
int y = margin+10;
int x = margin;
int y = margin+10;
@@
-391,7
+396,7
@@
void ProxyWindow::create_objects()
add_subwindow(text = new BC_Title(x, y, _("Scale factor:")));
x += text->get_w() + margin;
add_subwindow(text = new BC_Title(x, y, _("Scale factor:")));
x += text->get_w() + margin;
- int popupmenu_w = BC_PopupMenu::calculate_w(get_text_width(MEDIUMFONT, dialog->size_text[0]));
+ int popupmenu_w = BC_PopupMenu::calculate_w(get_text_width(MEDIUMFONT, dialog->size_text[0])
+15
);
add_subwindow(scale_factor = new ProxyMenu(mwindow, this, x, y, popupmenu_w, ""));
scale_factor->update_sizes();
x += scale_factor->get_w() + margin;
add_subwindow(scale_factor = new ProxyMenu(mwindow, this, x, y, popupmenu_w, ""));
scale_factor->update_sizes();
x += scale_factor->get_w() + margin;
@@
-439,6
+444,7
@@
ProxyFormatTools::ProxyFormatTools(MWindow *mwindow, ProxyWindow *pwindow, Asset
void ProxyFormatTools::update_format()
{
void ProxyFormatTools::update_format()
{
+ asset->save_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0);
FormatTools::update_format();
pwindow->use_scaler->update();
}
FormatTools::update_format();
pwindow->use_scaler->update();
}
@@
-446,11
+452,9
@@
void ProxyFormatTools::update_format()
void ProxyWindow::update()
{
char string[BCSTRLEN];
void ProxyWindow::update()
{
char string[BCSTRLEN];
- int orig_w = mwindow->edl->session->output_w * dialog->orig_scale;
- int orig_h = mwindow->edl->session->output_h * dialog->orig_scale;
- int new_w = orig_w / dialog->new_scale;
+ int new_w = dialog->orig_w / dialog->new_scale;
if( new_w & 1 ) ++new_w;
if( new_w & 1 ) ++new_w;
- int new_h = orig_h / dialog->new_scale;
+ int new_h =
dialog->
orig_h / dialog->new_scale;
if( new_h & 1 ) ++new_h;
sprintf(string, "%dx%d", new_w, new_h);
new_dimensions->update(string);
if( new_h & 1 ) ++new_h;
sprintf(string, "%dx%d", new_w, new_h);
new_dimensions->update(string);
@@
-550,7
+554,6
@@
int ProxyMenu::handle_event()
for( int i = 0; i < dialog->total_sizes; i++ ) {
if( !strcmp(get_text(), pwindow->dialog->size_text[i]) ) {
dialog->new_scale = pwindow->dialog->size_factors[i];
for( int i = 0; i < dialog->total_sizes; i++ ) {
if( !strcmp(get_text(), pwindow->dialog->size_text[i]) ) {
dialog->new_scale = pwindow->dialog->size_factors[i];
- if( dialog->new_scale == 1 ) dialog->use_scaler = 0;
pwindow->update();
break;
}
pwindow->update();
break;
}
@@
-722,7
+725,12
@@
void ProxyClient::process_package(LoadPackage *ptr)
proxy_render->update_progress();
}
if( !proxy_render->failed && !proxy_render->is_canceled() ) {
proxy_render->update_progress();
}
if( !proxy_render->failed && !proxy_render->is_canceled() ) {
- Asset *asset = mwindow->edl->assets->update(proxy);
+ Asset *asset = edl->assets->update(proxy);
+ asset->proxy_scale = proxy_render->asset_scale;
+ int scale = asset->proxy_scale;
+ if( !scale ) scale = 1;
+ asset->width = asset->actual_width * scale;
+ asset->height = asset->actual_height * scale;
mwindow->mainindexes->add_next_asset(0, asset);
mwindow->mainindexes->start_build();
}
mwindow->mainindexes->add_next_asset(0, asset);
mwindow->mainindexes->start_build();
}