From: Good Guy <good1.2guy@gmail.com>
Date: Fri, 13 May 2016 00:59:16 +0000 (-0600)
Subject: thirdparty build changes for 10/12bit support
X-Git-Url: http://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=4d7f82a573a67301c43189fe20d0d4aa96b2b200;p=goodguy%2Fhistory.git
thirdparty build changes for 10/12bit support
---
diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index 9ac47e56..beb79636 100644
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -396,10 +396,12 @@ void FFMPEGConfigAudio::create_objects()
FFMPEG::load_options(option_path, asset->ff_audio_options,
sizeof(asset->ff_audio_options));
}
+
audio_options = new FFAudioOptions(this, x, y, get_w()-x-20, 10,
sizeof(asset->ff_audio_options)-1, asset->ff_audio_options);
audio_options->create_objects();
add_subwindow(new BC_OKButton(this));
+ add_subwindow(new BC_CancelButton(this));
show_window(1);
bitrate->handle_event();
@@ -408,7 +410,7 @@ void FFMPEGConfigAudio::create_objects()
int FFMPEGConfigAudio::close_event()
{
- set_done(0);
+ set_done(1);
return 1;
}
@@ -557,8 +559,9 @@ void FFMPEGConfigVideo::create_objects()
video_options = new FFVideoOptions(this, x, y, get_w()-x-20, 10,
sizeof(asset->ff_video_options)-1, asset->ff_video_options);
video_options->create_objects();
-
add_subwindow(new BC_OKButton(this));
+ add_subwindow(new BC_CancelButton(this));
+
show_window(1);
if( asset->ff_video_bitrate )
quality->disable();
@@ -569,7 +572,7 @@ void FFMPEGConfigVideo::create_objects()
int FFMPEGConfigVideo::close_event()
{
- set_done(0);
+ set_done(1);
return 1;
}
diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C
index ad6df95b..1f3fc3ca 100644
--- a/cinelerra-5.1/cinelerra/formattools.C
+++ b/cinelerra-5.1/cinelerra/formattools.C
@@ -690,9 +690,8 @@ FormatAThread::FormatAThread(FormatTools *format)
FormatAThread::~FormatAThread()
{
+ delete file; file = 0;
join();
- delete file;
- file = 0;
}
void FormatAThread::start()
@@ -721,9 +720,8 @@ FormatVThread::FormatVThread(FormatTools *format)
FormatVThread::~FormatVThread()
{
+ delete file; file = 0;
join();
- delete file;
- file = 0;
}
void FormatVThread::start()
diff --git a/cinelerra-5.1/global_config b/cinelerra-5.1/global_config
index 32544d00..d1c64a32 100644
--- a/cinelerra-5.1/global_config
+++ b/cinelerra-5.1/global_config
@@ -10,8 +10,12 @@ HAVE_XFT := y
HAVE_VIDEO4LINUX := n
# build thirdparty ladspa
HAVE_LADSPA := y
-# x264/x265 build flags
-HAVE_HIGH_DEPTH := n
+
+#thirdparty configure tweaks, uncomment for overrides
+# x264 hi depth
+#x264.cfg_params:= --enable-static --bit-depth=10
+# x265 hi depth
+#x265.cfg_params:= -DENABLE_SHARED=no -DHIGH_BIT_DEPTH:BOOL=ON
# probed, uncomment and set to override probe
#STATIC_LIBRARIES := y
diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index ff055dc4..395207cd 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -145,53 +145,54 @@ ffmpeg.cfg_params= \
$(call ld_path,fdk,.libs) \
$(EXTRA_LIBS)" $(EXTRA_FFMPEG_CFG) \
-a52dec.mak_params= ; cd $(call bld_path,a52dec,include); ln -sf . a52dec
-a52dec.cfg_vars= CFLAGS+=" -U__FreeBSD__"
-audiofile.cfg_params=--enable-shared=no
-audiofile.mak_params=LIBS="-lm -lstdc++"
-flac.cfg_params= --enable-shared=no
-flac.cflags="$(call inc_path,libogg,include) $(call ld_path,libogg,src/.libs)"
-giflib.cfg_params=--enable-shared=no
-ilmbase.cfg_params=--prefix=$(call bld_path,ilmbase,usr)
-ilmbase.mak_params=; $(MAKE) -C ilmbase* install; cd $(call bld_path,ilmbase); ln -sf lib64 usr/lib
-lame.cfg_vars= CFLAGS+=" -O"
-lame.cfg_params=--enable-shared=no
-lame.mak_params= ; cd $(call bld_path,lame,include); ln -sf . lame
-mjpegtools.cflags="$(call inc_path,libjpeg) $(call ld_path,libjpeg,.libs)"
-mjpegtools.mak_params=; ln -s . $(call bld_path,mjpegtools,utils)/mjpegtools
-mjpegtools.cfg_params= --enable-shared=no
-ladspa.mak_params=; $(MAKE) -C ladspa* install DESTDIR=$(call bld_path,ladspa)
-libavc1394.cfg_vars=PKG_CONFIG_PATH=$(bld_path libraw1394)
-libavc1394.cflags="$(inc_path libraw1394)"
-libavc1394.ldflags="$(ld_path libraw1394,src/.libs)"
-libavc1394.cfg_params= --enable-shared=no
-libdv.cfg_params= --disable-gtk --enable-shared=no
-libiec61883.cfg_vars=PKG_CONFIG_PATH=$(bld_path libraw1394)
-libiec61883.cflags="$(inc_path libraw1394)"
-libiec61883.ldflags="$(ld_path libraw1394,src/.libs)"
-libiec61883.cfg_params= --enable-shared=no
-libjpeg.cfg_params= --enable-shared=no
-libogg.cfg_params= --enable-shared=no
-libraw1394.cfg_params= --enable-shared=no; ln -sf src libraw1394
-libtheora.cfg_vars=PKG_CONFIG_PATH=$(bld_path libogg):$(bld_path libvorbis)
-libtheora.cflags="$(inc_path libogg,include) $(inc_path libogg,src) $(inc_path libvorbis,include)"
-libtheora.ldflags="$(ld_path libvorbis,lib/.libs) $(ld_path libogg,src/.libs)"
-libtheora.cfg_params= --disable-examples --enable-shared=no
-libuuid.cfg_params=--enable-shared=no
-libvorbis.cfg_params= --disable-oggtest --enable-shared=no
-openjpeg.cfg_vars=echo "exec cmake -DBUILD_SHARED_LIBS:BOOL=OFF ." > ./configure; chmod +x ./configure;
-openjpeg.mak_params= ; cd $(call bld_path,openjpeg,src/lib/openjp2); ln -sf . openjpeg-2.1
-opencv.cfg_vars=echo "exec cmake -DBUILD_SHARED_LIBS:BOOL=OFF ." > ./configure; chmod +x ./configure;
-openexr.cfg_vars=LD_LIBRARY_PATH=$(call bld_path,ilmbase,usr/lib)
-openexr.cfg_params=--enable-shared=no
-openexr.cfg_params+=--with-ilmbase-prefix=$(call bld_path,ilmbase,usr)
-speech_tools.mak_params=-j1
-twolame.cfg_params=--enable-shared=no
-#$(error HAVE_HIGH_DEPTH $(HAVE_HIGH_DEPTH))
-x264.cfg_params= --enable-static $(if $(filter y,$(HAVE_HIGH_DEPTH)),--bit-depth=10)
-x265.cfg_vars=echo "exec cmake source -DENABLE_SHARED=no \
- $(if $(filter y,$(HAVE_HIGH_DEPTH)),-DHIGH_BIT_DEPTH:BOOL=ON) \
-" > ./configure; chmod +x ./configure;
+cmake_config=echo "exec cmake \$$$$@ $(1)" > ./configure; chmod +x ./configure;
+a52dec.mak_params?= ; cd $(call bld_path,a52dec,include); ln -sf . a52dec
+a52dec.cfg_vars?= CFLAGS+=" -U__FreeBSD__"
+audiofile.cfg_params?=--enable-shared=no
+audiofile.mak_params?=LIBS="-lm -lstdc++"
+flac.cfg_params?= --enable-shared=no
+flac.cflags?="$(call inc_path,libogg,include) $(call ld_path,libogg,src/.libs)"
+giflib.cfg_params?=--enable-shared=no
+ilmbase.cfg_params?=--prefix=$(call bld_path,ilmbase,usr)
+ilmbase.mak_params?=; $(MAKE) -C ilmbase* install; cd $(call bld_path,ilmbase); ln -sf lib64 usr/lib
+lame.cfg_vars?= CFLAGS+=" -O"
+lame.cfg_params?=--enable-shared=no
+lame.mak_params?= ; cd $(call bld_path,lame,include); ln -sf . lame
+mjpegtools.cflags?="$(call inc_path,libjpeg) $(call ld_path,libjpeg,.libs)"
+mjpegtools.mak_params?=; ln -s . $(call bld_path,mjpegtools,utils)/mjpegtools
+mjpegtools.cfg_params?= --enable-shared=no
+ladspa.mak_params?=; $(MAKE) -C ladspa* install DESTDIR=$(call bld_path,ladspa)
+libavc1394.cfg_vars?=PKG_CONFIG_PATH=$(bld_path libraw1394)
+libavc1394.cflags?="$(inc_path libraw1394)"
+libavc1394.ldflags?="$(ld_path libraw1394,src/.libs)"
+libavc1394.cfg_params?= --enable-shared=no
+libdv.cfg_params?= --disable-gtk --enable-shared=no
+libiec61883.cfg_vars?=PKG_CONFIG_PATH=$(bld_path libraw1394)
+libiec61883.cflags?="$(inc_path libraw1394)"
+libiec61883.ldflags?="$(ld_path libraw1394,src/.libs)"
+libiec61883.cfg_params?= --enable-shared=no
+libjpeg.cfg_params?= --enable-shared=no
+libogg.cfg_params?= --enable-shared=no
+libraw1394.cfg_params?= --enable-shared=no; ln -sf src libraw1394
+libtheora.cfg_vars?=PKG_CONFIG_PATH=$(bld_path libogg):$(bld_path libvorbis)
+libtheora.cflags?="$(inc_path libogg,include) $(inc_path libogg,src) $(inc_path libvorbis,include)"
+libtheora.ldflags?="$(ld_path libvorbis,lib/.libs) $(ld_path libogg,src/.libs)"
+libtheora.cfg_params?= --disable-examples --enable-shared=no
+libuuid.cfg_params?=--enable-shared=no
+libvorbis.cfg_params?= --disable-oggtest --enable-shared=no
+openjpeg.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF
+openjpeg.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF
+openjpeg.cfg_vars?=$(call cmake_config,.)
+openjpeg.mak_params?= ; cd $(call bld_path,openjpeg,src/lib/openjp2); ln -sf . openjpeg-2.1
+opencv.cfg_vars?=$(call cmake_config,.)
+opencv.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF
+openexr.cfg_vars?=LD_LIBRARY_PATH=$(call bld_path,ilmbase,usr/lib)
+openexr.cfg_params?=--enable-shared=no --with-ilmbase-prefix=$(call bld_path,ilmbase,usr)
+speech_tools.mak_params?=-j1
+twolame.cfg_params?=--enable-shared=no
+x264.cfg_params?= --enable-static
+x265.cfg_vars?=$(call cmake_config,source)
+x265.cfg_params?= -DENABLE_SHARED=no
# compile flag vars
$(foreach tgt,$(TARGETS), \