AudioFrame: split hpp/cpp

Clement Champetier · Clement Champetier · commit 8c5c150ca412 · 2015-02-05T16:21:54.000+01:00
diff --git a/src/AvTranscoder/file/IOutputFile.hpp b/src/AvTranscoder/file/IOutputFile.hpp
@@ -11,7 +11,7 @@
 #include <AvTranscoder/ProfileLoader.hpp>
 
 #include <string>
-#include <exception>
+#include <stdexcept>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/frame/AudioFrame.cpp b/src/AvTranscoder/frame/AudioFrame.cpp
@@ -0,0 +1,51 @@
+#include "AudioFrame.hpp"
+
+#include <stdexcept>
+
+namespace avtranscoder
+{
+
+AudioFrameDesc::AudioFrameDesc( const size_t sampleRate, const size_t channels, const AVSampleFormat sampleFormat )
+	: _sampleRate( sampleRate )
+	, _channels( channels )
+	, _sampleFormat( sampleFormat )
+	, _fps( 1. )
+{}
+
+AudioFrameDesc::AudioFrameDesc( const size_t sampleRate, const size_t channels, const std::string& sampleFormat )
+	: _sampleRate( sampleRate )
+	, _channels( channels )
+	, _sampleFormat( av_get_sample_fmt( sampleFormat.c_str() ) )
+	, _fps( 1. )
+{}
+
+std::string AudioFrameDesc::getSampleFormatName() const
+{
+	const char* formatName = av_get_sample_fmt_name( _sampleFormat );
+	return formatName ? std::string( formatName ) : "unknown sample format";
+}
+
+size_t AudioFrameDesc::getDataSize() const
+{
+	if( _sampleFormat == AV_SAMPLE_FMT_NONE )
+		throw std::runtime_error( "incorrect sample format" );
+
+	size_t size = ( _sampleRate / _fps ) * _channels * av_get_bytes_per_sample( _sampleFormat );
+	if( size == 0 )
+		throw std::runtime_error( "unable to determine audio buffer size" );
+
+	return size;
+}
+
+void AudioFrameDesc::setSampleFormat( const std::string& sampleFormatName )
+{
+	_sampleFormat = av_get_sample_fmt( sampleFormatName.c_str() );
+}
+
+void AudioFrameDesc::setParameters( const ProfileLoader::Profile& profile )
+{
+	if( profile.find( constants::avProfileSampleFormat ) != profile.end() )
+		setSampleFormat( profile.find( constants::avProfileSampleFormat )->second );
+}
+
+}
diff --git a/src/AvTranscoder/frame/AudioFrame.hpp b/src/AvTranscoder/frame/AudioFrame.hpp
@@ -8,62 +8,32 @@ extern "C" {
 #include <libavutil/samplefmt.h>
 }
 
-#include <stdexcept>
-
 namespace avtranscoder
 {
 
 /// @brief Description of a number of samples, which corresponds to one video frame
 class AvExport AudioFrameDesc
 {
 public:
-	AudioFrameDesc( const size_t sampleRate = 0, const size_t channels = 0, const AVSampleFormat sampleFormat = AV_SAMPLE_FMT_NONE )
-		: _sampleRate( sampleRate )
-		, _channels( channels )
-		, _sampleFormat( sampleFormat )
-		, _fps( 1. )
-	{}
+	AudioFrameDesc( const size_t sampleRate = 0, const size_t channels = 0, const AVSampleFormat sampleFormat = AV_SAMPLE_FMT_NONE );
 
-	AudioFrameDesc( const size_t sampleRate, const size_t channels, const std::string& sampleFormat )
-		: _sampleRate( sampleRate )
-		, _channels( channels )
-		, _sampleFormat( av_get_sample_fmt( sampleFormat.c_str() ) )
-		, _fps( 1. )
-	{}
+	AudioFrameDesc( const size_t sampleRate, const size_t channels, const std::string& sampleFormat );
 
 	size_t getSampleRate() const { return _sampleRate; }
 	size_t getChannels() const { return _channels; }
 	AVSampleFormat getSampleFormat() const { return _sampleFormat; }
-	std::string getSampleFormatName() const
-	{
-		const char* formatName = av_get_sample_fmt_name( _sampleFormat );
-		return formatName ? std::string( formatName ) : "unknown sample format";
-	}
+	std::string getSampleFormatName() const;
 	double getFps() const { return _fps; }
 
-	size_t getDataSize() const
-	{
-		if( _sampleFormat == AV_SAMPLE_FMT_NONE )
-			throw std::runtime_error( "incorrect sample format" );
-
-		size_t size = ( _sampleRate / _fps ) * _channels * av_get_bytes_per_sample( _sampleFormat );
-		if( size == 0 )
-			throw std::runtime_error( "unable to determine audio buffer size" );
-
-		return size;
-	}
+	size_t getDataSize() const;
 	
 	void setSampleRate( const size_t sampleRate ) { _sampleRate = sampleRate; }
 	void setChannels( const size_t channels ) { _channels = channels; }
-	void setSampleFormat( const std::string& sampleFormatName ) { _sampleFormat = av_get_sample_fmt( sampleFormatName.c_str() ); }
+	void setSampleFormat( const std::string& sampleFormatName );
 	void setSampleFormat( const AVSampleFormat sampleFormat ) { _sampleFormat = sampleFormat; }
 	void setFps( const double fps ) { _fps = fps; }
 	
-	void setParameters( const ProfileLoader::Profile& profile )
-	{
-		if( profile.find( constants::avProfileSampleFormat ) != profile.end() )
-			setSampleFormat( profile.find( constants::avProfileSampleFormat )->second );
-	}
+	void setParameters( const ProfileLoader::Profile& profile );
 
 private:
 	size_t _sampleRate;

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#include <AvTranscoder/ProfileLoader.hpp>`
`12`	`12`
`13`	`13`	`#include <string>`
`14`		`-#include <exception>`
	`14`	`+#include <stdexcept>`
`15`	`15`
`16`	`16`	`namespace avtranscoder`
`17`	`17`	`{`