X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=c8f55a387071cf2295c4bd6332a4a610739247bc;hb=ba392dac35706a5b06024faf2dff50755baad91b;hp=8a72d9e7a2f75867001b46b31188ee097a5c5af4;hpb=f43a615fe4a7071bea580c43af05887576d146e1;p=mlt

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 8a72d9e7..c8f55a38 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -1,18 +1,30 @@
 #!/bin/sh
 
+# Determine whether to recommend/use the HEAD revision of FFmpeg (unreleased)
+# or a specific revision based upon whether the last digit of our version
+# is even or odd. An odd MLT version number always represents unreleased.
+ffmpeg_ver="1.0"
+libav_ver="0.8.4"
+micro_version=$(echo $version | cut -d . -f 3)
+odd_version=$(($micro_version % 2))
+[ "$odd_version" -eq "1" ] && ffmpeg_ver="HEAD" && libav_ver="HEAD"
 
 if [ "$help" = "1" ]
 then
 	cat << EOF
-FFMPEG/avformat options:
+FFmpeg/avformat options:
 
-  --avformat-svn          - Obtain ffmpeg from Subversion
-  --avformat-svn-extra    - Add extra configure options for --avformat-svn
-  --avformat-shared=path  - Link against a shared installation of ffmpeg (default)
-  --avformat-static=path  - Link against a static ffmpeg dev tree
+  --avformat-shared=path  - Link against a shared installation of libavformat (default)
+  --avformat-static=path  - Link against a static build of libavformat
   --avformat-ldextra=libs - Provide additional libs to link with
-  --avformat-suffix=suff  - Specify a custom suffix for an ffmpeg shared build
-  --avformat-swscale      - Use ffmpeg libswcale instead of img_convert
+  --avformat-swscale      - Use libswcale instead of img_convert (with --avformat-static)
+  --avformat-suffix=suff  - Specify a custom suffix
+  --avformat-no-codecs    - Disable the producer and consumer to avoid the codecs
+  --avformat-no-filters   - Disable the filters to make a codecs+muxers-only plugin
+  --avformat-no-devices   - Disable support for libavdevice
+  --avformat-vdpau        - Enable support for NVIDIA VDPAU
+
+  NOTE: The recommended version of FFmpeg is $ffmpeg_ver or libav $libav_ver.
 
 EOF
 
@@ -22,7 +34,7 @@ else
 	Darwin)
 		export LIBSUF=.dylib
 		;;
-	Linux)
+	Linux|FreeBSD|NetBSD)
 		export LIBSUF=.so
 		;;
 	*)
@@ -32,7 +44,7 @@ else
 	bits=$(uname -m)
 	case $bits in
 	x86_64)
-		export LIBDIR=lib64
+		[ -d /usr/lib/lib64 ] && export LIBDIR=lib64 || export LIBDIR=lib
 		;;
 	*)
 		export LIBDIR=lib
@@ -42,20 +54,16 @@ else
 	echo > config.mak
 
 	export static_ffmpeg=
-	export shared_ffmpeg=`which ffmpeg`
+	export shared_ffmpeg=
 	export extra_libs=
-	export svn_ffmpeg=
-	export svn_ffmpeg_extra=
 	export avformat_suffix=
 	export swscale=
-
-	if [ "$shared_ffmpeg" != "" -a -f "$shared_ffmpeg" ]
-	then
-		# Chop ffmpeg 
-		shared_ffmpeg=`dirname $shared_ffmpeg`
-		# Chop bin 
-		shared_ffmpeg=`dirname $shared_ffmpeg`
-	fi
+	export codecs=true
+	export filters=true
+	export devices=true
+	export vdpau=false
+	pkg-config x11 > /dev/null 2>&1
+	export x11=$?
 
 	for i in "$@"
 	do
@@ -63,97 +71,92 @@ else
 			--avformat-static=* )	static_ffmpeg="${i#--avformat-static=}" ;;
 			--avformat-shared=* )	shared_ffmpeg="${i#--avformat-shared=}" ;;
 			--avformat-ldextra=* )	extra_libs="${i#--avformat-ldextra=}" ;;
-			--avformat-svn )		svn_ffmpeg=true ;;
-			--avformat-svn-extra=* ) svn_ffmpeg_extra="${i#--avformat-svn-extra=}" ;;
-			--avformat-cvs )		svn_ffmpeg=true ;;
 			--avformat-suffix=* )	avformat_suffix="${i#--avformat-suffix=}" ;;
 			--avformat-swscale )	swscale=true ;;
 			--avformat-swscaler )	swscale=true ;;
+			--avformat-no-codecs )	codecs=false ;;
+			--avformat-no-filters )	filters=false ;;
+			--avformat-no-devices )	devices=false ;;
+			--avformat-no-vdpau )   vdpau=false ;;
+			--avformat-vdpau )      vdpau=true ;;
 		esac
 	done
 
-	if [ "$svn_ffmpeg" != "" ]
-	then
-		if [ "$gpl" = "true" ]
-		then
-			enable_gpl="--enable-gpl"
-			if [ "$swscale" != "" ]
-			then
-					enable_swscale="--enable-swscaler"
-					echo "SWSCALE=1" >> config.mak
-			fi
-		elif [ "$swscale" != "" ]
-		then
-			echo
-			echo "ERROR        ERROR        ERROR        ERROR        ERROR        ERROR"
-			echo "--enable-gpl is required to use --avformat-swscale with --avformat-svn!"
-			echo
-			exit
-		fi
-		if [ ! -d "ffmpeg" ]
-		then
-			echo
-			echo "Checking out ffmpeg/avformat - no password required"
-			echo
-			svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
-		fi
-		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure $enable_gpl $enable_swscale $svn_ffmpeg_extra )
-		#[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
-		echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec -I`pwd`/ffmpeg/libavutil -I`pwd`/ffmpeg/libswscale" >> config.mak
-		echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec -L`pwd`/ffmpeg/libavutil -L`pwd`/ffmpeg/libswscale" >> config.mak
-		[ $targetos = "Darwin" ] &&
-			echo "LDFLAGS+=-single_module" >> config.mak
-		echo "LOCAL_FFMPEG=1" >> config.mak
-		extra_libs="$extra_libs -lz"
-	elif [ "$static_ffmpeg" != "" ]
+	: ${shared_ffmpeg:=$(pkg-config --variable=prefix libavformat${avformat_suffix})}
+
+	if [ "$static_ffmpeg" != "" ]
 	then 
 		if [ -d "$static_ffmpeg" ]
 		then
-			echo "CFLAGS+=-I$static_ffmpeg/libavformat -I$static_ffmpeg/libavcodec -I$static_ffmpeg/libavutil" >> config.mak
+			echo "CFLAGS+=-DAVDATADIR=\\\"${static_ffmpeg}/ffpresets/\\\"" >> config.mak
+			echo "CFLAGS+=-I$static_ffmpeg" >> config.mak
 			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> config.mak
 			[ $targetos = "Darwin" ] &&
 			 	echo "LDFLAGS+=-single_module" >> config.mak
 			if [ "$swscale" != "" ]
 			then
-				echo "CFLAGS+=-I$static_ffmpeg/libswscale" >> config.mak
 				echo "LDFLAGS+=-L$static_ffmpeg/libswscale" >> config.mak
 				echo "SWSCALE=1" >> config.mak
 			fi
+			if [ "$devices" = "true" ]
+			then
+				echo "LDFLAGS+=-L$static_ffmpeg/libavdevice" >> config.mak
+			fi
+			echo "LDFLAGS+=-Wl,-Bsymbolic" >> config.mak
+			extra_libs="$extra_libs -lm -lz -lbz2"
+			
+			if [ "$vdpau" = "true" ]
+			then
+				printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | $CC -I"$static_ffmpeg" $CFLAGS -c -x c -  >/dev/null 2>&1
+				[ "$x11" = "0" -a "$?" = "0" ] && echo "VDPAU=1" >> config.mak
+			fi
 		else
 			echo "avformat: Invalid path specified: $static_ffmpeg"
 			touch ../disable-avformat
 			echo 0
 		fi
-	else 
-		if [ -d "$shared_ffmpeg/include/ffmpeg" -a -e "$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
+	elif [ "$shared_ffmpeg" != "" ]
+	then
+		echo "PREFIX=$shared_ffmpeg" >> config.mak
+		case $targetos in
+			MINGW32_NT-*)
+				echo "CFLAGS+=-DAVDATADIR=\\\"share/ffmpeg/\\\"" >> config.mak
+			;;
+			*)
+				echo "CFLAGS+=-DAVDATADIR=\\\"${shared_ffmpeg}/share/ffmpeg${avformat_suffix}/\\\"" >> config.mak
+			;;
+		esac
+		echo "CFLAGS+=$(pkg-config --cflags libavformat${avformat_suffix})" >> config.mak
+		echo "LDFLAGS+=$(pkg-config --libs-only-L libavformat${avformat_suffix})" >> config.mak
+		if [ "$devices" = "true" ]
 		then
-			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
-			echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak
-			[ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak
-		else
-			echo "avformat: No build environment found. "
-			echo "          Try configuring mlt with --avformat-svn."
-			touch ../disable-avformat
-			exit 0
+			echo "CFLAGS+=$(pkg-config --cflags libavdevice${avformat_suffix})" >> config.mak
+			echo "LDFLAGS+=$(pkg-config --libs-only-L libavdevice${avformat_suffix})" >> config.mak
 		fi
+		avcodec_version=$(pkg-config --modversion libavcodec${avformat_suffix})
+		if [ "$swscale" != "" ] || [ $(echo $avcodec_version | cut -d. -f1) -gt 52 ] || ( [ $(echo $avcodec_version | cut -d. -f1) -ge 52 ] && [ $(echo $avcodec_version | cut -d. -f2) -ge 21 ] )
+		then
+			echo "CFLAGS+=$(pkg-config --cflags libswscale${avformat_suffix})" >> config.mak
+			echo "LDFLAGS+=$(pkg-config --libs-only-L libswscale${avformat_suffix})" >> config.mak
+			echo "SWSCALE=1" >> config.mak
+		fi
+		
+		if [ "$vdpau" = "true" ]
+		then
+			printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | $CC $(pkg-config --cflags libavformat${avformat_suffix}) -I"$shared_ffmpeg/include" $CFLAGS -c -x c -  >/dev/null 2>&1
+			[ "$x11" = "0" -a "$?" = "0" ] && echo "VDPAU=1" >> config.mak
+		fi
+	else
+		echo "- libavformat not found: disabling"
+		touch ../disable-avformat
+		exit 0
 	fi
 
 	echo "EXTRA_LIBS=$extra_libs" >> config.mak
 	echo "AVFORMAT_SUFFIX=$avformat_suffix" >> config.mak
-
-cat << EOF >> ../producers.dat
-avformat		libmltavformat$LIBSUF
-EOF
-
-cat << EOF >> ../filters.dat
-avdeinterlace	libmltavformat$LIBSUF
-avresample		libmltavformat$LIBSUF
-avcolour_space	libmltavformat$LIBSUF
-EOF
-
-cat << EOF >> ../consumers.dat
-avformat		libmltavformat$LIBSUF
-EOF
+	[ "$codecs" = "true" ] && echo "CODECS=1" >> config.mak
+	[ "$filters" = "true" ] && echo "FILTERS=1" >> config.mak
+	[ "$devices" = "true" ] && echo "DEVICES=1" >> config.mak
+	exit 0
 
 fi
-