Merge pull request #47 from cchampet/dev_videoProfile_with_no_frameRate

valnoel · valnoel · commit 494335170d4d · 2015-01-16T11:53:07.000+01:00
* Can use video profiles without frame rate
* Check profiles before using them
diff --git a/README.md b/README.md
@@ -34,7 +34,6 @@ avProfileName=profileName
 avProfileLongName=profileLongName
 avProfileType=avProfileTypeVideo
 codec=codecName
-r=frameRate
 ```
 
 The minimum audio profile is:
diff --git a/ressource/v_dnxhd120.prf b/ressource/v_dnxhd120.prf
@@ -5,4 +5,3 @@ codec=dnxhd
 b=120M
 pix_fmt=yuv422p
 g=1
-r=25
diff --git a/ressource/v_dnxhd185.prf b/ressource/v_dnxhd185.prf
@@ -5,4 +5,3 @@ codec=dnxhd
 pix_fmt=yuv422p
 b=185M
 g=1
-r=25
diff --git a/ressource/v_dnxhd185x.prf b/ressource/v_dnxhd185x.prf
@@ -5,4 +5,3 @@ codec=dnxhd
 pix_fmt=yuv422p10le
 b=185M
 g=1
-r=25
diff --git a/ressource/v_dvcpro25.prf b/ressource/v_dvcpro25.prf
@@ -4,4 +4,3 @@ avProfileType=avProfileTypeVideo
 codec=dvvideo
 pix_fmt=yuv411p
 b=25M
-r=25
diff --git a/ressource/v_dvcpro50.prf b/ressource/v_dvcpro50.prf
@@ -4,4 +4,3 @@ avProfileType=avProfileTypeVideo
 codec=dvvideo
 pix_fmt=yuv422p
 b=50M
-r=25
diff --git a/ressource/v_h264.prf b/ressource/v_h264.prf
@@ -3,4 +3,3 @@ avProfileLongName=h264 High
 avProfileType=avProfileTypeVideo
 codec=h264
 profile=High
-r=25
diff --git a/ressource/v_mpeg2.prf b/ressource/v_mpeg2.prf
@@ -3,4 +3,3 @@ avProfileLongName=MPEG-2
 avProfileType=avProfileTypeVideo
 codec=mpeg2video
 pix_fmt=yuv422p
-r=25
diff --git a/ressource/v_rawYuv.prf b/ressource/v_rawYuv.prf
@@ -3,4 +3,3 @@ avProfileLongName=Raw YUV
 avProfileType=avProfileTypeVideo
 codec=rawvideo
 pix_fmt=rgb24
-r=25
diff --git a/src/AvTranscoder/ProfileLoader.cpp b/src/AvTranscoder/ProfileLoader.cpp
@@ -16,10 +16,10 @@ ProfileLoader::ProfileLoader( bool autoload )
 		loadProfiles();
 }
 
-void ProfileLoader::loadProfile( const std::string& avProfileFile )
+void ProfileLoader::loadProfile( const std::string& avProfileFileName )
 {
 	std::ifstream infile;
-	infile.open( avProfileFile.c_str(), std::ifstream::in );
+	infile.open( avProfileFileName.c_str(), std::ifstream::in );
 	
 	ProfileLoader::Profile customProfile;
 
@@ -31,18 +31,7 @@ void ProfileLoader::loadProfile( const std::string& avProfileFile )
 		if( keyValue.size() == 2 )
 			customProfile[ keyValue.at( 0 ) ] = keyValue.at( 1 );
 	}
-	// check if profile contains required values
-	if( 
-		customProfile.count( constants::avProfileIdentificator ) &&
-		customProfile.count( constants::avProfileIdentificatorHuman ) &&
-		customProfile.count( constants::avProfileType ) &&
-		( customProfile.find( constants::avProfileType )->second == constants::avProfileTypeFormat ||
-		customProfile.find( constants::avProfileType )->second == constants::avProfileTypeVideo ||
-		customProfile.find( constants::avProfileType )->second == constants::avProfileTypeAudio )
-		)
-	{
-		_profiles.push_back( customProfile );
-	}
+	loadProfile( customProfile );
 }
 
 void ProfileLoader::loadProfiles( const std::string& avProfilesPath )
@@ -67,28 +56,46 @@ void ProfileLoader::loadProfiles( const std::string& avProfilesPath )
 		for( std::vector< std::string >::iterator fileIt = files.begin(); fileIt != files.end(); ++fileIt )
 		{
 			const std::string absPath = ( *dirIt ) + "/" + ( *fileIt );
-			loadProfile( absPath );
+			try
+			{
+				loadProfile( absPath );
+			}
+			catch( const std::exception& e )
+			{
+				std::cout << e.what() << std::endl;
+			}
 		}
 	}
 }
 
-void ProfileLoader::update( const Profile& profile )
+void ProfileLoader::loadProfile( const Profile& profile )
 {
-	Profile::const_iterator profileIt = profile.find( constants::avProfileIdentificator );
-	if( profileIt == profile.end() )
-		throw std::runtime_error( "Invalid profile: can't get identificator" );
+	// check profile long name
+	if( ! profile.count( constants::avProfileIdentificator ) )
+	{
+		throw std::runtime_error( "Warning: A profile has no name. It will not be loaded." );
+	}
 
-	std::string profileId( profileIt->second );
-	size_t profileIndex = 0;
-	for( Profiles::iterator it = _profiles.begin(); it != _profiles.end(); ++it )
+	// check profile type
+	if( profile.count( constants::avProfileType ) == 0 )
 	{
-		// profile already exists
-		if( (*it).find( constants::avProfileIdentificator )->second == profileId )
-			return;
-		++profileIndex;
+		throw std::runtime_error( "Warning: The profile " + profile.find( constants::avProfileIdentificator )->second + " has not type. It will not be loaded." );
 	}
-	// profile not found: add the new profile
-	_profiles.push_back( profile );
+
+	// check complete profile
+	bool isValid = false;
+	std::string type( profile.find( constants::avProfileType )->second );
+	if( type == constants::avProfileTypeFormat )
+		isValid = checkFormatProfile( profile );
+	else if( type == constants::avProfileTypeVideo )
+		isValid = checkVideoProfile( profile );
+	else if( type == constants::avProfileTypeAudio )
+		isValid = checkAudioProfile( profile );
+
+	if( isValid )
+		_profiles.push_back( profile );
+	else
+		throw std::runtime_error( "Warning: The profile " + profile.find( constants::avProfileIdentificator )->second + " is invalid. It will not be loaded." );
 }
 
 const ProfileLoader::Profiles& ProfileLoader::getProfiles()
@@ -147,4 +154,51 @@ ProfileLoader::Profile& ProfileLoader::getProfile( const std::string& avProfileI
 	throw std::runtime_error( "unable to find profile: " + avProfileIdentificator );
 }
 
+
+bool ProfileLoader::checkFormatProfile( const Profile& profileToCheck )
+{
+	bool isValid = true;
+
+	if( ! profileToCheck.count( constants::avProfileIdentificator ) ||
+		! profileToCheck.count( constants::avProfileIdentificatorHuman ) ||
+		! profileToCheck.count( constants::avProfileType ) ||
+		! profileToCheck.count( constants::avProfileFormat ) )
+	{
+		isValid = false;
+	}
+
+	return isValid;
+}
+
+bool ProfileLoader::checkVideoProfile( const Profile& profileToCheck )
+{
+	bool isValid = true;
+
+	if( ! profileToCheck.count( constants::avProfileIdentificator ) ||
+		! profileToCheck.count( constants::avProfileIdentificatorHuman ) ||
+		! profileToCheck.count( constants::avProfileType ) ||
+		! profileToCheck.count( constants::avProfileCodec ) )
+	{
+		isValid = false;
+	}
+
+	return isValid;
+}
+
+bool ProfileLoader::checkAudioProfile( const Profile& profileToCheck )
+{
+	bool isValid = true;
+
+	if( ! profileToCheck.count( constants::avProfileIdentificator ) ||
+		! profileToCheck.count( constants::avProfileIdentificatorHuman ) ||
+		! profileToCheck.count( constants::avProfileType ) ||
+		! profileToCheck.count( constants::avProfileCodec ) )
+	{
+		isValid = false;
+	}
+
+	return isValid;
+}
+
+
 }
diff --git a/src/AvTranscoder/ProfileLoader.hpp b/src/AvTranscoder/ProfileLoader.hpp
@@ -37,11 +37,23 @@ class AvExport ProfileLoader
 public:
 	ProfileLoader( bool autoload = false );
 
+	/**
+	 * @brief Load profiles from files in avProfilesPath directory
+	 * @param avProfilesPath: if empty, the path is replaced by value of AVPROFILES environment variable
+	 */
 	void loadProfiles( const std::string& avProfilesPath = "" );
-	void loadProfile( const std::string& avProfileFile );
 
-	void update( const Profile& profile );
-	
+	/**
+	 * @brief Load the profile defines in the given file
+	 */
+	void loadProfile( const std::string& avProfileFileName );
+
+	/**
+	 * @brief  Load the given profile
+	 * @exception throw std::runtime_error if the profile is invalid
+	 */
+	void loadProfile( const Profile& profile );
+
 	const Profiles& getProfiles();
 
 	Profiles getFormatProfiles();
@@ -50,6 +62,11 @@ class AvExport ProfileLoader
 
 	Profile& getProfile( const std::string& avProfileIdentificator );
 
+private:
+	bool checkFormatProfile( const Profile& profileToCheck );
+	bool checkVideoProfile( const Profile& profileToCheck );
+	bool checkAudioProfile( const Profile& profileToCheck );
+
 private:
 	Profiles _profiles;
 };
diff --git a/src/AvTranscoder/codec/AudioCodec.cpp b/src/AvTranscoder/codec/AudioCodec.cpp
@@ -24,20 +24,20 @@ AudioFrameDesc AudioCodec::getAudioFrameDesc() const
 {
 	assert( _avCodecContext != NULL );
 	AudioFrameDesc audioFrameDesc( _avCodecContext->sample_rate, _avCodecContext->channels, _avCodecContext->sample_fmt );
-	// audioFrameDesc.setFps( 25 );
+	double fps = 1.0 * _avCodecContext->time_base.den / ( _avCodecContext->time_base.num * _avCodecContext->ticks_per_frame );
+	if( ! isinf( fps ) )
+		audioFrameDesc.setFps( fps );
 	return audioFrameDesc;
 }
 
 void AudioCodec::setAudioParameters( const AudioFrameDesc& audioFrameDesc )
 {
-	setAudioParameters( audioFrameDesc.getSampleRate(), audioFrameDesc.getChannels(), audioFrameDesc.getSampleFormat() );
-}
-
-void AudioCodec::setAudioParameters( const size_t sampleRate, const size_t channels, const AVSampleFormat sampleFormat )
-{
-	_avCodecContext->sample_rate = sampleRate;
-	_avCodecContext->channels = channels;
-	_avCodecContext->sample_fmt = sampleFormat;
+	_avCodecContext->sample_rate = audioFrameDesc.getSampleRate();
+	_avCodecContext->channels = audioFrameDesc.getChannels();
+	_avCodecContext->sample_fmt = audioFrameDesc.getSampleFormat();
+	_avCodecContext->time_base.num = 1;
+	_avCodecContext->time_base.den = audioFrameDesc.getFps();
+	_avCodecContext->ticks_per_frame = 1;
 }
 
 }
diff --git a/src/AvTranscoder/codec/AudioCodec.hpp b/src/AvTranscoder/codec/AudioCodec.hpp
@@ -17,7 +17,6 @@ class AvExport AudioCodec : public ICodec
 	AudioFrameDesc getAudioFrameDesc() const;
 
 	void setAudioParameters( const AudioFrameDesc& audioFrameDesc );
-	void setAudioParameters( const size_t sampleRate, const size_t channels, const AVSampleFormat sampleFormat );
 };
 
 }
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -38,8 +38,6 @@ ICodec::ICodec( const ECodecType type, AVCodecContext& avCodecContext )
 	, _isCodecContextAllocated( false )
 	, _type( type )
 {
-	avcodec_register_all();  // TODO: call only once
-
 	setCodec( type, _avCodecContext->codec_id );
 }
 
diff --git a/src/AvTranscoder/codec/VideoCodec.cpp b/src/AvTranscoder/codec/VideoCodec.cpp
@@ -24,35 +24,20 @@ VideoFrameDesc VideoCodec::getVideoFrameDesc() const
 {
 	assert( _avCodecContext != NULL );
 	VideoFrameDesc videoFrameDesc( _avCodecContext->width, _avCodecContext->height, _avCodecContext->pix_fmt );
+	double fps = 1.0 * _avCodecContext->time_base.den / ( _avCodecContext->time_base.num * _avCodecContext->ticks_per_frame );
+	if( ! isinf( fps ) )
+		videoFrameDesc.setFps( fps );
 	return videoFrameDesc;
 }
 
-std::pair< size_t, size_t > VideoCodec::getTimeBase() const
-{
-	assert( _avCodecContext != NULL );
-	std::pair< size_t, size_t > timeBase;
-	timeBase.first = _avCodecContext->time_base.num;
-	timeBase.second = _avCodecContext->time_base.den;
-	return timeBase;
-}
-
 void VideoCodec::setImageParameters( const VideoFrameDesc& videoFrameDesc )
 {
-	setImageParameters( videoFrameDesc.getWidth(), videoFrameDesc.getHeight(), videoFrameDesc.getPixelFormat() );
-}
-
-void VideoCodec::setImageParameters( const size_t width, const size_t height, const AVPixelFormat& pixel )
-{
-	_avCodecContext->width = width;
-	_avCodecContext->height = height;
-	_avCodecContext->pix_fmt = pixel;
-}
-
-void VideoCodec::setTimeBase( const size_t num, const size_t den, const size_t ticksPerFrame )
-{
-	_avCodecContext->time_base.num = num;
-	_avCodecContext->time_base.den = den;
-	_avCodecContext->ticks_per_frame = ticksPerFrame;
+	_avCodecContext->width = videoFrameDesc.getWidth();
+	_avCodecContext->height = videoFrameDesc.getHeight();
+	_avCodecContext->pix_fmt = videoFrameDesc.getPixelFormat();
+	_avCodecContext->time_base.num = 1;
+	_avCodecContext->time_base.den = videoFrameDesc.getFps();
+	_avCodecContext->ticks_per_frame = 1;
 }
 
 }
diff --git a/src/AvTranscoder/codec/VideoCodec.hpp b/src/AvTranscoder/codec/VideoCodec.hpp
@@ -4,8 +4,6 @@
 #include "ICodec.hpp"
 #include <AvTranscoder/frame/VideoFrame.hpp>
 
-#include <utility>
-
 namespace avtranscoder
 {
 
@@ -15,14 +13,10 @@ class AvExport VideoCodec : public ICodec
 	VideoCodec( const ECodecType type, const std::string& codecName = "" );
 	VideoCodec( const ECodecType type, const AVCodecID codecId );
 	VideoCodec( const ECodecType type, AVCodecContext& avCodecContext );
-	
+
 	VideoFrameDesc getVideoFrameDesc() const;
-	std::pair< size_t, size_t > getTimeBase() const;
-	
-	void setImageParameters( const VideoFrameDesc& videoFrameDesc );
-	void setImageParameters( const size_t width, const size_t height, const AVPixelFormat& pixel );
 
-	void setTimeBase( const size_t num, const size_t den, const size_t ticksPerFrame = 1 );
+	void setImageParameters( const VideoFrameDesc& videoFrameDesc );
 };
 
 }
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -12,7 +12,6 @@ AudioGenerator::AudioGenerator()
 void AudioGenerator::setAudioFrameDesc( const AudioFrameDesc& frameDesc )
 {
 	_frameDesc = frameDesc;
-	_frameDesc.setFps( 25. );
 }
 
 void AudioGenerator::setFrame( Frame& inputFrame )
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -147,19 +147,17 @@ bool AudioEncoder::encodeFrame( Frame& codedFrame )
 
 void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const AudioFrameDesc& frameDesc  )
 {
-	if( ! profile.count( constants::avProfileCodec ) )
-	{
-		throw std::runtime_error( "The profile " + profile.find( constants::avProfileIdentificatorHuman )->second + " is invalid." );
-	}
-	
+	// set sampleRate, number of channels, sample format
 	_codec.setAudioParameters( frameDesc );
-	
+
+	// set encoder options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
 	{
 		if( (*it).first == constants::avProfileIdentificator ||
 			(*it).first == constants::avProfileIdentificatorHuman ||
 			(*it).first == constants::avProfileType ||
-			(*it).first == constants::avProfileCodec )
+			(*it).first == constants::avProfileCodec ||
+			(*it).first == constants::avProfileSampleFormat )
 			continue;
 
 		try
@@ -178,7 +176,8 @@ void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const Audi
 		if( (*it).first == constants::avProfileIdentificator ||
 			(*it).first == constants::avProfileIdentificatorHuman ||
 			(*it).first == constants::avProfileType ||
-			(*it).first == constants::avProfileCodec )
+			(*it).first == constants::avProfileCodec ||
+			(*it).first == constants::avProfileSampleFormat )
 			continue;
 
 		try
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
diff --git a/src/AvTranscoder/frame/AudioFrame.hpp b/src/AvTranscoder/frame/AudioFrame.hpp
diff --git a/src/AvTranscoder/frame/VideoFrame.hpp b/src/AvTranscoder/frame/VideoFrame.hpp
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
diff --git a/test/pyTest/testTranscoderDummy.py b/test/pyTest/testTranscoderDummy.py
diff --git a/test/pyTest/testTranscoderTranscode.py b/test/pyTest/testTranscoderTranscode.py

-Original file line number
+Diff line change
 b=120M
 pix_fmt=yuv422p
 g=1
 -r=25