Complex refactoring

- Removed BOOST dependency
- Added C++11 dependency
- Basic Android build support (very basic)

.gitignore

@@ -6,4 +6,4 @@ qtcreator-build/
 qtcreator-build-*/
 scripts/valgrind.txt
 transcoder-manager-*-win32.zip
-
+build

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 2.8)
-project(transcoder)
+project(AvCpp)
 
 include_directories(.)
 
@@ -11,25 +11,27 @@ if(CMAKE_CROSSCOMPILING)
     "${CMAKE_EXE_LINKER_FLAGS} -Wl,-subsystem,console -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc")
 endif()
 
-set(BOOST_COMPONENTS
-    system
-    date_time
-    filesystem
-)
-# Boost thread library is different on Win/Linux
-if(WIN32)
-  set(BOOST_COMPONENTS ${BOOST_COMPONENTS} thread_win32)
-else()
-  set(BOOST_COMPONENTS ${BOOST_COMPONENTS} thread)
+# C++11
+#list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
+#set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
+if(CMAKE_COMPILER_IS_GNUCXX)
+    add_definitions(-std=c++11)
 endif()
 
-#set(Boost_USE_STATIC_LIBS ON)
-set(Boost_USE_MULTITHREADED ON)
-# -Weffc++
-add_definitions(-DBOOST_THREAD_USE_LIB=1 -D__STDC_CONSTANT_MACROS=1)
+# Compiler-specific C++11 activation.
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+    execute_process(
+        COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+    if (NOT (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7))
+        message(FATAL_ERROR "${PROJECT_NAME} requires g++ 4.7 or greater.")
+    endif ()
+elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+else ()
+    message(FATAL_ERROR "Your C++ compiler does not support C++11.")
+endif ()
 
 find_package(Threads)
-find_package(Boost COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
 find_package(PkgConfig)
 
 pkg_check_modules(FFMPEG REQUIRED libavformat libavcodec libswscale libswresample libavutil libavfilter)

android/.gitignore

@@ -0,0 +1 @@
+obj

android/default.properties

@@ -0,0 +1 @@
+target=android-10

android/jni/Android.mk

@@ -0,0 +1,52 @@
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := avcpp-android
+
+GLOBAL_C_INCLUDES := \
+  $(LOCAL_PATH)/../../src
+
+LOCAL_SRC_FILES := \
+  $(LOCAL_PATH)/../../src/videoframe.cpp \
+  $(LOCAL_PATH)/../../src/filterbufferref.cpp \
+  $(LOCAL_PATH)/../../src/filteropaque.cpp    \
+  $(LOCAL_PATH)/../../src/streamcoder.cpp     \
+  $(LOCAL_PATH)/../../src/filter.cpp          \
+  $(LOCAL_PATH)/../../src/filtergraph.cpp     \
+  $(LOCAL_PATH)/../../src/avtime.cpp          \
+  $(LOCAL_PATH)/../../src/codec.cpp           \
+  $(LOCAL_PATH)/../../src/filterinout.cpp     \
+  $(LOCAL_PATH)/../../src/rational.cpp        \
+  $(LOCAL_PATH)/../../src/stream.cpp          \
+  $(LOCAL_PATH)/../../src/avutils.cpp         \
+  $(LOCAL_PATH)/../../src/filters/buffersrc.cpp \
+  $(LOCAL_PATH)/../../src/filters/buffersink.cpp \
+  $(LOCAL_PATH)/../../src/containerformat.cpp \
+  $(LOCAL_PATH)/../../src/filterpad.cpp       \
+  $(LOCAL_PATH)/../../src/frame.cpp           \
+  $(LOCAL_PATH)/../../src/packet.cpp          \
+  $(LOCAL_PATH)/../../src/audiosamples.cpp    \
+  $(LOCAL_PATH)/../../src/videoresampler.cpp  \
+  $(LOCAL_PATH)/../../src/container.cpp       \
+  $(LOCAL_PATH)/../../src/rect.cpp            \
+  $(LOCAL_PATH)/../../src/audioresampler.cpp  \
+  $(LOCAL_PATH)/../../src/filtercontext.cpp
+
+#FFMPEG_INCDIR   := $(LOCAL_PATH)/ffmpeg/$(TARGET_ARCH)/include
+#FFMPEG_LIBDIR   := $(LOCAL_PATH)/ffmpeg/$(TARGET_ARCH)/lib
+
+FFMPEG_INCDIR   := $(LOCAL_PATH)/ffmpeg/armeabi-v7a/include
+FFMPEG_LIBDIR   := $(LOCAL_PATH)/ffmpeg/armeabi-v7a/lib
+
+
+LOCAL_CXXFLAGS  += -I$(FFMPEG_INCDIR)
+LOCAL_LDLIBS    := -L$(FFMPEG_LIBDIR) -lm
+
+LOCAL_STATIC_LIBRARIES := avformat avcodec swscale swresample avutil avfilter
+
+LOCAL_C_INCLUDES := $(GLOBAL_C_INCLUDES)
+
+include $(BUILD_STATIC_LIBRARY)
+

android/jni/Application.mk

@@ -0,0 +1,11 @@
+APP_OPTIM    := release
+APP_PLATFORM := android-14
+APP_STL      := gnustl_static
+APP_CPPFLAGS += -frtti
+APP_CPPFLAGS += -fexceptions
+APP_CPPFLAGS += -std=c++11
+APP_CPPFLAGS += -D__STDC_CONSTANT_MACROS
+#APP_ABI      := armeabi armeabi-v7a
+APP_ABI      := armeabi-v7a
+APP_MODULES  := avcpp-android
+NDK_TOOLCHAIN_VERSION := 4.8

android/jni/ffmpeg/armeabi-v7a/.gitignore

@@ -0,0 +1,2 @@
+include
+lib

example/sample-transcode/CMakeLists.txt

@@ -10,11 +10,9 @@ list(APPEND AV_TEST_TRANSCODE_HEADERS ${AV_HEADERS})
 
 set(AV_TEST_TRANSCODE_TARGET av-test-transcode)
 
-include_directories(${Boost_INCLUDE_DIRS})
 add_executable(${AV_TEST_TRANSCODE_TARGET} ${AV_TEST_TRANSCODE_SOURCES})
 target_link_libraries(${AV_TEST_TRANSCODE_TARGET}
     ${CMAKE_THREAD_LIBS_INIT}
-    ${Boost_LIBRARIES}
     ${FFMPEG_LIBRARIES}
     avcpp
 )

example/sample-transcode/av-transcode.cpp

@@ -1,8 +1,8 @@
 #include <iostream>
 #include <set>
 #include <map>
-
-#include <boost/smart_ptr.hpp>
+#include <memory>
+#include <functional>
 
 #include "av.h"
 #include "ffmpeg.h"
@@ -425,13 +425,13 @@ int main(int argc, char **argv)
                         frameref.copyToFrame(outFrame);
                         if (outFrame)
                         {
-                            VideoFramePtr outVideoFrame = boost::dynamic_pointer_cast<VideoFrame>(outFrame);
+                            VideoFramePtr outVideoFrame = std::static_pointer_cast<VideoFrame>(outFrame);
                             outVideoFrame->setStreamIndex(streamMapping[pkt->getStreamIndex()]);
                             outVideoFrame->setTimeBase(encoder->getTimeBase());
                             outVideoFrame->setPts(pkt->getTimeBase().rescale(pkt->getPts(), outVideoFrame->getTimeBase()));
 
                             outPkt = PacketPtr(new Packet());
-                            stat = encoder->encodeVideo(outPkt, outVideoFrame, boost::bind(formatWriter, writer, _1));
+                            stat = encoder->encodeVideo(outPkt, outVideoFrame, std::bind(formatWriter, writer, std::placeholders::_1));
                         }
                     }
                 }
@@ -489,7 +489,7 @@ int main(int argc, char **argv)
                         samplesref.copyToFrame(outFrame);
                         if (outFrame)
                         {
-                            AudioSamplesPtr outSamples = boost::dynamic_pointer_cast<AudioSamples>(outFrame);
+                            AudioSamplesPtr outSamples = std::static_pointer_cast<AudioSamples>(outFrame);
 
                             outSamples->setTimeBase(encoder->getTimeBase());
                             outSamples->setFakePts(pkt->getTimeBase().rescale(pkt->getPts(), outSamples->getTimeBase()));
@@ -502,7 +502,7 @@ int main(int argc, char **argv)
 
 
                             outPkt = PacketPtr(new Packet());
-                            stat = encoder->encodeAudio(outPkt, outSamples, boost::bind(formatWriter, writer, _1));
+                            stat = encoder->encodeAudio(outPkt, outSamples, std::bind(formatWriter, writer, std::placeholders::_1));
                         }
                     }
                 }

src/CMakeLists.txt

@@ -5,13 +5,10 @@ file(GLOB_RECURSE AV_HEADERS "*.h" "*.hpp")
 
 set(AV_TARGET avcpp)
 
-include_directories(${Boost_INCLUDE_DIRS})
-
 add_library(${AV_TARGET} STATIC ${AV_SOURCES})
 
 target_link_libraries(${AV_TARGET}
     ${CMAKE_THREAD_LIBS_INIT}
-    ${Boost_LIBRARIES}
     ${FFMPEG_LIBRARIES}
 )
 

src/audioresampler.cpp

@@ -1,3 +1,5 @@
+#include <cstdio>
+
 #include "audioresampler.h"
 
 namespace av {

src/audioresampler.h

@@ -1,6 +1,8 @@
 #ifndef AV_AUDIORESAMPLER_H
 #define AV_AUDIORESAMPLER_H
 
+#include <functional>
+
 #include "ffmpeg.h"
 #include "audiosamples.h"
 
@@ -43,8 +45,8 @@ class AudioResampler
     AVSampleFormat srcFormat;
 };
 
-typedef boost::shared_ptr<AudioResampler> AudioResamplerPtr;
-typedef boost::weak_ptr<AudioResampler>   AudioResamplerWPtr;
+typedef std::shared_ptr<AudioResampler> AudioResamplerPtr;
+typedef std::weak_ptr<AudioResampler>   AudioResamplerWPtr;
 
 } // namespace av
 

src/audiosamples.cpp

@@ -1,7 +1,7 @@
+#include <cassert>
+#include <cstdio>
 #include <iostream>
 
-#include <boost/format.hpp>
-
 #include "audiosamples.h"
 
 namespace av {
@@ -159,7 +159,7 @@ bool AudioSamples::isValid() const
     return false;
 }
 
-boost::shared_ptr<Frame> AudioSamples::clone()
+std::shared_ptr<Frame> AudioSamples::clone()
 {
     FramePtr result(new AudioSamples(*this));
     return result;
@@ -212,12 +212,21 @@ void AudioSamples::setupDataPointers(const AVFrame *frame)
     // This is error....
     if (size < 0)
     {
+        /*
         std::cout << boost::format("Can't allocate memory for audio sample data: "
                                    "empty audio sample (ch:%d, nb_samples:%d, fmt:%d)") %
                      getChannelsCount() %
                      frame->nb_samples %
                      frame->format
                   << std::endl;
+        */
+
+        std::printf("Can't allocate memory for audio sample data: "
+                    "empty audio sample (ch:%d, nb_samples:%d, fmt:%d)",
+                    getChannelsCount(),
+                    frame->nb_samples,
+                    frame->format);
+
         return;
     }
 

src/audiosamples.h

@@ -1,6 +1,8 @@
 #ifndef AV_AUDIOSAMPLES_H
 #define AV_AUDIOSAMPLES_H
 
+#include <memory>
+
 #include "frame.h"
 
 namespace av {
@@ -37,7 +39,7 @@ class AudioSamples : public Frame
     // public virtual
     virtual int getSize() const;
     virtual bool isValid() const;
-    virtual boost::shared_ptr<Frame> clone();
+    virtual std::shared_ptr<Frame> clone();
 
     // Common
     // Override this methods: we want to have access to PTS but don't need change it in AVFrame
@@ -70,8 +72,8 @@ class AudioSamples : public Frame
     void init(AVSampleFormat sampleFormat, int samplesCount, int channels, int samplesRate);
 };
 
-typedef boost::shared_ptr<AudioSamples> AudioSamplesPtr;
-typedef boost::weak_ptr<AudioSamples> AudioSamplesWPtr;
+typedef std::shared_ptr<AudioSamples> AudioSamplesPtr;
+typedef std::weak_ptr<AudioSamples> AudioSamplesWPtr;
 
 } // namespace av
 

src/avutils.cpp

@@ -49,7 +49,7 @@ void setFFmpegLoggingLevel(const string &level)
     {
         try
         {
-            setFFmpegLoggingLevel(boost::lexical_cast<int32_t>(level));
+            setFFmpegLoggingLevel(lexical_cast<int32_t>(level));
         }
         catch (...)
         {}
@@ -87,13 +87,13 @@ static int avcpp_lockmgr_cb(void **ctx, enum AVLockOp op)
     if (!ctx)
         return 1;
 
-    boost::mutex *mutex = static_cast<boost::mutex*>(*ctx);
+    std::mutex *mutex = static_cast<std::mutex*>(*ctx);
 
     int ret = 0;
     switch (op)
     {
         case AV_LOCK_CREATE:
-            mutex = new boost::mutex();
+            mutex = new std::mutex();
             *ctx = mutex;
             ret = !!mutex;
             break;

src/avutils.h

@@ -3,9 +3,10 @@
 
 #include <string>
 #include <vector>
-
-#include <boost/smart_ptr.hpp>
-#include <boost/thread/mutex.hpp>
+#include <memory>
+#include <mutex>
+#include <sstream>
+#include <algorithm>
 
 #include "ffmpeg.h"
 #include "packet.h"
@@ -17,6 +18,26 @@
 //
 namespace av {
 
+template<typename R, typename T>
+R lexical_cast(const T& v)
+{
+    R result;
+    stringstream ss;
+    ss << v;
+    ss >> result;
+    return result;
+}
+
+class noncopyable
+{
+protected:
+    noncopyable() {}
+    ~noncopyable() {}
+private:  // emphasize the following members are private
+    noncopyable( const noncopyable& );
+    const noncopyable& operator=( const noncopyable& );
+};
+
 /**
  * This method can be used to turn up or down FFmpeg's logging level.
  *

src/codec.cpp

@@ -63,7 +63,7 @@ CodecPtr av::Codec::findDecodingCodec(const char *name)
 CodecPtr av::Codec::guessEncodingCodec(const char *name, const char *url, const char *mime)
 {
     // TODO: need to complete
-    boost::shared_ptr<Codec> result;
+    std::shared_ptr<Codec> result;
     //CodecID codecId = av_guess_codec();
     return result;
 }

src/codec.h

@@ -2,8 +2,7 @@
 #define CODEC_H
 
 #include <list>
-
-#include <boost/smart_ptr.hpp>
+#include <memory>
 
 #include "ffmpeg.h"
 #include "rational.h"
@@ -12,8 +11,8 @@ namespace av {
 
 class Codec;
 
-typedef boost::shared_ptr<Codec> CodecPtr;
-typedef boost::weak_ptr<Codec>   CodecWPtr;
+typedef std::shared_ptr<Codec> CodecPtr;
+typedef std::weak_ptr<Codec>   CodecWPtr;
 
 class Codec
 {