From: Good Guy Date: Mon, 25 Dec 2017 03:39:07 +0000 (-0700) Subject: sams transition icons, misc fixes, youtube formats X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=89205d2d9298c3e37b4dd60a9dab1e3a1bdafae7;p=goodguy%2Fhistory.git sams transition icons, misc fixes, youtube formats --- diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index f071ea3d..a50f21a2 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -1112,7 +1112,7 @@ void AWindowGUI::update_asset_list() assets.remove_number(i); continue; } - if( !picon->indexable->is_asset ) continue; + if( !picon->indexable || !picon->indexable->is_asset ) continue; struct stat st; picon->mtime = !stat(picon->indexable->path, &st) ? st.st_mtime : 0; } diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C index 66003120..3d51c70f 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.C +++ b/cinelerra-5.1/cinelerra/ffmpeg.C @@ -1743,8 +1743,11 @@ int FFMPEG::open_decoder() estimated = 1; } } - if( estimated ) + static int notified = 0; + if( !notified && estimated ) { + notified = 1; printf("FFMPEG::open_decoder: some stream times estimated\n"); + } ff_lock("FFMPEG::open_decoder"); int ret = 0, bad_time = 0; diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C index 7d94acdc..ea74b396 100644 --- a/cinelerra-5.1/cinelerra/formattools.C +++ b/cinelerra-5.1/cinelerra/formattools.C @@ -188,7 +188,7 @@ void FormatTools::create_objects( window->add_subwindow(format_button = new FormatFormat(x, y, this)); format_button->create_objects(); x += format_button->get_w() + 5; - window->add_subwindow(ffmpeg_type = new FFMpegType(x, y, 64, 1, asset->fformat)); + window->add_subwindow(ffmpeg_type = new FFMpegType(x, y, 70, 1, asset->fformat)); FFMPEG::set_asset_format(asset, asset->fformat); x += ffmpeg_type->get_w(); window->add_subwindow(format_ffmpeg = new FormatFFMPEG(x, y, this)); diff --git a/cinelerra-5.1/cinelerra/sighandler.C b/cinelerra-5.1/cinelerra/sighandler.C index 93d8da20..f9a56432 100644 --- a/cinelerra-5.1/cinelerra/sighandler.C +++ b/cinelerra-5.1/cinelerra/sighandler.C @@ -43,14 +43,8 @@ void SigHandler::signal_handler(int signum) void SigHandler::push_file(File *file) { // Check for duplicate - for(int i = 0; i < files.total; i++) - { - if(files.values[i] == file) - { - printf("SigHandler::push_file: file %s already on table.\n", - file->asset->path); - return; - } + for(int i = 0; i < files.total; i++) { + if(files.values[i] == file) return; } // Append file @@ -67,17 +61,5 @@ void SigHandler::pull_file(File *file) return; } } - printf("SigHandler::pull_file: file %s not on table.\n", - file->asset->path); } - - - - - - - - - - diff --git a/cinelerra-5.1/ffmpeg/audio/stereo.youtube b/cinelerra-5.1/ffmpeg/audio/stereo.youtube new file mode 100644 index 00000000..9a79f214 --- /dev/null +++ b/cinelerra-5.1/ffmpeg/audio/stereo.youtube @@ -0,0 +1,5 @@ +webm libopus +# YOUTUBE - use Settings->Format to adjust your audio - +# legal sample rates: 8000/12000/16000/24000H/48000Hz +# Stereo is 384k; change to 128k for mono, 512k for 5.1 +b=384k diff --git a/cinelerra-5.1/ffmpeg/audio/youtube.dfl b/cinelerra-5.1/ffmpeg/audio/youtube.dfl new file mode 100644 index 00000000..fb3d14fa --- /dev/null +++ b/cinelerra-5.1/ffmpeg/audio/youtube.dfl @@ -0,0 +1 @@ +stereo.youtube diff --git a/cinelerra-5.1/ffmpeg/video/hd.youtube b/cinelerra-5.1/ffmpeg/video/hd.youtube new file mode 100644 index 00000000..80a99e12 --- /dev/null +++ b/cinelerra-5.1/ffmpeg/video/hd.youtube @@ -0,0 +1,14 @@ +webm libvpx-vp9 +# YOUTUBE - High Definition video +# More VP9 options if choose format of webm +# Refer to section 3.4 in Features5.pdf +# 1920x1080 (24, 25 or 30 frames per second) +bitrate=1800k +minrate=900k +maxrate=2610k +tile-columns=2 +g=240 +threads=8 +quality=good +crf=31 +speed=4 diff --git a/cinelerra-5.1/ffmpeg/video/sd.youtube b/cinelerra-5.1/ffmpeg/video/sd.youtube new file mode 100644 index 00000000..193e3bd4 --- /dev/null +++ b/cinelerra-5.1/ffmpeg/video/sd.youtube @@ -0,0 +1,14 @@ +webm libvpx-vp9 +# YOUTUBE & good for many web/mobile devices +# More VP9 options if choose format of webm +# Refer to section 3.4 in Features5.pdf +# 640x480 (Medium Quality, 24/25/30 frames per second) +bitrate=750k +minrate=375k +maxrate=1088k +tile-columns=1 +g=240 +threads=4 +quality=good +crf=33 +speed=4 diff --git a/cinelerra-5.1/ffmpeg/video/uhd.youtube b/cinelerra-5.1/ffmpeg/video/uhd.youtube new file mode 100644 index 00000000..049e4597 --- /dev/null +++ b/cinelerra-5.1/ffmpeg/video/uhd.youtube @@ -0,0 +1,14 @@ +webm libvpx-vp9 +# YOUTUBE - Ultra High Definition video +# More VP9 options if choose format of webm +# Refer to section 3.4 in Features5.pdf +# 3840x2160 (50 or 60 frames per second) +bitrate=18000k +minrate=9000k +maxrate=26100k +tile-columns=4 +g=240 +threads=24 +quality=good +crf=15 +speed=4 diff --git a/cinelerra-5.1/ffmpeg/video/youtube.dfl b/cinelerra-5.1/ffmpeg/video/youtube.dfl new file mode 100644 index 00000000..1341e4a0 --- /dev/null +++ b/cinelerra-5.1/ffmpeg/video/youtube.dfl @@ -0,0 +1 @@ +hd.youtube diff --git a/cinelerra-5.1/guicast/bcrecentlist.C b/cinelerra-5.1/guicast/bcrecentlist.C index 3d0d2839..73d2859d 100644 --- a/cinelerra-5.1/guicast/bcrecentlist.C +++ b/cinelerra-5.1/guicast/bcrecentlist.C @@ -67,7 +67,7 @@ BC_RecentList::~BC_RecentList() int BC_RecentList::handle_event() { BC_ListBoxItem *item = get_selection(0, 0); - if (item < 0) return 0; + if( !item ) return 0; char *text = item->get_text(); if (text && textbox) { // change the text in the textbox diff --git a/cinelerra-5.1/guicast/bcsignals.C b/cinelerra-5.1/guicast/bcsignals.C index ec08b6fa..a2bc0120 100644 --- a/cinelerra-5.1/guicast/bcsignals.C +++ b/cinelerra-5.1/guicast/bcsignals.C @@ -255,7 +255,6 @@ static void signal_entry(int signum) BC_Trace::dump_traces(); BC_Trace::dump_locks(); BC_Trace::dump_buffers(); - BC_Trace::dump_shm_stats(); BC_Trace::delete_temps(); // Call user defined signal handler diff --git a/cinelerra-5.1/guicast/bctrace.C b/cinelerra-5.1/guicast/bctrace.C index c50fff5f..70c7a406 100644 --- a/cinelerra-5.1/guicast/bctrace.C +++ b/cinelerra-5.1/guicast/bctrace.C @@ -353,7 +353,7 @@ void TheList::dbg_add(pthread_t tid, pthread_t owner, const char *nm) { TheLocker the_locker; int i = the_list.size(); - while( --i >= 0 && the_list[i]->tid != tid ); + while( --i >= 0 && !(the_list[i]->tid == tid && the_list[i]->owner == owner) ); if( i >= 0 ) { printf("dbg_add, dup %016lx %s %s\n", (unsigned long)tid, nm, the_list[i]->name); diff --git a/cinelerra-5.1/guicast/thread.C b/cinelerra-5.1/guicast/thread.C index b27f43a2..c2f3321d 100644 --- a/cinelerra-5.1/guicast/thread.C +++ b/cinelerra-5.1/guicast/thread.C @@ -150,7 +150,7 @@ int Thread::join() // join this thread while( running() && !cancelled ) { int ret = pthread_kill(tid, 0); if( ret ) break; - usleep(200000); + usleep(10000); } tid = ((pthread_t)-1); } diff --git a/cinelerra-5.1/picon/cinfinity/crikey.png b/cinelerra-5.1/picon/cinfinity/crikey.png index 293732c7..144f2a29 100644 Binary files a/cinelerra-5.1/picon/cinfinity/crikey.png and b/cinelerra-5.1/picon/cinfinity/crikey.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/audio_icon.png b/cinelerra-5.1/picon/cinfinity2/audio_icon.png new file mode 100644 index 00000000..12cb4245 Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/audio_icon.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/bandslide.png b/cinelerra-5.1/picon/cinfinity2/bandslide.png new file mode 100644 index 00000000..17878184 Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/bandslide.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/bandwipe.png b/cinelerra-5.1/picon/cinfinity2/bandwipe.png new file mode 100644 index 00000000..a80b3158 Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/bandwipe.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/blur.png b/cinelerra-5.1/picon/cinfinity2/blur.png new file mode 100644 index 00000000..8f07e711 Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/blur.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/clip_icon.png b/cinelerra-5.1/picon/cinfinity2/clip_icon.png new file mode 100644 index 00000000..4c0f87d1 Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/clip_icon.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/crossfade.png b/cinelerra-5.1/picon/cinfinity2/crossfade.png new file mode 100644 index 00000000..d23038ec Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/crossfade.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/delayvideo.png b/cinelerra-5.1/picon/cinfinity2/delayvideo.png new file mode 100644 index 00000000..712f09a9 Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/delayvideo.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/denoisevideo.png b/cinelerra-5.1/picon/cinfinity2/denoisevideo.png new file mode 100644 index 00000000..acd2adeb Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/denoisevideo.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/dissolve.png b/cinelerra-5.1/picon/cinfinity2/dissolve.png new file mode 100644 index 00000000..d7f8567f Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/dissolve.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/ff_haas.png b/cinelerra-5.1/picon/cinfinity2/ff_haas.png new file mode 100644 index 00000000..7402e66e Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/ff_haas.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/flash.png b/cinelerra-5.1/picon/cinfinity2/flash.png new file mode 100644 index 00000000..e2ae37ae Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/flash.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/irissquare.png b/cinelerra-5.1/picon/cinfinity2/irissquare.png new file mode 100644 index 00000000..a58003ce Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/irissquare.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/label_icon.png b/cinelerra-5.1/picon/cinfinity2/label_icon.png new file mode 100644 index 00000000..00d91485 Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/label_icon.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/shapewipe.png b/cinelerra-5.1/picon/cinfinity2/shapewipe.png new file mode 100644 index 00000000..ae07fccb Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/shapewipe.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/slide.png b/cinelerra-5.1/picon/cinfinity2/slide.png new file mode 100644 index 00000000..359367b0 Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/slide.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/spherecam.png b/cinelerra-5.1/picon/cinfinity2/spherecam.png index 16313315..de096fe5 100644 Binary files a/cinelerra-5.1/picon/cinfinity2/spherecam.png and b/cinelerra-5.1/picon/cinfinity2/spherecam.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/unknown_icon.png b/cinelerra-5.1/picon/cinfinity2/unknown_icon.png new file mode 100644 index 00000000..889f87b8 Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/unknown_icon.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/video_icon.png b/cinelerra-5.1/picon/cinfinity2/video_icon.png new file mode 100644 index 00000000..38365983 Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/video_icon.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/wipe.png b/cinelerra-5.1/picon/cinfinity2/wipe.png new file mode 100644 index 00000000..c1fc8559 Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/wipe.png differ diff --git a/cinelerra-5.1/picon/cinfinity2/zoom.png b/cinelerra-5.1/picon/cinfinity2/zoom.png new file mode 100644 index 00000000..f759936f Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/zoom.png differ