( streamProperties );
break;
}
default:
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
index 43729344..b9984017 100644
--- a/src/AvTranscoder/transcoder/Transcoder.hpp
+++ b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -54,6 +54,8 @@ class AvExport Transcoder
* @brief Add a stream and set a profile
* @note If profileName is empty, rewrap.
* @note offset in seconds
+ * If offset is positive, the transcoder will generate black images or silence (depending on the type of stream) before the stream to process.
+ * If offset is negative, the transcoder will seek in the stream and start process at this specific time.
*/
void add( const std::string& filename, const size_t streamIndex, const std::string& profileName = "", const double offset = 0 );
/*
@@ -148,14 +150,14 @@ class AvExport Transcoder
void setProcessMethod( const EProcessMethod eProcessMethod, const size_t indexBasedStream = 0, const double outputDuration = 0 );
private:
- void addRewrapStream( const std::string& filename, const size_t streamIndex );
+ void addRewrapStream( const std::string& filename, const size_t streamIndex, const double offset );
void addTranscodeStream( const std::string& filename, const size_t streamIndex, const int subStreamIndex, const double offset );
void addTranscodeStream( const std::string& filename, const size_t streamIndex, const int subStreamIndex, const ProfileLoader::Profile& profile, const double offset = 0 );
void addDummyStream( const ProfileLoader::Profile& profile, const ICodec& codec );
- InputFile* addInputFile( const std::string& filename, const size_t streamIndex );
+ InputFile* addInputFile( const std::string& filename, const size_t streamIndex, const double offset );
ProfileLoader::Profile getProfileFromFile( InputFile& inputFile, const size_t streamIndex ); ///< The function analyses the inputFile
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 69958051..2e4ce98b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -80,7 +80,7 @@ if(SWIG_FOUND)
if(AVTRANSCODER_DISABLE_PYTHON_BINDING)
message("PYTHON binding disabled, will not build python binding.")
else()
- find_package(PythonLibs)
+ find_package(PythonLibs ${AVTRANSCODER_PYTHON_VERSION_OF_BINDING})
if(PYTHONLIBS_FOUND)
include_directories(${PYTHON_INCLUDE_PATH})
diff --git a/test/pyTest/testEProcessMethod.py b/test/pyTest/testEProcessMethod.py
new file mode 100644
index 00000000..4d71a770
--- /dev/null
+++ b/test/pyTest/testEProcessMethod.py
@@ -0,0 +1,130 @@
+import os
+
+# Check if environment is setup to run the tests
+if os.environ.get('AVTRANSCODER_TEST_VIDEO_FILE') is None or os.environ.get('AVTRANSCODER_TEST_AUDIO_MOV_FILE') is None or os.environ.get('AVTRANSCODER_TEST_AUDIO_WAVE_FILE') is None:
+ from nose.plugins.skip import SkipTest
+ raise SkipTest("Need to define environment variables AVTRANSCODER_TEST_VIDEO_FILE / AVTRANSCODER_TEST_AUDIO_MOV_FILE / AVTRANSCODER_TEST_AUDIO_WAVE_FILE")
+
+from nose.tools import *
+
+from pyAvTranscoder import avtranscoder as av
+
+av.preloadCodecsAndFormats()
+av.Logger.setLogLevel(av.AV_LOG_QUIET)
+
+
+def testEProcessMethodShortest():
+ """
+ Process with method eProcessMethodShortest, check output duration.
+ """
+ inputFileName_longest = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+ inputFileName_shortest = os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE']
+ outputFileName = "testEProcessMethodShortest.mov"
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+ transcoder.setProcessMethod( av.eProcessMethodShortest )
+
+ transcoder.add( inputFileName_longest, 0, "" )
+ transcoder.add( inputFileName_shortest, 0, "" )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get src file
+ src_inputFile_shortest = av.InputFile( inputFileName_shortest )
+ src_properties_shortest = src_inputFile_shortest.getProperties()
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+
+ assert_equals( dst_properties.getDuration(), src_properties_shortest.getDuration() )
+
+
+def testEProcessMethodLongest():
+ """
+ Process with method eProcessMethodLongest, check output duration.
+ """
+ inputFileName_longest = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+ inputFileName_shortest = os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE']
+ outputFileName = "testEProcessMethodLongest.mov"
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+ transcoder.setProcessMethod( av.eProcessMethodLongest )
+
+ transcoder.add( inputFileName_longest, 0, "" )
+ transcoder.add( inputFileName_shortest, 0, "" )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get src file
+ src_inputFile_longest = av.InputFile( inputFileName_longest )
+ src_properties_longest = src_inputFile_longest.getProperties()
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+
+ assert_equals( dst_properties.getDuration(), src_properties_longest.getDuration() )
+
+
+def testEProcessMethodBasedOnStream():
+ """
+ Process with method testEProcessMethodBasedOnStream, check output duration.
+ """
+ inputFileName_first = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+ inputFileName_second = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
+ inputFileName_third = os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE']
+ outputFileName = "testEProcessMethodShortest.mov"
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+ transcoder.setProcessMethod( av.eProcessMethodBasedOnStream, 1 )
+
+ transcoder.add( inputFileName_first, 0, "" )
+ transcoder.add( inputFileName_second, 0, "" )
+ transcoder.add( inputFileName_third, 0, "" )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get src file
+ src_inputFile_second = av.InputFile( inputFileName_second )
+ src_properties_second = src_inputFile_second.getProperties()
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+
+ assert_equals( dst_properties.getDuration(), src_properties_second.getDuration() )
+
+
+def testEProcessMethodBasedOnDuration():
+ """
+ Process with method eProcessMethodBasedOnDuration, check output duration.
+ """
+ inputFileName_first = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+ inputFileName_second = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
+ inputFileName_third = os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE']
+ outputFileName = "testEProcessMethodBasedOnDuration.mov"
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+ transcoder.setProcessMethod( av.eProcessMethodBasedOnDuration, 0, 50 )
+
+ transcoder.add( inputFileName_first, 0, "" )
+ transcoder.add( inputFileName_second, 0, "" )
+ transcoder.add( inputFileName_third, 0, "" )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+
+ assert_equals( dst_properties.getDuration(), 50 )
+
diff --git a/test/pyTest/testTranscoderNbFrames.py b/test/pyTest/testNbFrames.py
similarity index 100%
rename from test/pyTest/testTranscoderNbFrames.py
rename to test/pyTest/testNbFrames.py
diff --git a/test/pyTest/testTranscoderNbSamples.py b/test/pyTest/testNbSamples.py
similarity index 100%
rename from test/pyTest/testTranscoderNbSamples.py
rename to test/pyTest/testNbSamples.py
diff --git a/test/pyTest/testOffset.py b/test/pyTest/testOffset.py
new file mode 100644
index 00000000..95a6c69f
--- /dev/null
+++ b/test/pyTest/testOffset.py
@@ -0,0 +1,287 @@
+import os
+
+# Check if environment is setup to run the tests
+if os.environ.get('AVTRANSCODER_TEST_AUDIO_WAVE_FILE') is None or os.environ.get('AVTRANSCODER_TEST_AUDIO_MOV_FILE') is None or os.environ.get('AVTRANSCODER_TEST_VIDEO_FILE') is None:
+ from nose.plugins.skip import SkipTest
+ raise SkipTest("Need to define environment variables AVTRANSCODER_TEST_VIDEO_FILE / AVTRANSCODER_TEST_AUDIO_MOV_FILE / AVTRANSCODER_TEST_AUDIO_WAVE_FILE")
+
+from nose.tools import *
+
+from pyAvTranscoder import avtranscoder as av
+
+av.preloadCodecsAndFormats()
+av.Logger.setLogLevel(av.AV_LOG_QUIET)
+
+
+
+def testTranscodeAudioPositiveOffset():
+ """
+ Transcode one audio stream (profile wave24b48kmono) with offset at the beginning of the process.
+ """
+ inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
+ outputFileName = "testTranscodeAudioPositiveOffset.wav"
+ offset = 10
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+
+ transcoder.add( inputFileName, 0, "wave24b48kmono", offset )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get src file
+ src_inputFile = av.InputFile( inputFileName )
+ src_properties = src_inputFile.getProperties()
+ src_audioStream = src_properties.getAudioProperties()[0]
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+ dst_audioStream = dst_properties.getAudioProperties()[0]
+
+ # check output duration
+ assert_equals( src_audioStream.getDuration() + offset, dst_audioStream.getDuration() )
+
+
+def testTranscodeAudioNegativeOffset():
+ """
+ Transcode one audio stream (profile wave24b48kmono) with a negative offset at the beginning of the process.
+ """
+ inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
+ outputFileName = "testTranscodeAudioNegativeOffset.wav"
+ offset = -5.5
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+
+ transcoder.add( inputFileName, 0, "wave24b48kmono", offset )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get src file
+ src_inputFile = av.InputFile( inputFileName )
+ src_properties = src_inputFile.getProperties()
+ src_audioStream = src_properties.getAudioProperties()[0]
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+ dst_audioStream = dst_properties.getAudioProperties()[0]
+
+ # check output duration
+ assert_almost_equals( src_audioStream.getDuration() + offset, dst_audioStream.getDuration(), delta=0.01 )
+
+
+def testRewrapAudioPositiveOffset():
+ """
+ Rewrap one audio stream with offset at the beginning of the process.
+ """
+ inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
+ outputFileName = "testRewrapAudioPositiveOffset.wav"
+ offset = 10
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+
+ transcoder.add( inputFileName, 0, "", offset )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get src file
+ src_inputFile = av.InputFile( inputFileName )
+ src_properties = src_inputFile.getProperties()
+ src_audioStream = src_properties.getAudioProperties()[0]
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+ dst_audioStream = dst_properties.getAudioProperties()[0]
+
+ # check output duration
+ assert_equals( src_audioStream.getDuration() + offset, dst_audioStream.getDuration() )
+
+
+def testRewrapAudioNegativeOffset():
+ """
+ Rewrap one audio stream with a negative offset at the beginning of the process.
+ """
+ inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
+ outputFileName = "testRewrapAudioNegativeOffset.wav"
+ offset = -5.5
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+
+ transcoder.add( inputFileName, 0, "", offset )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get src file
+ src_inputFile = av.InputFile( inputFileName )
+ src_properties = src_inputFile.getProperties()
+ src_audioStream = src_properties.getAudioProperties()[0]
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+ dst_audioStream = dst_properties.getAudioProperties()[0]
+
+ # check output duration
+ assert_almost_equals( src_audioStream.getDuration() + offset, dst_audioStream.getDuration(), delta=0.01 )
+
+
+def testTranscodeVideoPositiveOffset():
+ """
+ Transcode one video stream (profile mpeg2) with offset at the beginning of the process.
+ """
+ inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+ outputFileName = "testTranscodeVideoPositiveOffset.mov"
+ offset = 10
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+
+ transcoder.add( inputFileName, 0, "mpeg2", offset )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get src file
+ src_inputFile = av.InputFile( inputFileName )
+ src_properties = src_inputFile.getProperties()
+ src_videoStream = src_properties.getVideoProperties()[0]
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+ dst_videoStream = dst_properties.getVideoProperties()[0]
+
+ # check output duration
+ assert_equals( src_videoStream.getDuration() + offset, dst_videoStream.getDuration() )
+
+
+def testTranscodeVideoNegativeOffset():
+ """
+ Transcode one video stream (profile mpeg2) with a negative offset at the beginning of the process.
+ """
+ inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+ outputFileName = "testTranscodeVideoNegativeOffset.mov"
+ offset = -5.5
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+
+ transcoder.add( inputFileName, 0, "mpeg2", offset )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get src file
+ src_inputFile = av.InputFile( inputFileName )
+ src_properties = src_inputFile.getProperties()
+ src_videoStream = src_properties.getVideoProperties()[0]
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+ dst_videoStream = dst_properties.getVideoProperties()[0]
+
+ # check output duration
+ assert_equals( src_videoStream.getDuration() + offset, dst_videoStream.getDuration() )
+
+
+def testRewrapVideoPositiveOffset():
+ """
+ Rewrap one video stream with offset at the beginning of the process.
+ """
+ inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+ outputFileName = "testRewrapVideoPositiveOffset.mov"
+ offset = 10
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+
+ transcoder.add( inputFileName, 0, "", offset )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get src file
+ src_inputFile = av.InputFile( inputFileName )
+ src_properties = src_inputFile.getProperties()
+ src_videoStream = src_properties.getVideoProperties()[0]
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+ dst_videoStream = dst_properties.getVideoProperties()[0]
+
+ # check output duration
+ assert_equals( src_videoStream.getDuration() + offset, dst_videoStream.getDuration() )
+
+
+def testRewrapVideoNegativeOffset():
+ """
+ Rewrap one video stream with a negative offset at the beginning of the process.
+ """
+ inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+ outputFileName = "testRewrapVideoNegativeOffset.mov"
+ offset = -5.5
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+
+ transcoder.add( inputFileName, 0, "", offset )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get src file
+ src_inputFile = av.InputFile( inputFileName )
+ src_properties = src_inputFile.getProperties()
+ src_videoStream = src_properties.getVideoProperties()[0]
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+ dst_videoStream = dst_properties.getVideoProperties()[0]
+
+ # check output duration
+ assert_equals( src_videoStream.getDuration() + offset, dst_videoStream.getDuration() )
+
+
+def testMultipleOffsetFromSameInputFile():
+ """
+ Process multiple streams with different offset at the beginning of the process.
+ """
+ inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE']
+ outputFileName = "testMultipleOffsetFromSameInputFile.mov"
+ offset_1 = 10
+ offset_2 = 3
+
+ ouputFile = av.OutputFile( outputFileName )
+ transcoder = av.Transcoder( ouputFile )
+
+ transcoder.add( inputFileName, 0, "", offset_1 )
+ transcoder.add( inputFileName, 1, "", offset_2 )
+
+ progress = av.ConsoleProgress()
+ transcoder.process( progress )
+
+ # get src file
+ src_inputFile = av.InputFile( inputFileName )
+ src_properties = src_inputFile.getProperties()
+ src_videoStream = src_properties.getVideoProperties()[0]
+
+ # get dst file
+ dst_inputFile = av.InputFile( outputFileName )
+ dst_properties = dst_inputFile.getProperties()
+ dst_videoStream = dst_properties.getVideoProperties()[0]
+
+ # check output duration
+ assert_equals( src_videoStream.getDuration() + offset_1, dst_videoStream.getDuration() )
+
diff --git a/test/pyTest/testTranscoderOffset.py b/test/pyTest/testTranscoderOffset.py
deleted file mode 100644
index 9c661855..00000000
--- a/test/pyTest/testTranscoderOffset.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import os
-
-# Check if environment is setup to run the tests
-if os.environ.get('AVTRANSCODER_TEST_AUDIO_WAVE_FILE') is None or os.environ.get('AVTRANSCODER_TEST_VIDEO_FILE') is None:
- from nose.plugins.skip import SkipTest
- raise SkipTest("Need to define environment variables AVTRANSCODER_TEST_VIDEO_FILE and AVTRANSCODER_TEST_AUDIO_WAVE_FILE")
-
-from nose.tools import *
-
-from pyAvTranscoder import avtranscoder as av
-
-av.preloadCodecsAndFormats()
-av.Logger.setLogLevel(av.AV_LOG_QUIET)
-
-
-def testTranscodeAudioOffset():
- """
- Transcode one audio stream (profile wave24b48kmono) with offset at the beginning of the transcode.
- """
- inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
- outputFileName = "testTranscodeAudioOffset.wav"
-
- ouputFile = av.OutputFile( outputFileName )
- transcoder = av.Transcoder( ouputFile )
-
- transcoder.add( inputFileName, 0, "wave24b48kmono", 10 )
-
- progress = av.ConsoleProgress()
- transcoder.process( progress )
-
- # get src file of transcode
- src_inputFile = av.InputFile( inputFileName )
- src_properties = src_inputFile.getProperties()
- src_audioStream = src_properties.getAudioProperties()[0]
-
- # get dst file of transcode
- dst_inputFile = av.InputFile( outputFileName )
- dst_properties = dst_inputFile.getProperties()
- dst_audioStream = dst_properties.getAudioProperties()[0]
-
- # check output duration
- assert_almost_equals( src_audioStream.getDuration() + 10, dst_audioStream.getDuration(), delta=0.1 )
-
-def testTranscodeVideoOffset():
- """
- Transcode one video stream (profile mpeg2) with offset at the beginning of the transcode.
- """
- inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
- outputFileName = "testTranscodeVideoOffset.mov"
-
- ouputFile = av.OutputFile( outputFileName )
- transcoder = av.Transcoder( ouputFile )
-
- transcoder.add( inputFileName, 0, "mpeg2", 10 )
-
- progress = av.ConsoleProgress()
- transcoder.process( progress )
-
- # get src file of transcode
- src_inputFile = av.InputFile( inputFileName )
- src_properties = src_inputFile.getProperties()
- src_videoStream = src_properties.getVideoProperties()[0]
-
- # get dst file of transcode
- dst_inputFile = av.InputFile( outputFileName )
- dst_properties = dst_inputFile.getProperties()
- dst_videoStream = dst_properties.getVideoProperties()[0]
-
- # check output duration
- assert_almost_equals( src_videoStream.getDuration() + 10, dst_videoStream.getDuration(), delta=0.1 )
diff --git a/tools/travis.gcc.generate.coverage.sh b/tools/travis.gcc.generate.coverage.sh
new file mode 100755
index 00000000..b7d6f74e
--- /dev/null
+++ b/tools/travis.gcc.generate.coverage.sh
@@ -0,0 +1,11 @@
+# capture coverage info
+lcov --capture --directory ${AVTRANSCODER_BUILD} --output-file coverage.info
+
+# filter out system and test code
+lcov --remove coverage.info '/usr/*' '*/*PYTHON_wrap.*' --output-file coverage.info
+
+# debug before upload
+lcov --list coverage.info
+
+# uploads to coveralls
+coveralls-lcov --repo-token e7jYJJrojzWYfmdUgkDvwVNGqJgh6yCH7 coverage.info
diff --git a/tools/travis.gcc.install.coverage.sh b/tools/travis.gcc.install.coverage.sh
new file mode 100755
index 00000000..fc8d1083
--- /dev/null
+++ b/tools/travis.gcc.install.coverage.sh
@@ -0,0 +1,13 @@
+# install latest LCOV (1.9 was failing for me)
+wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.11.orig.tar.gz
+tar xf lcov_1.11.orig.tar.gz
+sudo make -C lcov-1.11/ install
+
+# install lcov to coveralls conversion + upload tool
+gem install coveralls-lcov
+
+# init coverage to 0 (optional)
+lcov --directory ${AVTRANSCODER_BUILD} --zerocounters
+
+# install nosetests plugins
+sudo pip install coverage
diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh
old mode 100644
new mode 100755
diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh
old mode 100644
new mode 100755
diff --git a/tools/travis.python.nosetests.sh b/tools/travis.python.nosetests.sh
old mode 100644
new mode 100755
index d59cc745..e65a82e7
--- a/tools/travis.python.nosetests.sh
+++ b/tools/travis.python.nosetests.sh
@@ -1,10 +1,10 @@
#!/bin/bash
# Get avtranscoder library
-export PYTHONPATH=`pwd`/build/dist/lib/python2.7.6/site-packages/:$PYTHONPATH
+export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7.6/site-packages/:$PYTHONPATH
# Get avtranscoder profiles
-export AVPROFILES=`pwd`/build/dist/share/ressource
+export AVPROFILES=${AVTRANSCODER_INSTALL}/share/ressource
# Get assets
git clone https://github.com/avTranscoder/avTranscoder-data.git
@@ -13,5 +13,4 @@ export AVTRANSCODER_TEST_AUDIO_WAVE_FILE=`pwd`/avTranscoder-data/audio/frequenci
export AVTRANSCODER_TEST_AUDIO_MOV_FILE=`pwd`/avTranscoder-data/video/BigBuckBunny/BigBuckBunny_1080p_5_1.mov
# Launch tests
-cd test/pyTest
-nosetests
+nosetests ${TRAVIS_BUILD_DIR}/test/pyTest --with-coverage
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy
