#include "transportque.h"
#include "vrender.h"
-#define WIDTH 400
-#define HEIGHT 330
+#define WIDTH xS(400)
+#define HEIGHT yS(330)
#define MAX_SCALE 16
ProxyMenuItem::ProxyMenuItem(MWindow *mwindow)
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);
}
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( result ) return;
if( !File::renders_video(asset) ) {
- eprintf("Specified format does not render video");
+ eprintf(_("Specified format does not render video"));
return;
}
mwindow->edl->session->proxy_auto_scale = auto_scale;
mwindow->gui->unlock_window();
asset->save_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0);
result = mwindow->to_proxy(asset, new_scale, use_scaler);
- if( result >= 0 && beep && new_scale != 1 ) {
- static struct { double freq, secs, gain; }
- tone[2] = { { 2000., 1.5, 0.5 }, { 4000., 0.25, 0.5 } };
- int i = result > 0 ? 0 : 1;
- mwindow->beep(tone[i].freq, tone[i].secs, tone[i].gain);
+ if( result >= 0 && beep > 0 && new_scale != 1 ) {
+ if( !result ) {
+ mwindow->beep(4000., 0.5, beep);
+ usleep(250000);
+ mwindow->beep(1000., 0.5, beep);
+ usleep(250000);
+ mwindow->beep(4000., 0.5, beep);
+ }
+ else
+ mwindow->beep(2000., 2.0, beep);
}
}
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->asset_scale = asset_scale;
progress = 0;
counter_lock = new Mutex("ProxyDialog::counter_lock");
total_rendered = 0;
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();
delete progress; progress = 0;
if( failed && !canceled ) {
- eprintf("Error making proxy.");
+ eprintf(_("Error making proxy."));
}
return !failed && !canceled ? 0 : 1;
}
{
lock_window("ProxyWindow::create_objects");
int margin = mwindow->theme->widget_border;
+ int lmargin = margin + xS(10);
dialog->use_scaler = mwindow->edl->session->proxy_use_scaler;
dialog->orig_scale = mwindow->edl->session->proxy_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 = lmargin;
+ int y = margin+yS(10);
add_subwindow(use_scaler = new ProxyUseScaler(this, x, y));
y += use_scaler->get_h() + 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])+xS(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(tumbler = new ProxyTumbler(mwindow, this, x, y));
y += tumbler->get_h() + margin;
- x = margin;
+ x = lmargin;
add_subwindow(text = new BC_Title(x, y, _("New media dimensions: ")));
x += text->get_w() + margin;
add_subwindow(new_dimensions = new BC_Title(x, y, ""));
y += new_dimensions->get_h() + margin;
- x = margin;
+ x = lmargin;
add_subwindow(text = new BC_Title(x, y, _("Active Scale: ")));
x += text->get_w() + margin;
add_subwindow(active_scale = new BC_Title(x, y, ""));
y += active_scale->get_h() + margin;
- x = margin; y += 25;
+ x = lmargin; y += yS(25);
format_tools = new ProxyFormatTools(mwindow, this, dialog->asset);
format_tools->create_objects(x, y, 0, 1, 0, 0, 0, 1, 0, 1, // skip the path
0, 0);
- x = margin;
+ x = lmargin;
add_subwindow(auto_scale = new ProxyAutoScale(this, x, y));
y += auto_scale->get_h() + margin;
add_subwindow(beep_on_done = new ProxyBeepOnDone(this, x, y));
- y += beep_on_done->get_h() + margin;
+ x += beep_on_done->get_w() + margin + xS(10);
+ add_subwindow(new BC_Title(x, y+yS(10), _("Beep on done volume")));
+// y += beep_on_done->get_h() + margin;
update();
void ProxyFormatTools::update_format()
{
+ asset->save_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0);
FormatTools::update_format();
pwindow->use_scaler->update();
}
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;
- 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);
}
ProxyBeepOnDone::ProxyBeepOnDone(ProxyWindow *pwindow, int x, int y)
- : BC_CheckBox(x, y, pwindow->dialog->beep, _("Beep on done"))
+ : BC_FPot(x, y, pwindow->dialog->beep*100.f, 0.f, 100.f)
{
this->pwindow = pwindow;
}
int ProxyBeepOnDone::handle_event()
{
- pwindow->dialog->beep = get_value();
+ pwindow->dialog->beep = get_value()/100.f;
pwindow->update();
return 1;
}
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;
}
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();
}