Merge pull request #153 from cchampet/build_TravisMatrixBuild

valnoel · valnoel · commit 6832c31d123b · 2015-04-09T17:34:14.000+02:00
Travis: use matrix to build with ffmpeg/libav
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,14 @@
+env:
+  matrix:
+    - DEPENDENCY_MODE=libav
+    - DEPENDENCY_MODE=ffmpeg
+
+language: cpp
+
 os:
   - linux
   - osx
 
-language: cpp
-
 compiler:
   - gcc
   - clang
@@ -28,4 +33,4 @@ script:
   # Launch tests
   - cd ..
   - chmod +x tools/travis.python.nosetests.sh
-  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/travis.python.nosetests.sh; fi
+  - if [ "${TRAVIS_OS_NAME}" = "linux" && "${DEPENDENCY_MODE}" = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -404,7 +404,7 @@ size_t VideoProperties::getBitRate() const
 	
 	if( ! _codecContext->width || ! _codecContext->height )
 		throw std::runtime_error( "cannot compute bit rate: invalid frame size" );
-	
+
 	// discard no frame type when decode
 	_codecContext->skip_frame = AVDISCARD_NONE;
 
@@ -428,7 +428,11 @@ size_t VideoProperties::getBitRate() const
 			avcodec_decode_video2( _codecContext, frame, &gotFrame, &pkt );
 			if( gotFrame )
 			{
-				gopFramesSize += frame->pkt_size;
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 54, 7, 100 )
+				gopFramesSize += av_frame_get_pkt_size( frame );
+#else
+				gopFramesSize += pkt.size;
+#endif
 				++count;
 			}
 		}
diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh
@@ -10,9 +10,19 @@ sudo apt-get install -qq python-dev doxygen
 sudo apt-get install -qq freeglut3-dev libxmu-dev
 sudo apt-get install -qq python-nose
 
-# Build FFmpeg 2.2.9
-sudo wget https://www.ffmpeg.org/releases/ffmpeg-2.2.9.tar.bz2
-sudo bunzip2 ffmpeg-2.2.9.tar.bz2
-sudo tar -xvf ffmpeg-2.2.9.tar
-cd ffmpeg-2.2.9
-./configure --disable-yasm --enable-shared --disable-static && make && sudo make install
+if [[ ${DEPENDENCY_MODE} == "ffmpeg" ]]; then
+    export FFMPEG_VERSION=2.2.9
+    sudo wget https://www.ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2
+    sudo bunzip2 ffmpeg-${FFMPEG_VERSION}.tar.bz2
+    sudo tar -xvf ffmpeg-${FFMPEG_VERSION}.tar
+    cd ffmpeg-${FFMPEG_VERSION}
+    sudo ./configure --disable-yasm --enable-shared --disable-static && sudo make && sudo make install
+
+elif [[ ${DEPENDENCY_MODE} == "libav" ]]; then
+    export LIBAV_VERSION=11.3
+    sudo wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz
+    sudo tar -xvf libav-${LIBAV_VERSION}.tar.gz
+    cd libav-${LIBAV_VERSION}
+    sudo ./configure --disable-yasm --enable-shared --disable-static && sudo make && sudo make install
+
+fi
diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh
@@ -3,4 +3,10 @@
 brew update
 
 brew install gcc cmake swig
-brew install ffmpeg freeglut doxygen
+brew install freeglut doxygen
+
+if [[ ${DEPENDENCY_MODE} == "ffmpeg" ]]; then
+    brew install ffmpeg
+
+elif [[ ${DEPENDENCY_MODE} == "libav" ]]; then
+    brew install libav

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ size_t VideoProperties::getBitRate() const`
`404`	`404`
`405`	`405`	`if( ! _codecContext->width \|\| ! _codecContext->height )`
`406`	`406`	`throw std::runtime_error( "cannot compute bit rate: invalid frame size" );`
`407`		`-`
	`407`	`+`
`408`	`408`	`// discard no frame type when decode`
`409`	`409`	`_codecContext->skip_frame = AVDISCARD_NONE;`
`410`	`410`
`@@ -428,7 +428,11 @@ size_t VideoProperties::getBitRate() const`
`428`	`428`	`avcodec_decode_video2( _codecContext, frame, &gotFrame, &pkt );`
`429`	`429`	`if( gotFrame )`
`430`	`430`	`{`
`431`		`- gopFramesSize += frame->pkt_size;`
	`431`	`+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 54, 7, 100 )`
	`432`	`+ gopFramesSize += av_frame_get_pkt_size( frame );`
	`433`	`+#else`
	`434`	`+ gopFramesSize += pkt.size;`
	`435`	`+#endif`
`432`	`436`	`++count;`
`433`	`437`	`}`
`434`	`438`	`}`