From 6487f2b33390bab8c318b357a398a195d758100c Mon Sep 17 00:00:00 2001 From: Good Guy Date: Fri, 31 Jan 2020 17:04:51 -0700 Subject: [PATCH] version update, color_space/range tweak, lv2 build fixes --- cinelerra-5.1/blds/PKGBUILD | 2 +- cinelerra-5.1/blds/bld_package.sh | 1 + cinelerra-5.1/blds/cinelerra.spec | 4 +-- cinelerra-5.1/blds/debian/changelog | 2 +- cinelerra-5.1/blds/debian/control | 2 +- cinelerra-5.1/cinelerra/appearanceprefs.C | 10 +++--- cinelerra-5.1/cinelerra/ffmpeg.C | 38 +++++++++++++++++++---- cinelerra-5.1/configure.ac | 13 ++++++++ 8 files changed, 56 insertions(+), 16 deletions(-) diff --git a/cinelerra-5.1/blds/PKGBUILD b/cinelerra-5.1/blds/PKGBUILD index 07aede80..30c011b1 100644 --- a/cinelerra-5.1/blds/PKGBUILD +++ b/cinelerra-5.1/blds/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: goodguy pkgname=cin pkgver=5.1 -pkgrel=20191231 +pkgrel=20200131 pkgdesc="Cinelerra git://git.cinelerra-gg.org/goodguy/cinelerra.git ($pkgrel)" arch=('x86_64') url="https://www.cinelerra-gg.org" diff --git a/cinelerra-5.1/blds/bld_package.sh b/cinelerra-5.1/blds/bld_package.sh index c48bf6a9..1bb3a9ea 100755 --- a/cinelerra-5.1/blds/bld_package.sh +++ b/cinelerra-5.1/blds/bld_package.sh @@ -31,6 +31,7 @@ mint="mint-18.1" slk32="slk32-14.2" slk64="slk64-14.2" suse="opensuse-13.2" +tweed="opensuse-tw" ub14="ub14.04.1" ub15="ub15.10" ub16="ub16.04" diff --git a/cinelerra-5.1/blds/cinelerra.spec b/cinelerra-5.1/blds/cinelerra.spec index 7ca75e9e..93078964 100644 --- a/cinelerra-5.1/blds/cinelerra.spec +++ b/cinelerra-5.1/blds/cinelerra.spec @@ -1,4 +1,4 @@ -%define ver 20191231 +%define ver 20200131 %define cin cinelerra Summary: Multimedia Editing and construction @@ -48,7 +48,7 @@ BuildRequires: nasm BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: texinfo -BuildRequires: udftools +#BuildRequires: udftools BuildRequires: gtk2-devel BuildRequires: libva-devel BuildRequires: libvdpau-devel diff --git a/cinelerra-5.1/blds/debian/changelog b/cinelerra-5.1/blds/debian/changelog index 76a9b3be..8b9d436c 100644 --- a/cinelerra-5.1/blds/debian/changelog +++ b/cinelerra-5.1/blds/debian/changelog @@ -1,4 +1,4 @@ -cin (1:5.1.20191231) unstable; urgency=low +cin (1:5.1.20200131) unstable; urgency=low [ guy goode ] diff --git a/cinelerra-5.1/blds/debian/control b/cinelerra-5.1/blds/debian/control index f6d870ef..a47f3f8d 100644 --- a/cinelerra-5.1/blds/debian/control +++ b/cinelerra-5.1/blds/debian/control @@ -1,7 +1,7 @@ Source: cin Section: video Priority: optional -Standards-Version: 5.1.20191231 +Standards-Version: 5.1.20200131 Maintainer: mailing list Homepage: https://www.cinelerra-gg.org/ Build-Depends: diff --git a/cinelerra-5.1/cinelerra/appearanceprefs.C b/cinelerra-5.1/cinelerra/appearanceprefs.C index 287fc4d4..cb0279af 100644 --- a/cinelerra-5.1/cinelerra/appearanceprefs.C +++ b/cinelerra-5.1/cinelerra/appearanceprefs.C @@ -750,9 +750,9 @@ int HighlightInverseColor::handle_event() const char *YuvColorSpace::color_space[] = { - N_("BT601"), - N_("BT709"), - N_("BT2020"), + N_("BT601"), // COLOR_SPACE_BT601 + N_("BT709"), // COLOR_SPACE_BT709 + N_("BT2020"), // COLOR_SPACE_BT2020 }; YuvColorSpace::YuvColorSpace(int x, int y, PreferencesWindow *pwindow) @@ -794,8 +794,8 @@ int YuvColorSpaceItem::handle_event() const char *YuvColorRange::color_range[] = { - N_("JPEG"), - N_("MPEG"), + N_("JPEG"), // COLOR_RANGE_JPEG + N_("MPEG"), // COLOR_RANGE_MPEG }; YuvColorRange::YuvColorRange(int x, int y, PreferencesWindow *pwindow) diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C index 237031ff..26a8ddd5 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.C +++ b/cinelerra-5.1/cinelerra/ffmpeg.C @@ -1423,15 +1423,28 @@ int FFVideoConvert::convert_picture_vframe(VFrame *frame, AVFrame *ip, AVFrame * return -1; } - int jpeg_range = preferences->yuv_color_range == BC_COLORS_JPEG ? 1 : 0; + int color_range = 0; + switch( preferences->yuv_color_range ) { + case BC_COLORS_JPEG: color_range = 1; break; + case BC_COLORS_MPEG: color_range = 0; break; + } + int ff_color_space = SWS_CS_ITU601; + switch( preferences->yuv_color_space ) { + case BC_COLORS_BT601: ff_color_space = SWS_CS_ITU601; break; + case BC_COLORS_BT709: ff_color_space = SWS_CS_ITU709; break; + case BC_COLORS_BT2020: ff_color_space = SWS_CS_BT2020; break; + } + const int *color_table = sws_getCoefficients(ff_color_space); + int *inv_table, *table, src_range, dst_range; int brightness, contrast, saturation; if( !sws_getColorspaceDetails(convert_ctx, &inv_table, &src_range, &table, &dst_range, &brightness, &contrast, &saturation) ) { - if( src_range != jpeg_range || dst_range != jpeg_range ) + if( src_range != color_range || dst_range != color_range || + inv_table != color_table || table != color_table ) sws_setColorspaceDetails(convert_ctx, - inv_table, jpeg_range, table, jpeg_range, + color_table, color_range, color_table, color_range, brightness, contrast, saturation); } @@ -1538,15 +1551,28 @@ int FFVideoConvert::convert_vframe_picture(VFrame *frame, AVFrame *op, AVFrame * return -1; } - int jpeg_range = preferences->yuv_color_range == BC_COLORS_JPEG ? 1 : 0; + + int color_range = 0; + switch( preferences->yuv_color_range ) { + case BC_COLORS_JPEG: color_range = 1; break; + case BC_COLORS_MPEG: color_range = 0; break; + } + int ff_color_space = SWS_CS_ITU601; + switch( preferences->yuv_color_space ) { + case BC_COLORS_BT601: ff_color_space = SWS_CS_ITU601; break; + case BC_COLORS_BT709: ff_color_space = SWS_CS_ITU709; break; + case BC_COLORS_BT2020: ff_color_space = SWS_CS_BT2020; break; + } + const int *color_table = sws_getCoefficients(ff_color_space); + int *inv_table, *table, src_range, dst_range; int brightness, contrast, saturation; if( !sws_getColorspaceDetails(convert_ctx, &inv_table, &src_range, &table, &dst_range, &brightness, &contrast, &saturation) ) { - if( dst_range != jpeg_range ) + if( dst_range != color_range || table != color_table ) sws_setColorspaceDetails(convert_ctx, - inv_table, src_range, table, jpeg_range, + inv_table, src_range, color_table, color_range, brightness, contrast, saturation); } diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 7702a6b3..36ce8185 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -728,6 +728,19 @@ CHECK_WANT([LV2], [auto], [use lv2], [ CHECK_HEADERS([lv2], [suil headers], [suil/suil.h]) CFLAGS="$saved_CFLAGS"]) +test "x$HAVE_lilv" = "xno" || \ +test "x$HAVE_sord" = "xno" || \ +test "x$HAVE_serd" = "xno" || \ +test "x$HAVE_sratom" = "xno" || \ +test "x$HAVE_lv2" = "xno" || \ +test "x$HAVE_suil" = "xno" && \ + HAVE_lilv=no && \ + HAVE_sord=no && \ + HAVE_serd=no && \ + HAVE_sratom=no && \ + HAVE_lv2=no && \ + HAVE_suil=no + CHECK_WANT([CUDA], [auto], [build cuda plugins], [ CHECK_HEADERS([CUDA], [cuda sdk], [${CUDA_PATH:-/usr/local/cuda}/include/cuda.h])]) -- 2.26.2