avTranscoder · cchampet · Oct 8, 2015 · Aug 13, 2015 · Aug 13, 2015 · Aug 13, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,8 @@
+# Use container-based infrastructure
+sudo: required
+services:
+  - docker
+
 language: cpp
 
 os:
@@ -15,14 +20,42 @@ env:
      - DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency
      - CI_NODE_TOTAL=2
   matrix:
-    - DEPENDENCY_MODE=libav  ENABLE_COVERAGE=true
-    - DEPENDENCY_MODE=libav  ENABLE_COVERAGE=false
+    - DEPENDENCY_MODE=libav ENABLE_COVERAGE=true
+    - DEPENDENCY_MODE=libav ENABLE_COVERAGE=false
     - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true
     - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=false
 
+matrix:
+  # generate coverage only with gcc
+  exclude:
+    - compiler: clang
+      env: DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true
+    - compiler: clang
+      env: DEPENDENCY_MODE=libav ENABLE_COVERAGE=true
+  allow_failures:
+    - os: osx
+  fast_finish: true
+
 # This results in a 2×2×2x2 build matrix.
 # Where the variables are: os / compiler / DEPENDENCY_MODE / ENABLE_COVERAGE
 
+addons:
+  apt:
+    sources: ['kalakris-cmake']
+    packages:
+    - cmake
+    - swig
+    - python-dev
+    - python-nose
+    - freeglut3-dev
+
+cache:
+  # Caching Ubuntu packages
+  apt: true
+  # Caching other directories
+  directories:
+  - ${DEPENDENCY_INSTALL}
+
 before_script:
   - env | sort  
   - date -u
@@ -39,18 +72,12 @@ before_script:
 
 script:
   # build
-  - mkdir -p ${AVTRANSCODER_BUILD}
-  - cd ${AVTRANSCODER_BUILD}
-  - cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL} -DCMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL} -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=${ENABLE_COVERAGE}
-  - make -j${CI_NODE_TOTAL}
-  - make install
+  - ./tools/travis.build.sh
 
   # launch tests
-  - if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./../tools/travis.python.nosetests.sh; fi
+  - if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi
 
 after_success:
-  - cd ${TRAVIS_BUILD_DIR}
-
   # generate coverage for coveralls
   - if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.generate.coverage.sh; fi
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(AvTranscoder)
 # Set AvTranscoder versions
 set(AVTRANSCODER_VERSION_MAJOR "0")
 set(AVTRANSCODER_VERSION_MINOR "5")
-set(AVTRANSCODER_VERSION_MICRO "8")
+set(AVTRANSCODER_VERSION_MICRO "10")
 set(AVTRANSCODER_VERSION ${AVTRANSCODER_VERSION_MAJOR}.${AVTRANSCODER_VERSION_MINOR}.${AVTRANSCODER_VERSION_MICRO})
 
 # Define AvTranscoder versions
@@ -27,8 +27,8 @@ if(MSVC)
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
 else()
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -fPIC -pg -g")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC -O3")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -fPIC -g")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -fPIC -O3")
 endif()
 
 # CPP flag to create code coverage report

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ C++ API for Libav / FFmpeg
 
 Based on Libav/FFmpeg libraries to support various video and audio formats, avTranscoder provides the high level API to re-wrap or transcode media easily.
 
-[![Build Status](https://travis-ci.org/avTranscoder/avTranscoder.svg?branch=master)](https://travis-ci.org/avTranscoder/avTranscoder)
+[![Build Status](https://travis-ci.org/avTranscoder/avTranscoder.svg?branch=develop)](https://travis-ci.org/avTranscoder/avTranscoder)
 [![Coverage Status](https://coveralls.io/repos/avTranscoder/avTranscoder/badge.svg)](https://coveralls.io/r/avTranscoder/avTranscoder)
 <a href="https://scan.coverity.com/projects/2626"><img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/2626/badge.svg"/></a>
 
@@ -17,12 +17,15 @@ Based on Libav/FFmpeg libraries to support various video and audio formats, avTr
 #### License
 See [**COPYING.md**](COPYING.md)
 
-#### Compilation
-See [**INSTALL.md**](INSTALL.md)
-
 #### How to use
 See [**USAGE.md**](USAGE.md)
 
+#### Documentation
+See [**Doxygen documentation**](http://avtranscoder.github.io/avTranscoder-doxygen/)
+
+#### Compilation
+See [**INSTALL.md**](INSTALL.md)
+
 #### Tests
 
 ###### nosetests

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -7,3 +7,4 @@ add_subdirectory(avProcessor)
 # Python apps
 add_subdirectory(pyProcessor)
 add_subdirectory(pyThumbnail)
+add_subdirectory(pyRewrap)
diff --git a/app/avPlay/AvReader.cpp b/app/avPlay/AvReader.cpp
diff --git a/app/avPlay/AvReader.hpp b/app/avPlay/AvReader.hpp
diff --git a/app/avPlay/Reader.hpp b/app/avPlay/Reader.hpp
diff --git a/app/avPlay/Window.cpp b/app/avPlay/Window.cpp
@@ -14,7 +14,7 @@
 #include <iomanip>
 #include <cstring>
 
-Reader* Window::_reader = NULL;
+avtranscoder::VideoReader* Window::_reader = NULL;
 
 size_t Window::_width = 0;
 size_t Window::_height = 0;
@@ -94,7 +94,7 @@ void loadNewTexture( const char* data, GLint internalFormat, size_t width, size_
 	loadNewTexture( _imageProperties );
 }
 
-Window::Window( Reader& reader )
+Window::Window( avtranscoder::VideoReader& reader )
 {
 	_reader = &reader;
 	_width  = _reader->getWidth();
@@ -124,7 +124,7 @@ Window::Window( Reader& reader )
 
 void Window::launch()
 {
-	displayNextFrame();
+	displayFirstFrame();
 	glutMainLoop();
 }
 
@@ -220,11 +220,6 @@ void Window::keyboard( unsigned char k, int x, int y )
 		case 'a':
 			showAlphaChannelTexture();
 			break;
-
-		case 'm':
-			_reader->printMetadatas();
-			break;
-
 		case 'H':
 			if( shift )
 			{
@@ -398,8 +393,7 @@ void Window::displayHelp()
 {
 	static const std::string kViewerHelp =
 	"Av Player Viewer Help\n" \
-	"i                  : information about image (dimensions, bit depth, channels)\n"\
-	"m                  : full metadatas of media\n"\
+	"i                  : information about image (dimensions, bit depth, channels) + video stream\n"\
 	"z                  : zoom view to 1:1\n"\
 	"h, F1              : print help\n" \
 	"SHIFT + V          : flip\n" \
@@ -425,6 +419,9 @@ void Window::displayInformations()
 		case GL_FLOAT          : textureType += "32 float"; break;
 	}
 	std::cout << textureType << " " << _width << "x" << _height << std::endl;
+
+	// stream info
+	_reader->printInfo();
 }
 
 void Window::move( float x, float y )
@@ -532,14 +529,16 @@ void Window::showAlphaChannelTexture( )
 
 void Window::displayNextFrame()
 {
-	const char* buffer = _reader->readNextFrame();
+	const char* buffer = (const char*)_reader->readNextFrame()->getData();
 	loadNewTexture( buffer, _reader->getComponents(), _reader->getWidth(), _reader->getHeight(), GL_RGB, GL_UNSIGNED_BYTE );
+	display();
 }
 
 void Window::displayPrevFrame()
 {
-	const char* buffer = _reader->readPrevFrame();
+	const char* buffer = (const char*)_reader->readPrevFrame()->getData();
 	loadNewTexture( buffer, _reader->getComponents(), _reader->getWidth(), _reader->getHeight(), GL_RGB, GL_UNSIGNED_BYTE );
+	display();
 }
 
 void Window::displayFirstFrame()
@@ -549,8 +548,9 @@ void Window::displayFirstFrame()
 
 void Window::displayAtFrame( const size_t frame )
 {
-	const char* buffer = _reader->readFrameAt( frame );
+	const char* buffer = (const char*)_reader->readFrameAt( frame )->getData();
 	loadNewTexture( buffer, _reader->getComponents(), _reader->getWidth(), _reader->getHeight(), GL_RGB, GL_UNSIGNED_BYTE );
+	display();
 }
 
 void Window::loopPlaying( int value )

diff --git a/app/avPlay/Window.hpp b/app/avPlay/Window.hpp
@@ -3,12 +3,12 @@
 
 #include <string>
 
-#include "Reader.hpp"
+#include <AvTranscoder/reader/VideoReader.hpp>
 
 class Window
 {
 public:
-	Window( Reader& reader );
+	Window( avtranscoder::VideoReader& reader );
 
 	void launch();
 
@@ -43,7 +43,7 @@ class Window
 
 	static void loopPlaying( int value );
 
-	static Reader* _reader;
+	static avtranscoder::VideoReader* _reader;
 
 	static size_t _width;
 	static size_t _height;