From cbe947d378de6eaa11f38ec58b4f71c5c47f72bc Mon Sep 17 00:00:00 2001 From: Good Guy Date: Wed, 30 Oct 2019 16:59:29 -0600 Subject: [PATCH] booby fixes, seltemp radio btn offset fix, ffmpeg options layout tweak, change extension qt to mov in formattools --- cinelerra-5.1/cinelerra/fileffmpeg.C | 4 ++-- cinelerra-5.1/cinelerra/formattools.C | 7 ++++--- cinelerra-5.1/ffmpeg/audio/avi_mp3.avi | 1 + cinelerra-5.1/ffmpeg/audio/avi_pcm_s16.avi | 1 + cinelerra-5.1/ffmpeg/video/avi.xvid | 2 -- cinelerra-5.1/ffmpeg/video/dv_ntsc.avi | 2 +- cinelerra-5.1/ffmpeg/video/dv_pal.avi | 4 ++++ cinelerra-5.1/ffmpeg/video/dv_pal.qt | 4 ++++ cinelerra-5.1/ffmpeg/video/xvid.avi | 2 ++ cinelerra-5.1/msg/txt | 6 ++++++ cinelerra-5.1/plugins/denoiseseltempavg/seltempavg.C | 4 ++-- cinelerra-5.1/plugins/denoiseseltempavg/seltempavgwindow.C | 3 +-- 12 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 cinelerra-5.1/ffmpeg/audio/avi_mp3.avi create mode 100644 cinelerra-5.1/ffmpeg/audio/avi_pcm_s16.avi delete mode 100644 cinelerra-5.1/ffmpeg/video/avi.xvid create mode 100644 cinelerra-5.1/ffmpeg/video/dv_pal.avi create mode 100644 cinelerra-5.1/ffmpeg/video/dv_pal.qt create mode 100644 cinelerra-5.1/ffmpeg/video/xvid.avi diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C index bfd7ed69..564306e6 100644 --- 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 9199fff0..2bf178ab 100644 --- 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 index 00000000..b0e6912c --- /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 index 00000000..b7502b6c --- /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 index acb78bf7..00000000 --- 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 b7967673..fcb180a7 100644 --- 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 index 00000000..18aca931 --- /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 index 00000000..8cde7dc4 --- /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 index 00000000..be9e8e0f --- /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 1541f755..6ddc0351 100644 --- 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 6bff65ac..7cd86503 100644 --- 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 c4dc3a70..26f739db 100644 --- 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); -- 2.26.2