sams transition icons, misc fixes, youtube formats
authorGood Guy <[email protected]>
Mon, 25 Dec 2017 03:39:07 +0000 (20:39 -0700)
committerGood Guy <[email protected]>
Mon, 25 Dec 2017 03:39:07 +0000 (20:39 -0700)
35 files changed:
cinelerra-5.1/cinelerra/awindowgui.C
cinelerra-5.1/cinelerra/ffmpeg.C
cinelerra-5.1/cinelerra/formattools.C
cinelerra-5.1/cinelerra/sighandler.C
cinelerra-5.1/ffmpeg/audio/stereo.youtube [new file with mode: 0644]
cinelerra-5.1/ffmpeg/audio/youtube.dfl [new file with mode: 0644]
cinelerra-5.1/ffmpeg/video/hd.youtube [new file with mode: 0644]
cinelerra-5.1/ffmpeg/video/sd.youtube [new file with mode: 0644]
cinelerra-5.1/ffmpeg/video/uhd.youtube [new file with mode: 0644]
cinelerra-5.1/ffmpeg/video/youtube.dfl [new file with mode: 0644]
cinelerra-5.1/guicast/bcrecentlist.C
cinelerra-5.1/guicast/bcsignals.C
cinelerra-5.1/guicast/bctrace.C
cinelerra-5.1/guicast/thread.C
cinelerra-5.1/picon/cinfinity/crikey.png
cinelerra-5.1/picon/cinfinity2/audio_icon.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/bandslide.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/bandwipe.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/blur.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/clip_icon.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/crossfade.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/delayvideo.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/denoisevideo.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/dissolve.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/ff_haas.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/flash.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/irissquare.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/label_icon.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/shapewipe.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/slide.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/spherecam.png
cinelerra-5.1/picon/cinfinity2/unknown_icon.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/video_icon.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/wipe.png [new file with mode: 0644]
cinelerra-5.1/picon/cinfinity2/zoom.png [new file with mode: 0644]

index f071ea3d1dda1141e78cb8e904ffe127202a8a1e..a50f21a2280ddea161a53c28a9413449be399269 100644 (file)
@@ -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;
        }
index 66003120eebb2e663947902dacedda0a295f50c7..3d51c70f28e5a8315adc4b871af940bdb59d5c14 100644 (file)
@@ -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;
index 7d94acdc8bda3dd592e139cc09d60efe116f94c9..ea74b396e3c3c37e8825364f3bce49814112cdeb 100644 (file)
@@ -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));
index 93d8da20aa8b39a8aa6bc9dca1119e4e9ceb0576..f9a56432fc1ee7a35077abca057058e234adafb2 100644 (file)
@@ -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 (file)
index 0000000..9a79f21
--- /dev/null
@@ -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 (file)
index 0000000..fb3d14f
--- /dev/null
@@ -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 (file)
index 0000000..80a99e1
--- /dev/null
@@ -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 (file)
index 0000000..193e3bd
--- /dev/null
@@ -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 (file)
index 0000000..049e459
--- /dev/null
@@ -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 (file)
index 0000000..1341e4a
--- /dev/null
@@ -0,0 +1 @@
+hd.youtube
index 3d0d2839066270b886713fadf5fb053c067bdfbe..73d2859dd601da8bbeb0be4222f6f9c7988b84b9 100644 (file)
@@ -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
index ec08b6fa559fb26b013322e76852a6eecc7e2d2c..a2bc012050a04a889f4aa8e18a6ed17bb2bdd3e8 100644 (file)
@@ -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
index c50fff5f45acd2ce4681f222374fe77ebac9c753..70c7a406ef08f9af5c1509b89478c8dd7fb78cda 100644 (file)
@@ -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);
index b27f43a25856198a5e82909b4d788cb677970dad..c2f3321d7987a28f85f90bf65b83078bb65cc72d 100644 (file)
@@ -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);
        }
index 293732c7d85339f68f242d27e2ec6664185bd33c..144f2a291b90923cf21280c363d71b2372e7310a 100644 (file)
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 (file)
index 0000000..12cb424
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 (file)
index 0000000..1787818
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 (file)
index 0000000..a80b315
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 (file)
index 0000000..8f07e71
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 (file)
index 0000000..4c0f87d
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 (file)
index 0000000..d23038e
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 (file)
index 0000000..712f09a
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 (file)
index 0000000..acd2ade
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 (file)
index 0000000..d7f8567
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 (file)
index 0000000..7402e66
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 (file)
index 0000000..e2ae37a
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 (file)
index 0000000..a58003c
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 (file)
index 0000000..00d9148
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 (file)
index 0000000..ae07fcc
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 (file)
index 0000000..359367b
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/slide.png differ
index 163133155de830ef44ce35c6131b91c680b16ff0..de096fe512f9f7b9b0c1284a6c273ccda1da27b8 100644 (file)
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 (file)
index 0000000..889f87b
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 (file)
index 0000000..3836598
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 (file)
index 0000000..c1fc855
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 (file)
index 0000000..f759936
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/zoom.png differ