Bugfix

.gitignore

@@ -1,24 +1,7 @@
-################################################################################
-# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
-################################################################################
-
-/source/ffmpeg-cpp/.vs/ffmpeg-cpp/v15
-/source/ffmpeg-cpp/ffmpeg-cpp/obj
-/source/ffmpeg-cpp/demo/obj
-/source/ffmpeg-cpp/x64/Debug
-/source/ffmpeg-cpp/obj/Debug
-/source/ffmpeg-cpp/demo/samples/out.mp4
-/ffmpeg/include
+/ffmpeg/include
 /ffmpeg/lib
 /ffmpeg/bin
 /bin
 /lib
-
-/source/ffmpeg-cpp/decode_audio/obj
-/source/ffmpeg-cpp/encode_audio/obj
-/source/ffmpeg-cpp/encode_video/obj
-/source/ffmpeg-cpp/decode_video/obj
-/source/ffmpeg-cpp/filtering_video/obj
-/include
-
-/source/ffmpeg-cpp/remuxing/obj
+/.vs
+/.vscode

CMakeLists.txt

@@ -0,0 +1,50 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(ffmpegcpp VERSION 1.0.0)
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+file(GLOB_RECURSE ffmpegcpp_files "include/ffmpegcpp/*.h" "src/*.cpp")
+file(GLOB_RECURSE header_files "include/ffmpegcpp/*.h")
+
+source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${ffmpegcpp_files})
+
+add_library(ffmpegcpp STATIC ${ffmpegcpp_files})
+
+set_target_properties(ffmpegcpp PROPERTIES 
+    VERSION ${PROJECT_VERSION}
+    PUBLIC_HEADER ${header_files}
+    CXX_STANDARD 17
+)
+
+set_target_properties(ffmpegcpp PROPERTIES
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+)
+
+target_include_directories(ffmpegcpp PRIVATE 
+    include/ffmpegcpp
+    ffmpeg/include
+)
+
+target_link_libraries(ffmpegcpp
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/avcodec.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/avdevice.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/avfilter.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/avformat.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/avutil.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/postproc.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/swresample.lib
+    ${PROJECT_SOURCE_DIR}/ffmpeg/lib/swscale.lib
+)
+
+install(TARGETS ffmpegcpp
+    ARCHIVE DESTINATION ${CMAKE_BINARY_DIR}/lib
+    LIBRARY DESTINATION ${CMAKE_BINARY_DIR}/lib
+    PUBLIC_HEADER DESTINATION ${CMAKE_BINARY_DIR}/lib/include
+)
+
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/ffmpeg/bin/ DESTINATION ${CMAKE_BINARY_DIR}/bin/Release FILES_MATCHING PATTERN "*.dll")
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/samples/ DESTINATION ${CMAKE_BINARY_DIR}/bin/Release/samples)
+
+add_subdirectory(examples)

examples/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_subdirectory(decode_audio)
+add_subdirectory(decode_video)
+add_subdirectory(demo)
+add_subdirectory(encode_audio)
+add_subdirectory(encode_video)
+add_subdirectory(filtering_video)
+add_subdirectory(remuxing)

examples/decode_audio/CMakeLists.txt

@@ -0,0 +1,17 @@
+
+add_executable(decode_audio
+    decode_audio.cpp
+)
+
+set_target_properties(decode_audio PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+target_include_directories(decode_audio PUBLIC
+    ${PROJECT_SOURCE_DIR}/include/ffmpegcpp
+    ${PROJECT_SOURCE_DIR}/ffmpeg/include
+)
+
+target_link_libraries(decode_audio ffmpegcpp)
+
+set_target_properties(decode_audio PROPERTIES FOLDER examples)

source/ffmpeg-cpp/decode_audio/decode_audio.cpp → examples/decode_audio/decode_audio.cpp

@@ -1,21 +1,19 @@
 
 #include <iostream>
+#include <memory>
 
 #include "ffmpegcpp.h"
 
-using namespace std;
-using namespace ffmpegcpp;
-
-class RawAudioFileSink : public AudioFrameSink
+class RawAudioFileSink : public ffmpegcpp::AudioFrameSink
 {
 public:
 
-	RawAudioFileSink(const char* fileName)
+	RawAudioFileSink(const std::string & fileName)
 	{
-		file = fopen(fileName, "wb");
+		file = fopen(fileName.c_str(), "wb");
 	}
 
-	virtual void WriteFrame(AVFrame* frame, AVRational* timeBase)
+	void WriteFrame(AVFrame* frame, AVRational* timeBase) override
 	{
 		// Just write out the samples channel by channel to a file.
 		int data_size = av_get_bytes_per_sample((AVSampleFormat)frame->format);
@@ -28,12 +26,12 @@ class RawAudioFileSink : public AudioFrameSink
 		}
 	}
 
-	virtual void Close()
+	void Close() override
 	{
 		fclose(file);
 	}
 
-	virtual bool IsPrimed()
+	bool IsPrimed() const override
 	{
 		// Return whether we have all information we need to start writing out data.
 		// Since we don't really need any data in this use case, we are always ready.
@@ -52,36 +50,33 @@ int main()
 	try
 	{
 		// Load this container file so we can extract audio from it.
-		Demuxer* demuxer = new Demuxer("samples/big_buck_bunny.mp4");
+		ffmpegcpp::Demuxer demuxer("samples/big_buck_bunny.mp4");
 
 		// Create a file sink that will just output the raw audio data.
-		RawAudioFileSink* fileSink = new RawAudioFileSink("rawaudio");
+		auto fileSink = std::make_unique<RawAudioFileSink>("rawaudio");
 
 		// tie the file sink to the best audio stream in the input container.
-		demuxer->DecodeBestAudioStream(fileSink);
+		demuxer.DecodeBestAudioStream(fileSink.get());
 
 		// Prepare the output pipeline. This will push a small amount of frames to the file sink until it IsPrimed returns true.
-		demuxer->PreparePipeline();
+		demuxer.PreparePipeline();
 
 		// Push all the remaining frames through.
-		while (!demuxer->IsDone())
+		while (!demuxer.IsDone())
 		{
-			demuxer->Step();
+			demuxer.Step();
 		}
 
-		// done
-		delete demuxer;
-		delete fileSink;
 	}
-	catch (FFmpegException e)
+	catch (ffmpegcpp::FFmpegException e)
 	{
-		cerr << "Exception caught!" << endl;
-		cerr << e.what() << endl;
+		std::cerr << "Exception caught!" << '\n';
+		std::cerr << e.what() << '\n';
 		throw e;
 	}
 
-	cout << "Decoding complete!" << endl;
-	cout << "Press any key to continue..." << endl;
+	std::cout << "Decoding complete!" << '\n';
+	std::cout << "Press any key to continue..." << '\n';
 
 	getchar();
 }

examples/decode_video/CMakeLists.txt

@@ -0,0 +1,17 @@
+
+add_executable(decode_video
+    decode_video.cpp
+)
+
+set_target_properties(decode_video PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+target_include_directories(decode_video PUBLIC
+    ${PROJECT_SOURCE_DIR}/include/ffmpegcpp
+    ${PROJECT_SOURCE_DIR}/ffmpeg/include
+)
+
+target_link_libraries(decode_video ffmpegcpp)
+
+set_target_properties(decode_video PROPERTIES FOLDER examples)

source/ffmpeg-cpp/decode_video/decode_video.cpp → examples/decode_video/decode_video.cpp

@@ -1,20 +1,18 @@
 
 #include <iostream>
+#include <memory>
 
 #include "ffmpegcpp.h"
 
-using namespace std;
-using namespace ffmpegcpp;
-
-class PGMFileSink : public VideoFrameSink
+class PGMFileSink : public ffmpegcpp::VideoFrameSink
 {
 public:
 
 	PGMFileSink()
 	{
 	}
 
-	virtual void WriteFrame(AVFrame* frame, AVRational* timeBase)
+	void WriteFrame(AVFrame* frame, AVRational* timeBase) override
 	{
 		++frameNumber;
 		printf("saving frame %3d\n", frameNumber);
@@ -41,12 +39,12 @@ class PGMFileSink : public VideoFrameSink
 		fclose(f);
 	}
 
-	virtual void Close()
+	void Close() override
 	{
 		// nothing to do here.
 	}
 
-	virtual bool IsPrimed()
+	bool IsPrimed() const override
 	{
 		// Return whether we have all information we need to start writing out data.
 		// Since we don't really need any data in this use case, we are always ready.
@@ -67,36 +65,32 @@ int main()
 	try
 	{
 		// Load this container file so we can extract video from it.
-		Demuxer* demuxer = new Demuxer("samples/big_buck_bunny.mp4");
+		ffmpegcpp::Demuxer demuxer("samples/big_buck_bunny.mp4");
 
 		// Create a file sink that will just output the raw frame data in one PGM file per frame.
-		PGMFileSink* fileSink = new PGMFileSink();
+		auto fileSink = std::make_unique<PGMFileSink>();
 
 		// tie the file sink to the best video stream in the input container.
-		demuxer->DecodeBestVideoStream(fileSink);
+		demuxer.DecodeBestVideoStream(fileSink.get());
 
 		// Prepare the output pipeline. This will push a small amount of frames to the file sink until it IsPrimed returns true.
-		demuxer->PreparePipeline();
+		demuxer.PreparePipeline();
 
 		// Push all the remaining frames through.
-		while (!demuxer->IsDone())
+		while (!demuxer.IsDone())
 		{
-			demuxer->Step();
+			demuxer.Step();
 		}
-
-		// done
-		delete demuxer;
-		delete fileSink;
 	}
-	catch (FFmpegException e)
+	catch (ffmpegcpp::FFmpegException e)
 	{
-		cerr << "Exception caught!" << endl;
-		cerr << e.what() << endl;
+		std::cerr << "Exception caught!" << '\n';
+		std::cerr << e.what() << '\n';
 		throw e;
 	}
 
-	cout << "Decoding complete!" << endl;
-	cout << "Press any key to continue..." << endl;
+	std::cout << "Decoding complete!" << '\n';
+	std::cout << "Press any key to continue..." << '\n';
 
 	getchar();
 }

examples/demo/CMakeLists.txt

@@ -0,0 +1,19 @@
+
+add_executable(demo
+    demo.cpp
+    GeneratedAudioSource.cpp
+    GeneratedVideoSource.cpp
+)
+
+set_target_properties(demo PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+target_include_directories(demo PUBLIC
+    ${PROJECT_SOURCE_DIR}/include/ffmpegcpp
+    ${PROJECT_SOURCE_DIR}/ffmpeg/include
+)
+
+target_link_libraries(demo ffmpegcpp)
+
+set_target_properties(demo PROPERTIES FOLDER examples)

source/ffmpeg-cpp/demo/GeneratedAudioSource.cpp → examples/demo/GeneratedAudioSource.cpp

@@ -1,22 +1,21 @@
 #include "GeneratedAudioSource.h"
 
-GeneratedAudioSource::GeneratedAudioSource(AudioFrameSink* frameSink)
+GeneratedAudioSource::GeneratedAudioSource(ffmpegcpp::AudioFrameSink* frameSink)
 {
 	this->sampleRate = 44100;
 	this->channels = 2;
 	this->format = AV_SAMPLE_FMT_S16;
 
 	// generate a raw video source that will convert the raw format to any other format and pass it on to the encoder
 	// or any other sink (might be a filter as well).
-	output = new RawAudioDataSource(format, this->sampleRate, this->channels, frameSink);
+	output = std::make_unique<ffmpegcpp::RawAudioDataSource>(format, this->sampleRate, this->channels, frameSink);
 
 	samples = new uint16_t[channels * 2 * sampleCount];
 
 }
 
 GeneratedAudioSource::~GeneratedAudioSource()
 {
-	delete output;
 	delete samples;
 }
 
@@ -28,7 +27,7 @@ void GeneratedAudioSource::PreparePipeline()
 	}
 }
 
-bool GeneratedAudioSource::IsDone()
+bool GeneratedAudioSource::IsDone() const
 {
 	return frameNumber >= 120;
 }
@@ -37,7 +36,7 @@ void GeneratedAudioSource::Step()
 {
 	/* encode a single tone sound */
 	float t = 0.0f;
-	float tincr = 2 * M_PI * 440.0 / sampleRate;
+	float tincr = (float)(2.0 * M_PI * 440.0) / (float)sampleRate;
 	for (int i = 0; i < 120; i++)
 	{
 		/* make sure the frame is writable -- makes a copy if the encoder

examples/demo/GeneratedAudioSource.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <memory>
+
+#include "ffmpegcpp.h"
+
+class GeneratedAudioSource : public ffmpegcpp::InputSource
+{
+public:
+
+	GeneratedAudioSource(ffmpegcpp::AudioFrameSink* frameSink);
+	~GeneratedAudioSource();
+
+	void PreparePipeline() override;
+	bool IsDone() const override;
+	void Step() override;
+
+private:
+
+	int sampleRate;
+	int channels;
+	AVSampleFormat format;
+
+	std::unique_ptr<ffmpegcpp::RawAudioDataSource> output;
+
+	int sampleCount = 735;
+
+	uint16_t* samples;
+
+	int frameNumber = 0;
+};
+