youtube formats, make race conditions, capture colormodel for ffmpeg

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index 82a810d61794dad65817b130262023ed5d40ea91..1faa756741514c87ee67dd2e7da9fe6b175e68be 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -354,6 +354,7 @@ int FileFFMPEG::get_best_colormodel(Asset *asset, int driver)
 {
        switch(driver) {
 // the direct X11 color model requires scaling in the codec
+       case SCREENCAPTURE:
        case PLAYBACK_X11:
        case PLAYBACK_X11_GL: return BC_RGB888;
        case PLAYBACK_X11_XV: return BC_YUV420P;

diff --git a/cinelerra-5.1/ffmpeg/audio/stereo_with_h264.youtube b/cinelerra-5.1/ffmpeg/audio/stereo_with_h264.youtube
new file mode 100644 (file)
index 0000000..d084baf
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/audio/stereo_with_h264.youtube
@@ -0,0 +1,4 @@
+mp4 libfdk_aac
+# Recommended sample rates: 48000Hz or 96000Hz
+# Stereo is 384k; change to 128k for mono, 512k for 5.1
+b=384k

diff --git a/cinelerra-5.1/ffmpeg/video/hd_h264.youtube b/cinelerra-5.1/ffmpeg/video/hd_h264.youtube
new file mode 100644 (file)
index 0000000..612d9c4
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/hd_h264.youtube
@@ -0,0 +1,8 @@
+mp4 libx264
+# YOUTUBE High Definition; for resolution of 1920x1080;
+#  24/25/30 fps. Change audio to: stereo_with_h264.
+b=10000k
+profile=high
+# use framerate for 1 keyframe/sec, needed for seeks
+keyint_min=24
+x264opts keyint=24

diff --git a/cinelerra-5.1/ffmpeg/video/sd_h264.youtube b/cinelerra-5.1/ffmpeg/video/sd_h264.youtube
new file mode 100644 (file)
index 0000000..007eb43
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/sd_h264.youtube
@@ -0,0 +1,8 @@
+mp4 libx264
+# YOUTUBE Standard Definition; for resolution of 640×480;
+#  24/25/30 fps. Change audio to: stereo_with_h264.
+b=2500k
+profile=high
+# use framerate for 1 keyframe/sec, needed for seeks
+keyint_min=24
+x264opts keyint=24

diff --git a/cinelerra-5.1/ffmpeg/video/uhd_h264.youtube b/cinelerra-5.1/ffmpeg/video/uhd_h264.youtube
new file mode 100644 (file)
index 0000000..5d83b5f
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/uhd_h264.youtube
@@ -0,0 +1,8 @@
+mp4 libx264
+# YOUTUBE Ultra High Definition; for resolution 3840x2160;
+#  50 or 60 fps. Change audio to: stereo_with_h264.
+b=80000k
+profile=high
+# use framerate for 1 keyframe/sec, needed for seeks
+keyint_min=24
+x264opts keyint=24

diff --git a/cinelerra-5.1/plugins/Makefile b/cinelerra-5.1/plugins/Makefile
index a492ca869a08c377fa3215bd1ac151737beeb85c..07abd5f1106dcbf2e69a40d5dafd6eaf4c8c1e27 100644 (file)
--- a/cinelerra-5.1/plugins/Makefile
+++ b/cinelerra-5.1/plugins/Makefile
@@ -181,7 +181,7 @@ $(LADSPA_DIR):
 
 # parallel compilation of all directories
 .PHONY:        $(DIRS)
-$(DIRS):
+$(DIRS):       $(PLUGIN_DIR)
        $(MAKE) -C $@
 
 clean:

diff --git a/cinelerra-5.1/plugins/freeverb/Makefile b/cinelerra-5.1/plugins/freeverb/Makefile
index 054a07cf78ff3800a91b85559bc6d4dc40482cfd..df9882158501f8d8012a82d89aa280e0efccbb6b 100644 (file)
--- a/cinelerra-5.1/plugins/freeverb/Makefile
+++ b/cinelerra-5.1/plugins/freeverb/Makefile
@@ -16,7 +16,7 @@ include ../../plugin_config
 $(FREEVERBOBJS):
        $(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.cpp) -o $*.o
 
-$(OUTPUT): $(DIRS)
+$(FREEVERBOBJS): $(DIRS)
 $(OUTPUT): $(FREEVERBOBJS)
 
 $(DIRS):