booby fixes, seltemp radio btn offset fix, ffmpeg options layout tweak, change extens...

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index bfd7ed69b839a38568918c41c7852d65c607a171..564306e656e82fce65b89cbe7555cde7bc72f902 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -476,8 +476,8 @@ FFMPEGConfigAudio::FFMPEGConfigAudio(BC_WindowBase *parent_window, Asset *asset,
 
 FFMPEGConfigAudio::~FFMPEGConfigAudio()
 {
-       delete ff_options_dialog;
        lock_window("FFMPEGConfigAudio::~FFMPEGConfigAudio");
+       delete ff_options_dialog;
        delete preset_popup;
        presets.remove_all_objects();
        unlock_window();
@@ -1540,7 +1540,7 @@ int FFOptionsWindow::resize_event(int w, int h)
        int y0 = units->get_y();
        text->reposition_window(x0,y0, x1-x0-xs8);
        panel_w = get_w()-xs10 - panel_x;
-       panel_h = get_h()-ys10 - panel_y;
+       panel_h = get_h()-ys10 - panel_y - BC_OKButton::calculate_h();
        panel->reposition_window(panel_x,panel_y, panel_w, panel_h);
        return 1;
 }

diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C
index 9199fff077e01c185665c8c23b9aa4d35709a0a5..2bf178ab8927d3b670e61defb7a502df38dade41 100644 (file)
--- a/cinelerra-5.1/cinelerra/formattools.C
+++ b/cinelerra-5.1/cinelerra/formattools.C
@@ -386,8 +386,9 @@ void FormatTools::update_extension()
                if(need_extension)
                {
                        char *ptr1 = ptr;
-                       extension_ptr = asset->format != FILE_FFMPEG ?
-                               extensions.get(0) : asset->fformat;
+// change "qt" to "mov" since ffmpeg does not know qt
+                       extension_ptr = asset->format != FILE_FFMPEG ? extensions.get(0) :
+                               !strcmp(asset->fformat, "qt") ? "mov" : asset->fformat ;
                        while(*extension_ptr != 0 && *extension_ptr != '/')
                                *ptr1++ = *extension_ptr++;
                        *ptr1 = 0;
@@ -770,7 +771,7 @@ int FormatFFMPEG::handle_event()
 {
        BC_ListBoxItem *selection = get_selection(0, 0);
        if( selection ) {
-               char *text = get_selection(0, 0)->get_text();
+               const char *text = get_selection(0, 0)->get_text();
                format->ffmpeg_type->update(text);
                format->asset->ff_audio_options[0] = 0;
                format->asset->ff_video_options[0] = 0;

diff --git a/cinelerra-5.1/ffmpeg/audio/avi_mp3.avi b/cinelerra-5.1/ffmpeg/audio/avi_mp3.avi
new file mode 100644 (file)
index 0000000..b0e6912
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/audio/avi_mp3.avi
@@ -0,0 +1 @@
+avi libmp3lame

diff --git a/cinelerra-5.1/ffmpeg/audio/avi_pcm_s16.avi b/cinelerra-5.1/ffmpeg/audio/avi_pcm_s16.avi
new file mode 100644 (file)
index 0000000..b7502b6
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/audio/avi_pcm_s16.avi
@@ -0,0 +1 @@
+avi pcm_s16le

diff --git a/cinelerra-5.1/ffmpeg/video/avi.xvid b/cinelerra-5.1/ffmpeg/video/avi.xvid
deleted file mode 100644 (file)
index acb78bf..0000000
--- a/cinelerra-5.1/ffmpeg/video/avi.xvid
+++ /dev/null
@@ -1,2 +0,0 @@
-avi mpeg4
-vtag xvid

diff --git a/cinelerra-5.1/ffmpeg/video/dv_ntsc.avi b/cinelerra-5.1/ffmpeg/video/dv_ntsc.avi
index b79676730051dbdf5820baf2041ae65ec2c93ea9..fcb180a75a76c14cb71cc616e48e4564484a664a 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/dv_ntsc.avi
+++ b/cinelerra-5.1/ffmpeg/video/dv_ntsc.avi
@@ -1,4 +1,4 @@
 avi dvvideo
 pixel_format=yuv411p
-top=0
+field_order=bb
 # 720x480, 29.97 fps

diff --git a/cinelerra-5.1/ffmpeg/video/dv_pal.avi b/cinelerra-5.1/ffmpeg/video/dv_pal.avi
new file mode 100644 (file)
index 0000000..18aca93
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/dv_pal.avi
@@ -0,0 +1,4 @@
+avi dvvideo
+pixel_format=yuv420p
+field_order=bb
+# 720x576, 25 fps

diff --git a/cinelerra-5.1/ffmpeg/video/dv_pal.qt b/cinelerra-5.1/ffmpeg/video/dv_pal.qt
new file mode 100644 (file)
index 0000000..8cde7dc
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/dv_pal.qt
@@ -0,0 +1,4 @@
+mov dvvideo
+pixel_format=yuv420p
+field_order=bb
+# 720x576, 25 fps

diff --git a/cinelerra-5.1/ffmpeg/video/xvid.avi b/cinelerra-5.1/ffmpeg/video/xvid.avi
new file mode 100644 (file)
index 0000000..be9e8e0
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/xvid.avi
@@ -0,0 +1,2 @@
+avi mpeg4
+codec_tag 1145656920

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index 1541f7558779339ce4cb3b426006ca17a382a741..6ddc0351d6fd6306ffdd19d598fb59862eb94cc1 100644 (file)
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -8,6 +8,12 @@ Cinfinity icons selected in Preferences Sam (CC BY 3.0,
 Cakewalk and Neophyte themes by Olaf Wolff (CC BY 4.0,
   https://creativecommons.org/licenses/by/4.0/)
 .
+October 2019 New Features of note:
+  Scaling for any size monitor now available in Preferences.
+  New Shape Wipe video transitions have been contributed.
+  Russian translation contributions for better coverage.
+  Insertion Strategy icons added back in for ease of use.
+  Several additional ffmpeg opts files contributed for use.
 September 2019 New Features of note:
   Crop & Position new plugin now available.
   New "Load recent" in File pulldown, for recently used media.

diff --git a/cinelerra-5.1/plugins/denoiseseltempavg/seltempavg.C b/cinelerra-5.1/plugins/denoiseseltempavg/seltempavg.C
index 6bff65acd4a688cf14867863dd360292d3c67021..7cd86503315309ae43b08070bd746f176215279f 100644 (file)
--- a/cinelerra-5.1/plugins/denoiseseltempavg/seltempavg.C
+++ b/cinelerra-5.1/plugins/denoiseseltempavg/seltempavg.C
@@ -881,9 +881,9 @@ void SelTempAvgMain::update_gui()
 {
        if(thread)
        {
+               ((SelTempAvgWindow*)thread->window)->lock_window("SelTempAvgMain::update_gui");
                if(load_configuration())
                {
-                       ((SelTempAvgWindow*)thread->window)->lock_window("SelTempAvgMain::update_gui");
                        ((SelTempAvgWindow*)thread->window)->total_frames->update(config.frames);
 
                        ((SelTempAvgWindow*)thread->window)->method_none->update(         config.method == SelTempAvgConfig::METHOD_NONE);
@@ -911,10 +911,10 @@ void SelTempAvgMain::update_gui()
                        ((SelTempAvgWindow*)thread->window)->mask_RY->update(config.mask_RY);
                        ((SelTempAvgWindow*)thread->window)->mask_GU->update(config.mask_GU);
                        ((SelTempAvgWindow*)thread->window)->mask_BV->update(config.mask_BV);
-                       ((SelTempAvgWindow*)thread->window)->unlock_window();
                }
                ((SelTempAvgWindow*)thread->window)->offset_restartmarker_pos->update((int64_t)restartoffset);
                ((SelTempAvgWindow*)thread->window)->offset_restartmarker_keyframe->update((config.offset_restartmarker_keyframe) && (onakeyframe));
+               ((SelTempAvgWindow*)thread->window)->unlock_window();
        }
 }
 

diff --git a/cinelerra-5.1/plugins/denoiseseltempavg/seltempavgwindow.C b/cinelerra-5.1/plugins/denoiseseltempavg/seltempavgwindow.C
index c4dc3a70333b0a975d3bf830a356530fed76c525..26f739dbeaba4ac141a87863086f40549f1a9bb6 100644 (file)
--- a/cinelerra-5.1/plugins/denoiseseltempavg/seltempavgwindow.C
+++ b/cinelerra-5.1/plugins/denoiseseltempavg/seltempavgwindow.C
@@ -233,8 +233,7 @@ SelTempAvgOffsetRadial::SelTempAvgOffsetRadial(SelTempAvgMain *client, SelTempAv
 }
 int SelTempAvgOffsetRadial::handle_event()
 {
-       int result = get_value();
-       client->config.offsetmode = result;
+       client->config.offsetmode = type;
 
        gui->offset_fixed->update(client->config.offsetmode == SelTempAvgConfig::OFFSETMODE_FIXED);
        gui->offset_restartmarker->update(client->config.offsetmode == SelTempAvgConfig::OFFSETMODE_RESTARTMARKERSYS);