projects
/
goodguy
/
cinelerra.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0b751b0
)
downgrade dav1d to 5.1 seek fails, bg clr uses alpha=1, renderfarm hang fix, fix...
author
Good Guy
<good1.2guy@gmail.com>
Wed, 23 Sep 2020 20:01:30 +0000
(14:01 -0600)
committer
Good Guy
<good1.2guy@gmail.com>
Wed, 23 Sep 2020 20:01:30 +0000
(14:01 -0600)
20 files changed:
cinelerra-5.1/cinelerra/appearanceprefs.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/appearanceprefs.h
patch
|
blob
|
history
cinelerra-5.1/cinelerra/colorpicker.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/edlsession.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/edlsession.h
patch
|
blob
|
history
cinelerra-5.1/cinelerra/packagerenderer.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/pluginclient.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/renderfarm.h
patch
|
blob
|
history
cinelerra-5.1/cinelerra/renderfarmclient.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/videodevice.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/virtualvconsole.C
patch
|
blob
|
history
cinelerra-5.1/configure.ac
patch
|
blob
|
history
cinelerra-5.1/ffmpeg/video/ffv1.avi
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/ffmpeg/video/flv_h264.flv
patch
|
blob
|
history
cinelerra-5.1/plugins/Makefile
patch
|
blob
|
history
cinelerra-5.1/plugins/histogram/histogramwindow.C
patch
|
blob
|
history
cinelerra-5.1/po/ru.po
patch
|
blob
|
history
cinelerra-5.1/thirdparty/src/dav1d-0.5.1.patch1
[moved from
cinelerra-5.1/thirdparty/src/dav1d-0.7.1.patch1
with 92% similarity]
patch
|
blob
|
history
cinelerra-5.1/thirdparty/src/dav1d-0.5.1.tar.gz
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/thirdparty/src/dav1d-0.7.1.tar.xz
[deleted file]
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/cinelerra/appearanceprefs.C
b/cinelerra-5.1/cinelerra/appearanceprefs.C
index d6ed2bb852dee6f2fc3c80a4a9820f9bc0d8cfac..c53db8300875e242bdb9dc042ec2b039a690564b 100644
(file)
--- a/
cinelerra-5.1/cinelerra/appearanceprefs.C
+++ b/
cinelerra-5.1/cinelerra/appearanceprefs.C
@@
-184,9
+184,8
@@
void AppearancePrefs::create_objects()
y += ys35;
add_subwindow(title = new BC_Title(x, y, _("Composer BG Color:")));
int clr_color = pwindow->thread->edl->session->cwindow_clear_color;
y += ys35;
add_subwindow(title = new BC_Title(x, y, _("Composer BG Color:")));
int clr_color = pwindow->thread->edl->session->cwindow_clear_color;
- int clr_alpha = pwindow->thread->edl->session->cwindow_clear_alpha;
add_subwindow(cwdw_bg_color = new Composer_BG_Color(pwindow,
add_subwindow(cwdw_bg_color = new Composer_BG_Color(pwindow,
- x2, y, xS(80), yS(24), clr_color
, clr_alpha
));
+ x2, y, xS(80), yS(24), clr_color));
draw_3d_border(x2-2,y-2, xS(80)+4,xS(24)+4, 1);
cwdw_bg_color->create_objects();
x2 += cwdw_bg_color->get_w();
draw_3d_border(x2-2,y-2, xS(80)+4,xS(24)+4, 1);
cwdw_bg_color->create_objects();
x2 += cwdw_bg_color->get_w();
@@
-932,8
+931,8
@@
int RectifyAudioToggle::handle_event()
}
Composer_BG_Color::Composer_BG_Color(PreferencesWindow *pwindow,
}
Composer_BG_Color::Composer_BG_Color(PreferencesWindow *pwindow,
- int x, int y, int w, int h, int color
, int alpha
)
- : ColorBoxButton(_("Composer BG color"), x, y, w, h, color,
alpha
, 1)
+ int x, int y, int w, int h, int color)
+ : ColorBoxButton(_("Composer BG color"), x, y, w, h, color,
-1
, 1)
{
this->pwindow = pwindow;
}
{
this->pwindow = pwindow;
}
@@
-955,7
+954,6
@@
void Composer_BG_Color::handle_done_event(int result)
int Composer_BG_Color::handle_new_color(int color, int alpha)
{
pwindow->thread->edl->session->cwindow_clear_color = color;
int Composer_BG_Color::handle_new_color(int color, int alpha)
{
pwindow->thread->edl->session->cwindow_clear_color = color;
- pwindow->thread->edl->session->cwindow_clear_alpha = alpha;
return 1;
}
return 1;
}
diff --git
a/cinelerra-5.1/cinelerra/appearanceprefs.h
b/cinelerra-5.1/cinelerra/appearanceprefs.h
index fed29a98a314fcd2217c3aedf55526f0c58e0af0..c7d95ecbfea6db90745662e54ba15acb8202514f 100644
(file)
--- a/
cinelerra-5.1/cinelerra/appearanceprefs.h
+++ b/
cinelerra-5.1/cinelerra/appearanceprefs.h
@@
-438,7
+438,7
@@
class Composer_BG_Color : public ColorBoxButton
{
public:
Composer_BG_Color(PreferencesWindow *pwindow,
{
public:
Composer_BG_Color(PreferencesWindow *pwindow,
- int x, int y, int w, int h, int color
, int alpha
);
+ int x, int y, int w, int h, int color);
~Composer_BG_Color();
void handle_done_event(int result);
int handle_new_color(int color, int alpha);
~Composer_BG_Color();
void handle_done_event(int result);
int handle_new_color(int color, int alpha);
diff --git
a/cinelerra-5.1/cinelerra/colorpicker.C
b/cinelerra-5.1/cinelerra/colorpicker.C
index 348817c4bac2915f44f10dd963d3e1ade73bba37..fd796bfcaef64b158ad34396ecb75e58a8f7a7e3 100644
(file)
--- a/
cinelerra-5.1/cinelerra/colorpicker.C
+++ b/
cinelerra-5.1/cinelerra/colorpicker.C
@@
-156,7
+156,6
@@
ColorGUI::ColorGUI(BC_WindowBase *window)
hue = 0; sat = 0; val = 0;
red = 0; grn = 0; blu = 0;
lum = 0; c_r = 0; c_b = 0;
hue = 0; sat = 0; val = 0;
red = 0; grn = 0; blu = 0;
lum = 0; c_r = 0; c_b = 0;
- alpha = 0;
hsv_h = 0; hsv_s = 0; hsv_v = 0;
rgb_r = 0; rgb_g = 0; rgb_b = 0;
hsv_h = 0; hsv_s = 0; hsv_v = 0;
rgb_r = 0; rgb_g = 0; rgb_b = 0;
@@
-1451,7
+1450,8
@@
void ColorBoxButton::create_objects()
void ColorBoxButton::set_color(int color)
{
this->color = (color & 0xffffff);
void ColorBoxButton::set_color(int color)
{
this->color = (color & 0xffffff);
- this->alpha = (~color>>24) & 0xff;
+ if( this->alpha >= 0 )
+ this->alpha = (~color>>24) & 0xff;
int r = (color>>16) & 0xff;
int g = (color>> 8) & 0xff;
int b = (color>> 0) & 0xff;
int r = (color>>16) & 0xff;
int g = (color>> 8) & 0xff;
int b = (color>> 0) & 0xff;
@@
-1513,7
+1513,8
@@
void ColorCircleButton::create_objects()
void ColorCircleButton::set_color(int color)
{
this->color = (color & 0xffffff);
void ColorCircleButton::set_color(int color)
{
this->color = (color & 0xffffff);
- this->alpha = (~color>>24) & 0xff;
+ if( this->alpha >= 0 )
+ this->alpha = (~color>>24) & 0xff;
int r = (color>>16) & 0xff;
int g = (color>>8) & 0xff;
int b = (color>>0) & 0xff;
int r = (color>>16) & 0xff;
int g = (color>>8) & 0xff;
int b = (color>>0) & 0xff;
diff --git
a/cinelerra-5.1/cinelerra/edlsession.C
b/cinelerra-5.1/cinelerra/edlsession.C
index 673ec070f77bb563f8a89e0c8c6d6600d24a42f8..f3044f6d64aca49bad91b9ab86f2235c7771b801 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edlsession.C
+++ b/
cinelerra-5.1/cinelerra/edlsession.C
@@
-75,7
+75,6
@@
EDLSession::EDLSession(EDL *edl)
cwindow_zoom = 1.0;
cwindow_click2play = 0;
cwindow_clear_color = BLACK;
cwindow_zoom = 1.0;
cwindow_click2play = 0;
cwindow_clear_color = BLACK;
- cwindow_clear_alpha = 0;
strcpy(default_atransition, INIT_ATRANSITION);
strcpy(default_vtransition, INIT_VTRANSITION);
default_transition_length = 1.0;
strcpy(default_atransition, INIT_ATRANSITION);
strcpy(default_vtransition, INIT_VTRANSITION);
default_transition_length = 1.0;
@@
-184,8
+183,7
@@
int EDLSession::need_rerender(EDLSession *ptr)
(proxy_disabled_scale != ptr->proxy_disabled_scale) ||
(proxy_scale != ptr->proxy_scale) ||
(proxy_use_scaler != ptr->proxy_use_scaler) ||
(proxy_disabled_scale != ptr->proxy_disabled_scale) ||
(proxy_scale != ptr->proxy_scale) ||
(proxy_use_scaler != ptr->proxy_use_scaler) ||
- (cwindow_clear_color != ptr->cwindow_clear_color) ||
- (cwindow_clear_alpha != ptr->cwindow_clear_alpha));
+ (cwindow_clear_color != ptr->cwindow_clear_color));
}
void EDLSession::equivalent_output(EDLSession *session, double *result)
}
void EDLSession::equivalent_output(EDLSession *session, double *result)
@@
-262,7
+260,6
@@
int EDLSession::load_defaults(BC_Hash *defaults)
cwindow_zoom = defaults->get("CWINDOW_ZOOM", (float)1);
cwindow_click2play = defaults->get("CWINDOW_CLICK2PLAY", 0);
cwindow_clear_color = defaults->get("CWINDOW_CLEAR_COLOR", BLACK);
cwindow_zoom = defaults->get("CWINDOW_ZOOM", (float)1);
cwindow_click2play = defaults->get("CWINDOW_CLICK2PLAY", 0);
cwindow_clear_color = defaults->get("CWINDOW_CLEAR_COLOR", BLACK);
- cwindow_clear_alpha = defaults->get("CWINDOW_CLEAR_ALPHA", 0);
sprintf(default_atransition, INIT_ATRANSITION);
defaults->get("DEFAULT_ATRANSITION", default_atransition);
sprintf(default_vtransition, INIT_VTRANSITION);
sprintf(default_atransition, INIT_ATRANSITION);
defaults->get("DEFAULT_ATRANSITION", default_atransition);
sprintf(default_vtransition, INIT_VTRANSITION);
@@
-413,7
+410,6
@@
int EDLSession::save_defaults(BC_Hash *defaults)
defaults->update("CWINDOW_ZOOM", cwindow_zoom);
defaults->update("CWINDOW_CLICK2PLAY", cwindow_click2play);
defaults->update("CWINDOW_CLEAR_COLOR", cwindow_clear_color);
defaults->update("CWINDOW_ZOOM", cwindow_zoom);
defaults->update("CWINDOW_CLICK2PLAY", cwindow_click2play);
defaults->update("CWINDOW_CLEAR_COLOR", cwindow_clear_color);
- defaults->update("CWINDOW_CLEAR_ALPHA", cwindow_clear_alpha);
defaults->update("DEFAULT_ATRANSITION", default_atransition);
defaults->update("DEFAULT_VTRANSITION", default_vtransition);
defaults->update("DEFAULT_TRANSITION_LENGTH", default_transition_length);
defaults->update("DEFAULT_ATRANSITION", default_atransition);
defaults->update("DEFAULT_VTRANSITION", default_vtransition);
defaults->update("DEFAULT_TRANSITION_LENGTH", default_transition_length);
@@
-641,7
+637,6
@@
int EDLSession::load_xml(FileXML *file,
cwindow_zoom = file->tag.get_property("CWINDOW_ZOOM", cwindow_zoom);
cwindow_click2play = file->tag.get_property("CWINDOW_CLICK2PLAY", cwindow_click2play);
cwindow_clear_color = file->tag.get_property("CWINDOW_CLEAR_COLOR", cwindow_clear_color);
cwindow_zoom = file->tag.get_property("CWINDOW_ZOOM", cwindow_zoom);
cwindow_click2play = file->tag.get_property("CWINDOW_CLICK2PLAY", cwindow_click2play);
cwindow_clear_color = file->tag.get_property("CWINDOW_CLEAR_COLOR", cwindow_clear_color);
- cwindow_clear_alpha = file->tag.get_property("CWINDOW_CLEAR_ALPHA", cwindow_clear_alpha);
editing_mode = file->tag.get_property("EDITING_MODE", editing_mode);
folderlist_format = file->tag.get_property("FOLDERLIST_FORMAT", folderlist_format);
highlighted_track = file->tag.get_property("HIGHLIGHTED_TRACK", 0);
editing_mode = file->tag.get_property("EDITING_MODE", editing_mode);
folderlist_format = file->tag.get_property("FOLDERLIST_FORMAT", folderlist_format);
highlighted_track = file->tag.get_property("HIGHLIGHTED_TRACK", 0);
@@
-712,7
+707,6
@@
int EDLSession::save_xml(FileXML *file)
file->tag.set_property("CWINDOW_ZOOM", cwindow_zoom);
file->tag.set_property("CWINDOW_CLICK2PLAY", cwindow_click2play);
file->tag.set_property("CWINDOW_CLEAR_COLOR", cwindow_clear_color);
file->tag.set_property("CWINDOW_ZOOM", cwindow_zoom);
file->tag.set_property("CWINDOW_CLICK2PLAY", cwindow_click2play);
file->tag.set_property("CWINDOW_CLEAR_COLOR", cwindow_clear_color);
- file->tag.set_property("CWINDOW_CLEAR_ALPHA", cwindow_clear_alpha);
file->tag.set_property("EDITING_MODE", editing_mode);
file->tag.set_property("FOLDERLIST_FORMAT", folderlist_format);
file->tag.set_property("HIGHLIGHTED_TRACK", highlighted_track);
file->tag.set_property("EDITING_MODE", editing_mode);
file->tag.set_property("FOLDERLIST_FORMAT", folderlist_format);
file->tag.set_property("HIGHLIGHTED_TRACK", highlighted_track);
@@
-851,7
+845,6
@@
int EDLSession::copy(EDLSession *session)
cwindow_zoom = session->cwindow_zoom;
cwindow_click2play = session->cwindow_click2play;
cwindow_clear_color = session->cwindow_clear_color;
cwindow_zoom = session->cwindow_zoom;
cwindow_click2play = session->cwindow_click2play;
cwindow_clear_color = session->cwindow_clear_color;
- cwindow_clear_alpha = session->cwindow_clear_alpha;
strcpy(default_atransition, session->default_atransition);
strcpy(default_vtransition, session->default_vtransition);
default_transition_length = session->default_transition_length;
strcpy(default_atransition, session->default_atransition);
strcpy(default_vtransition, session->default_vtransition);
default_transition_length = session->default_transition_length;
diff --git
a/cinelerra-5.1/cinelerra/edlsession.h
b/cinelerra-5.1/cinelerra/edlsession.h
index eebe71f2bac092bcfb9a3c3564a8773f7796e69f..fad4789aaa6b5388e31f61522c4f3f39a97a9469 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edlsession.h
+++ b/
cinelerra-5.1/cinelerra/edlsession.h
@@
-121,7
+121,6
@@
public:
int cwindow_click2play;
// CWindow clear color
int cwindow_clear_color;
int cwindow_click2play;
// CWindow clear color
int cwindow_clear_color;
- int cwindow_clear_alpha;
// Transition
char default_atransition[BCTEXTLEN];
char default_vtransition[BCTEXTLEN];
// Transition
char default_atransition[BCTEXTLEN];
char default_vtransition[BCTEXTLEN];
diff --git
a/cinelerra-5.1/cinelerra/packagerenderer.C
b/cinelerra-5.1/cinelerra/packagerenderer.C
index 2cdc807039414daf2825ff4b2c401f0c0d04947f..1c86af68d02b5bb2d050cfa2b5a52a463c4514fb 100644
(file)
--- a/
cinelerra-5.1/cinelerra/packagerenderer.C
+++ b/
cinelerra-5.1/cinelerra/packagerenderer.C
@@
-91,6
+91,7
@@
PackageFile::~PackageFile()
int PackageFile::write_frame_done(int64_t position)
{
int PackageFile::write_frame_done(int64_t position)
{
+ if( !package_renderer->package->use_brender ) return 0;
return package_renderer->set_video_map(position, BRender::RENDERED);
}
return package_renderer->set_video_map(position, BRender::RENDERED);
}
diff --git
a/cinelerra-5.1/cinelerra/pluginclient.C
b/cinelerra-5.1/cinelerra/pluginclient.C
index 94a208844658668db4048770b28b1eefb3044843..29306b8c5f50e222ba2dce26e973319c6bd895ea 100644
(file)
--- a/
cinelerra-5.1/cinelerra/pluginclient.C
+++ b/
cinelerra-5.1/cinelerra/pluginclient.C
@@
-939,8
+939,7
@@
double PluginClient::get_project_framerate()
const char *PluginClient::get_source_path()
{
const char *PluginClient::get_source_path()
{
- EDL *edl = get_edl();
- Plugin *plugin = edl->tracks->plugin_exists(server->plugin_id);
+ Plugin *plugin = server->edl->tracks->plugin_exists(server->plugin_id);
int64_t source_position = plugin->startproject;
Edit *edit = plugin->track->edits->editof(source_position,PLAY_FORWARD,0);
Indexable *indexable = edit ? edit->get_source() : 0;
int64_t source_position = plugin->startproject;
Edit *edit = plugin->track->edits->editof(source_position,PLAY_FORWARD,0);
Indexable *indexable = edit ? edit->get_source() : 0;
diff --git
a/cinelerra-5.1/cinelerra/renderfarm.h
b/cinelerra-5.1/cinelerra/renderfarm.h
index 1391351cccec3f38ad42a31b4952762ba8175119..f5ca9f966748a3249f3f6d1c746b9e3b1c47e58f 100644
(file)
--- a/
cinelerra-5.1/cinelerra/renderfarm.h
+++ b/
cinelerra-5.1/cinelerra/renderfarm.h
@@
-127,7
+127,7
@@
enum
{
RENDERFARM_NONE,
enum
{
RENDERFARM_NONE,
- RENDERFARM_PREFERENCES, //
0
Get preferences on startup
+ RENDERFARM_PREFERENCES, // Get preferences on startup
RENDERFARM_ASSET, // Get output format on startup
RENDERFARM_EDL, // Get EDL on startup
RENDERFARM_PACKAGE, // Get one package after another to render
RENDERFARM_ASSET, // Get output format on startup
RENDERFARM_EDL, // Get EDL on startup
RENDERFARM_PACKAGE, // Get one package after another to render
@@
-135,7
+135,7
@@
enum
RENDERFARM_SET_RESULT, // Update error status
RENDERFARM_GET_RESULT, // Retrieve error status
RENDERFARM_DONE, // Quit
RENDERFARM_SET_RESULT, // Update error status
RENDERFARM_GET_RESULT, // Retrieve error status
RENDERFARM_DONE, // Quit
- RENDERFARM_SET_VMAP, //
8
Update video map in background rendering
+ RENDERFARM_SET_VMAP, // Update video map in background rendering
RENDERFARM_COMMAND, // Get the client to run
RENDERFARM_TUNER, // Run a tuner server
RENDERFARM_PACKAGES, // Run packages
RENDERFARM_COMMAND, // Get the client to run
RENDERFARM_TUNER, // Run a tuner server
RENDERFARM_PACKAGES, // Run packages
diff --git
a/cinelerra-5.1/cinelerra/renderfarmclient.C
b/cinelerra-5.1/cinelerra/renderfarmclient.C
index 17b345112a4c49891650d459fbe3fe0a51c541bf..807b866afd2c9c96b09924ebe01decc99c43f2e5 100644
(file)
--- a/
cinelerra-5.1/cinelerra/renderfarmclient.C
+++ b/
cinelerra-5.1/cinelerra/renderfarmclient.C
@@
-122,6
+122,11
@@
void RenderFarmClient::main_loop()
perror(_("RenderFarmClient::main_loop: socket"));
return;
}
perror(_("RenderFarmClient::main_loop: socket"));
return;
}
+ struct linger lgr;
+ lgr.l_onoff = 0;
+ lgr.l_linger = 0;
+ if( setsockopt(socket_fd, SOL_SOCKET, SO_LINGER, &lgr, sizeof(lgr)) < 0 )
+ perror("RenderFarmClient::setsockopt:setlinger 0");
if(bind(socket_fd,
(struct sockaddr*)&addr,
if(bind(socket_fd,
(struct sockaddr*)&addr,
@@
-147,6
+152,11
@@
void RenderFarmClient::main_loop()
perror(_("RenderFarmClient::main_loop: socket"));
return;
}
perror(_("RenderFarmClient::main_loop: socket"));
return;
}
+ struct linger lgr;
+ lgr.l_onoff = 0;
+ lgr.l_linger = 0;
+ if( setsockopt(socket_fd, SOL_SOCKET, SO_LINGER, &lgr, sizeof(lgr)) < 0 )
+ perror("RenderFarmClient::setsockopt:setlinger 1");
if(bind(socket_fd,
(struct sockaddr*)&addr,
if(bind(socket_fd,
(struct sockaddr*)&addr,
@@
-267,7
+277,8
@@
int RenderFarmClientThread::read_socket(char *data, int len)
int bytes_read = 0;
int offset = 0;
//printf("RenderFarmClientThread::read_socket 1\n");
int bytes_read = 0;
int offset = 0;
//printf("RenderFarmClientThread::read_socket 1\n");
- watchdog->begin_request();
+ if( watchdog )
+ watchdog->begin_request();
while(len > 0 && bytes_read >= 0)
{
bytes_read = read(socket_fd, data + offset, len);
while(len > 0 && bytes_read >= 0)
{
bytes_read = read(socket_fd, data + offset, len);
@@
-282,7
+293,8
@@
int RenderFarmClientThread::read_socket(char *data, int len)
break;
}
}
break;
}
}
- watchdog->end_request();
+ if( watchdog )
+ watchdog->end_request();
//printf("RenderFarmClientThread::read_socket 10\n");
return offset;
//printf("RenderFarmClientThread::read_socket 10\n");
return offset;
diff --git
a/cinelerra-5.1/cinelerra/videodevice.C
b/cinelerra-5.1/cinelerra/videodevice.C
index dd0ee060d9bcb9ca732cf87b22dd805180bf3792..3ca744b4c29abaa7bbe421eb8b895de93c229738 100644
(file)
--- a/
cinelerra-5.1/cinelerra/videodevice.C
+++ b/
cinelerra-5.1/cinelerra/videodevice.C
@@
-722,8
+722,7
@@
void VideoDevice::new_output_buffer(VFrame **output, int colormodel, EDL *edl)
if(!output_base) return;
output_base->new_output_buffer(output, colormodel, edl);
int clr_color = edl->session->cwindow_clear_color;
if(!output_base) return;
output_base->new_output_buffer(output, colormodel, edl);
int clr_color = edl->session->cwindow_clear_color;
- int clr_alpha = edl->session->cwindow_clear_alpha;
- (*output)->set_clear_color(clr_color, clr_alpha);
+ (*output)->set_clear_color(clr_color, 0xff);
}
}
diff --git
a/cinelerra-5.1/cinelerra/virtualvconsole.C
b/cinelerra-5.1/cinelerra/virtualvconsole.C
index 193761b6763a61d11b0b85c8edbb4ec658df2b99..3c3fb86f5710e15954c927f358210027cb819ed1 100644
(file)
--- a/
cinelerra-5.1/cinelerra/virtualvconsole.C
+++ b/
cinelerra-5.1/cinelerra/virtualvconsole.C
@@
-99,6
+99,10
@@
int VirtualVConsole::process_buffer(int64_t input_position,
exit_nodes.total);
exit_nodes.total);
+ EDLSession *session = renderengine->get_edl()->session;
+ int clr_color = session->cwindow_clear_color;
+ vrender->video_out->set_clear_color(clr_color, 0xff);
+
if(use_opengl)
{
// clear hardware framebuffer
if(use_opengl)
{
// clear hardware framebuffer
@@
-156,9
+160,6
@@
int VirtualVConsole::process_buffer(int64_t input_position,
EDL *edl = renderengine->get_edl();
output_temp = new VFrame( track->track_w, track->track_h,
edl->session->color_model);
EDL *edl = renderengine->get_edl();
output_temp = new VFrame( track->track_w, track->track_h,
edl->session->color_model);
- int clr_color = edl->session->cwindow_clear_color;
- int clr_alpha = edl->session->cwindow_clear_alpha;
- output_temp->set_clear_color(clr_color, clr_alpha);
}
// Reset OpenGL state
}
// Reset OpenGL state
diff --git
a/cinelerra-5.1/configure.ac
b/cinelerra-5.1/configure.ac
index 1d00a4357f8fb4b7a21502572c9b0e8d05716fc7..d529a8015e29bd7fbca52942b0c5efab6aa7e2a8 100644
(file)
--- a/
cinelerra-5.1/configure.ac
+++ b/
cinelerra-5.1/configure.ac
@@
-414,7
+414,7
@@
PKG_3RD([libaom],[auto],
[ usr/local/include ])
PKG_3RD([dav1d],[auto],
[ usr/local/include ])
PKG_3RD([dav1d],[auto],
- [dav1d-0.
7
.1],
+ [dav1d-0.
5
.1],
[ usr/local/lib*/libdav1d*.a ],
[ usr/local/include ])
[ usr/local/lib*/libdav1d*.a ],
[ usr/local/include ])
diff --git a/cinelerra-5.1/ffmpeg/video/ffv1.avi
b/cinelerra-5.1/ffmpeg/video/ffv1.avi
new file mode 100644
(file)
index 0000000..
519b5e7
--- /dev/null
+++ b/
cinelerra-5.1/ffmpeg/video/ffv1.avi
@@ -0,0
+1
@@
+avi ffv1
diff --git
a/cinelerra-5.1/ffmpeg/video/flv_h264.flv
b/cinelerra-5.1/ffmpeg/video/flv_h264.flv
index 4f185dd6f89e1ddec158d9615330aa140ccc85a8..f3a5ab3b2b16aedb273dae9ed3b1300e48139dc2 100644
(file)
--- a/
cinelerra-5.1/ffmpeg/video/flv_h264.flv
+++ b/
cinelerra-5.1/ffmpeg/video/flv_h264.flv
@@
-1
+1,2
@@
flv libx264
flv libx264
+cin_quality=23
diff --git
a/cinelerra-5.1/plugins/Makefile
b/cinelerra-5.1/plugins/Makefile
index 05323bb86c1fea75ec73a91ef63a24e9363f74ef..178e0ef210f49b3f291973efc9194b71d373d43b 100644
(file)
--- a/
cinelerra-5.1/plugins/Makefile
+++ b/
cinelerra-5.1/plugins/Makefile
@@
-101,8
+101,6
@@
DIRS = $(OPENCV_OBJS) \
loopvideo \
motion \
motion51 \
loopvideo \
motion \
motion51 \
- motion-cv \
- motion-hv \
motion2point \
motionblur \
normalize \
motion2point \
motionblur \
normalize \
@@
-171,6
+169,9
@@
DIRS = $(OPENCV_OBJS) \
theme_unflat \
theme_cakewalk \
theme_unflat \
theme_cakewalk \
+# not maintained
+# motion-cv \
+# motion-hv \
# too costly
# findobject \
# greycstoration \
# too costly
# findobject \
# greycstoration \
diff --git
a/cinelerra-5.1/plugins/histogram/histogramwindow.C
b/cinelerra-5.1/plugins/histogram/histogramwindow.C
index cb50652d838964734b669611c5fe0dae68592af5..8acb53fc3e3186e1cf21694e35e19512581168dd 100644
(file)
--- a/
cinelerra-5.1/plugins/histogram/histogramwindow.C
+++ b/
cinelerra-5.1/plugins/histogram/histogramwindow.C
@@
-323,7
+323,7
@@
int HistogramWindow::resize_event(int w, int h)
low_output->reposition_window(low_output->get_x(),
low_output->get_y() + ydiff);
low_output->reposition_window(low_output->get_x(),
low_output->get_y() + ydiff);
- int xs = (
get_w()
- log_slider->get_w()) / 2;
+ int xs = (
w
- log_slider->get_w()) / 2;
int margin = plugin->get_theme()->widget_border;
log_title1->reposition_window(xs - log_title1->get_w() - margin,
log_title1->get_y() + ydiff);
int margin = plugin->get_theme()->widget_border;
log_title1->reposition_window(xs - log_title1->get_w() - margin,
log_title1->get_y() + ydiff);
diff --git
a/cinelerra-5.1/po/ru.po
b/cinelerra-5.1/po/ru.po
index 93b35adc73a0fbc22c935d3c5cfe943b8bad179c..82f76a244d9b82208a296c87df6a2f506f290e35 100644
(file)
--- a/
cinelerra-5.1/po/ru.po
+++ b/
cinelerra-5.1/po/ru.po
@@
-10,7
+10,7
@@
msgstr ""
"Project-Id-Version: Cinelerra-GG Infinity\n"
"Report-Msgid-Bugs-To: <cin@lists.cinelerra-gg.org>\n"
"POT-Creation-Date: 2020-09-01 04:28+0300\n"
"Project-Id-Version: Cinelerra-GG Infinity\n"
"Report-Msgid-Bugs-To: <cin@lists.cinelerra-gg.org>\n"
"POT-Creation-Date: 2020-09-01 04:28+0300\n"
-"PO-Revision-Date: 2020-09-
06 15:06
+0300\n"
+"PO-Revision-Date: 2020-09-
21 08:48
+0300\n"
"Last-Translator: Andrew Randrianasulu <randrianasulu@gmail.com>\n"
"Language-Team: <randrianasulu@gmail.com>\n"
"Language: ru_RU\n"
"Last-Translator: Andrew Randrianasulu <randrianasulu@gmail.com>\n"
"Language-Team: <randrianasulu@gmail.com>\n"
"Language: ru_RU\n"
@@
-11247,7
+11247,7
@@
msgstr "Компрессор"
#: plugins/compressor/compressor.C:394
#: plugins/compressormulti/comprmultigui.C:113
msgid "Sound level (Press shift to snap to grid):"
#: plugins/compressor/compressor.C:394
#: plugins/compressormulti/comprmultigui.C:113
msgid "Sound level (Press shift to snap to grid):"
-msgstr "Уровень звука (нажм. shift д
ял
выравнивания по сетке):"
+msgstr "Уровень звука (нажм. shift д
ля
выравнивания по сетке):"
#: plugins/compressor/compressor.C:406
#: plugins/compressormulti/comprmultigui.C:129
#: plugins/compressor/compressor.C:406
#: plugins/compressormulti/comprmultigui.C:129
diff --git
a/cinelerra-5.1/thirdparty/src/dav1d-0.7.1.patch1
b/cinelerra-5.1/thirdparty/src/dav1d-0.5.1.patch1
similarity index 92%
rename from
cinelerra-5.1/thirdparty/src/dav1d-0.7.1.patch1
rename to
cinelerra-5.1/thirdparty/src/dav1d-0.5.1.patch1
index 21c98a3ab8ce8ad7b455e01c72e0c50a4cc3504a..d4f2b8356971afc979633a0cd8b1b2f33c9000fc 100644
(file)
--- a/
cinelerra-5.1/thirdparty/src/dav1d-0.7.1.patch1
+++ b/
cinelerra-5.1/thirdparty/src/dav1d-0.5.1.patch1
@@
-1,7
+1,7
@@
-diff -
ruN dav1d-0.7.1.orig/Makefile dav1d-0.7.1
/Makefile
----
dav1d-0.7.1.orig/Makefile
1969-12-31 17:00:00.000000000 -0700
-+++
dav1d-0.7.1/Makefile 2020-07-09 20:10:47.066626832
-0600
-@@ -0,0 +1,3
71
@@
+diff -
urN a/Makefile b
/Makefile
+---
a/Makefile
1969-12-31 17:00:00.000000000 -0700
++++
b/Makefile 2019-10-14 10:54:47.354841430
-0600
+@@ -0,0 +1,3
63
@@
+
+_ARCH := $(shell uname -m)
+ARCH_I32 := $(shell expr "x$(_ARCH)" : 'xi[346]86.*')
+
+_ARCH := $(shell uname -m)
+ARCH_I32 := $(shell expr "x$(_ARCH)" : 'xi[346]86.*')
@@
-36,7
+36,7
@@
diff -ruN dav1d-0.7.1.orig/Makefile dav1d-0.7.1/Makefile
+
+STATIC_LIB=$(BUILD)/src/libdav1d.a
+SHARED_LIB=$(BUILD)/src/libdav1d.so
+
+STATIC_LIB=$(BUILD)/src/libdav1d.a
+SHARED_LIB=$(BUILD)/src/libdav1d.so
-+DEFS= -DNDEBUG -D_FILE_OFFSET_BITS=64 -D_POSIX_C_SOURCE=200112L
-D_GNU_SOURCE
++DEFS= -DNDEBUG -D_FILE_OFFSET_BITS=64 -D_POSIX_C_SOURCE=200112L
+FUZZ= -DDAV1D_MT_FUZZING
+
+BLD_INCL= $(DEFS) -I. -Isrc -Iinclude/dav1d -Iinclude \
+FUZZ= -DDAV1D_MT_FUZZING
+
+BLD_INCL= $(DEFS) -I. -Isrc -Iinclude/dav1d -Iinclude \
@@
-78,7
+78,7
@@
diff -ruN dav1d-0.7.1.orig/Makefile dav1d-0.7.1/Makefile
+ -fomit-frame-pointer \
+ -ffast-math \
+ -fPIC \
+ -fomit-frame-pointer \
+ -ffast-math \
+ -fPIC \
-+ -mpreferred-stack-boundary=
6
\
++ -mpreferred-stack-boundary=
5
\
+ -MD -MQ $@ -MF $@.d \
+
+SHA_OPTS=\
+ -MD -MQ $@ -MF $@.d \
+
+SHA_OPTS=\
@@
-88,9
+88,9
@@
diff -ruN dav1d-0.7.1.orig/Makefile dav1d-0.7.1/Makefile
+ -shared \
+ -fPIC \
+ -Wl,--start-group \
+ -shared \
+ -fPIC \
+ -Wl,--start-group \
-+ -Wl,-soname,libdav1d.so.
3
\
++ -Wl,-soname,libdav1d.so.
2
\
+ -Wl,--end-group \
+ -Wl,--end-group \
-+ -pthread
-ldl
\
++ -pthread \
+
+CC_CC=$(Q)cc $(CC_OPTS) $(CFLAGS)
+NASM=$(Q)/usr/bin/nasm
+
+CC_CC=$(Q)cc $(CC_OPTS) $(CFLAGS)
+NASM=$(Q)/usr/bin/nasm
@@
-98,13
+98,11
@@
diff -ruN dav1d-0.7.1.orig/Makefile dav1d-0.7.1/Makefile
+
+# nasm
+NASM_OBJS=$(call any,$(NASM_BLD), \
+
+# nasm
+NASM_OBJS=$(call any,$(NASM_BLD), \
-+ cdef_avx512.obj \
-+ cdef_avx2.obj \
++ cdef.obj \
+ film_grain.obj \
+ ipred.obj \
+ itx.obj \
+ cdef_sse.obj \
+ film_grain.obj \
+ ipred.obj \
+ itx.obj \
+ cdef_sse.obj \
-+ film_grain_ssse3.obj \
+ ipred_ssse3.obj \
+ loopfilter.obj \
+ looprestoration.obj \
+ ipred_ssse3.obj \
+ loopfilter.obj \
+ looprestoration.obj \
@@
-112,7
+110,7
@@
diff -ruN dav1d-0.7.1.orig/Makefile dav1d-0.7.1/Makefile
+ itx_ssse3.obj \
+ looprestoration_ssse3.obj \
+ loopfilter_ssse3.obj \
+ itx_ssse3.obj \
+ looprestoration_ssse3.obj \
+ loopfilter_ssse3.obj \
-+ mc_ss
e
.obj \
++ mc_ss
se3
.obj \
+ cpuid.obj \
+ msac.obj )
+
+ cpuid.obj \
+ msac.obj )
+
@@
-138,7
+136,6
@@
diff -ruN dav1d-0.7.1.orig/Makefile dav1d-0.7.1/Makefile
+ dequant_tables.o \
+ getbits.o \
+ intra_edge.o \
+ dequant_tables.o \
+ getbits.o \
+ intra_edge.o \
-+ itx_1d.o \
+ lf_mask.o \
+ log.o \
+ msac.o \
+ lf_mask.o \
+ log.o \
+ msac.o \
@@
-146,13
+143,12
@@
diff -ruN dav1d-0.7.1.orig/Makefile dav1d-0.7.1/Makefile
+ picture.o \
+ qm.o \
+ ref.o \
+ picture.o \
+ qm.o \
+ ref.o \
-+ refmvs.o \
++ ref
_
mvs.o \
+ scan.o \
+ tables.o \
+ warpmv.o \
+ wedge.o \
+ scan.o \
+ tables.o \
+ warpmv.o \
+ wedge.o \
-+ x86/cpu.c.o \
-+ x86/msac_init.c.o)
++ x86/cpu.c.o)
+$(SRC_BLD)/%.o: src/%.c
+ $(CC_CC) $(BLD_INCL) -pthread -o $@ -c $<
+$(SRC_BLD)/x86/%.c.o: src/x86/%.c
+$(SRC_BLD)/%.o: src/%.c
+ $(CC_CC) $(BLD_INCL) -pthread -o $@ -c $<
+$(SRC_BLD)/x86/%.c.o: src/x86/%.c
@@
-206,9
+202,6
@@
diff -ruN dav1d-0.7.1.orig/Makefile dav1d-0.7.1/Makefile
+ echo >> $@ "#define CONFIG_LOG 1"
+ echo >> $@ "#define ENDIANNESS_BIG 0"
+ echo >> $@ "#define HAVE_ASM 1"
+ echo >> $@ "#define CONFIG_LOG 1"
+ echo >> $@ "#define ENDIANNESS_BIG 0"
+ echo >> $@ "#define HAVE_ASM 1"
-+ echo >> $@ "#define HAVE_AVX512ICL 0"
-+ echo >> $@ "#define HAVE_CLOCK_GETTIME 1"
-+ echo >> $@ "#define HAVE_DLSYM 1"
+ echo >> $@ "#define HAVE_POSIX_MEMALIGN 1"
+ echo >> $@ "#define HAVE_UNISTD_H 1"
+ echo >> $@ "#define STACK_ALIGNMENT 32"
+ echo >> $@ "#define HAVE_POSIX_MEMALIGN 1"
+ echo >> $@ "#define HAVE_UNISTD_H 1"
+ echo >> $@ "#define STACK_ALIGNMENT 32"
@@
-218,17
+211,16
@@
diff -ruN dav1d-0.7.1.orig/Makefile dav1d-0.7.1/Makefile
+ echo >> $@ "%define ARCH_X86_64 $(ARCH_X86_64)"
+ echo >> $@ "%define PIC 1"
+ echo >> $@ "%define STACK_ALIGNMENT 32"
+ echo >> $@ "%define ARCH_X86_64 $(ARCH_X86_64)"
+ echo >> $@ "%define PIC 1"
+ echo >> $@ "%define STACK_ALIGNMENT 32"
-+ echo >> $@ "%define HAVE_AVX512ICL 0"
+
+$(BUILD)/include/vcs_version.h:
+ mkdir -p $(BUILD)/include
+
+$(BUILD)/include/vcs_version.h:
+ mkdir -p $(BUILD)/include
-+ echo > $@ "#define DAV1D_VERSION \"0.
7.1
\""
++ echo > $@ "#define DAV1D_VERSION \"0.
5.0
\""
+
+$(BUILD)/include/dav1d/version.h:
+ mkdir -p $(BUILD)/include/dav1d
+ echo > $@ "#ifndef DAV1D_VERSION_H"
+ echo >> $@ "#define DAV1D_VERSION_H"
+
+$(BUILD)/include/dav1d/version.h:
+ mkdir -p $(BUILD)/include/dav1d
+ echo > $@ "#ifndef DAV1D_VERSION_H"
+ echo >> $@ "#define DAV1D_VERSION_H"
-+ echo >> $@ "#define DAV1D_API_VERSION_MAJOR
3
"
++ echo >> $@ "#define DAV1D_API_VERSION_MAJOR
2
"
+ echo >> $@ "#define DAV1D_API_VERSION_MINOR 0"
+ echo >> $@ "#define DAV1D_API_VERSION_PATCH 0"
+ echo >> $@ "#endif /* DAV1D_VERSION_H */"
+ echo >> $@ "#define DAV1D_API_VERSION_MINOR 0"
+ echo >> $@ "#define DAV1D_API_VERSION_PATCH 0"
+ echo >> $@ "#endif /* DAV1D_VERSION_H */"
diff --git a/cinelerra-5.1/thirdparty/src/dav1d-0.5.1.tar.gz
b/cinelerra-5.1/thirdparty/src/dav1d-0.5.1.tar.gz
new file mode 100644
(file)
index 0000000..
805f750
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/dav1d-0.5.1.tar.gz differ
diff --git
a/cinelerra-5.1/thirdparty/src/dav1d-0.7.1.tar.xz
b/cinelerra-5.1/thirdparty/src/dav1d-0.7.1.tar.xz
deleted file mode 100644
(file)
index
04cf8d6
..0000000
Binary files a/cinelerra-5.1/thirdparty/src/dav1d-0.7.1.tar.xz and /dev/null differ