mediaProperty: check if access of properties is possible

Clement Champetier · Clement Champetier · commit 9c432e8d3da8 · 2014-12-03T14:59:44.000+01:00
Throw exception if it's not possible and we can't return any value.
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -1,5 +1,7 @@
 #include "AudioProperties.hpp"
 
+#include <stdexcept>
+
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -124,6 +126,34 @@ std::string AudioProperties::getChannelDescription() const
 #endif
 }
 
+size_t AudioProperties::getCodecId() const 
+{
+	if( ! _codecContext )
+		throw std::runtime_error( "unknown codec context" );
+	return _codecContext->codec_id;
+}
+
+size_t AudioProperties::getSampleRate() const 
+{
+	if( ! _codecContext )
+		throw std::runtime_error( "unknown codec context" );
+	return _codecContext->sample_rate;
+}
+
+size_t AudioProperties::getChannels() const 
+{
+	if( ! _codecContext )
+		throw std::runtime_error( "unknown codec context" );
+	return _codecContext->channels;
+}
+
+size_t AudioProperties::getBitRate() const
+{
+	if( ! _codecContext )
+		throw std::runtime_error( "unknown codec context" );
+	return _codecContext->bit_rate;
+}
+
 MetadatasMap AudioProperties::getDataMap() const
 {
 	MetadatasMap dataMap;
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp
@@ -29,10 +29,10 @@ class AvExport AudioProperties
 	std::string getChannelName() const;
 	std::string getChannelDescription() const;
 	size_t getStreamId() const { return _streamId; }
-	size_t getCodecId() const { return _codecContext->codec_id; }
-	size_t getSampleRate() const { return _codecContext->sample_rate; }
-	size_t getChannels() const { return _codecContext->channels; }
-	size_t getBitRate() const { return _codecContext->bit_rate; }
+	size_t getCodecId() const;
+	size_t getSampleRate() const;
+	size_t getChannels() const;
+	size_t getBitRate() const;
 	MetadatasMap& getMetadatas() { return _metadatas; }
 
 #ifndef SWIG
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -1,5 +1,7 @@
 #include "FileProperties.hpp"
 
+#include <stdexcept>
+
 namespace avtranscoder
 {
 
@@ -16,6 +18,68 @@ FileProperties::FileProperties( const AVFormatContext* formatContext )
 		detail::fillMetadataDictionnary( _formatContext->metadata, _metadatas );
 }
 
+std::string FileProperties::getFilename() const
+{
+	if( ! _formatContext )
+		throw std::runtime_error( "unknown format context" );
+	return _formatContext->filename;
+}
+
+std::string FileProperties::getFormatName() const
+{
+	if( ! _formatContext || ! _formatContext->iformat )
+		throw std::runtime_error( "unknown format context" );
+	return _formatContext->iformat->name;
+}
+
+std::string FileProperties::getFormatLongName() const
+{
+	if( ! _formatContext || ! _formatContext->iformat )
+		throw std::runtime_error( "unknown format context" );
+	return _formatContext->iformat->long_name;
+}
+
+size_t FileProperties::getProgramsCount() const
+{
+	if( ! _formatContext )
+		throw std::runtime_error( "unknown format context" );
+	return _formatContext->nb_programs;
+}
+
+double FileProperties::getStartTime() const
+{
+	if( ! _formatContext )
+		throw std::runtime_error( "unknown format context" );
+	return  1.0 * (unsigned int)_formatContext->start_time / AV_TIME_BASE;
+}
+
+double FileProperties::getDuration() const
+{
+	if( ! _formatContext )
+		throw std::runtime_error( "unknown format context" );
+	return 1.0 * _formatContext->duration / AV_TIME_BASE;
+}
+
+size_t FileProperties::getBitRate() const
+{
+	if( ! _formatContext )
+		throw std::runtime_error( "unknown format context" );
+	return _formatContext->bit_rate;
+}
+
+size_t FileProperties::getPacketSize() const
+{
+	if( ! _formatContext )
+		throw std::runtime_error( "unknown format context" );
+	return _formatContext->packet_size;
+}
+
+size_t FileProperties::getNbStreams() const
+{
+	if( ! _formatContext )
+		throw std::runtime_error( "unknown format context" );
+	return _formatContext->nb_streams;
+}
 
 MetadatasMap FileProperties::getDataMap() const
 {
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp
@@ -25,19 +25,19 @@ class AvExport FileProperties
 public:
 	FileProperties( const AVFormatContext* formatContext );
 
-	std::string getFilename() const { return _formatContext->filename; }
-	std::string getFormatName() const { return _formatContext->iformat->name; }
-	std::string getFormatLongName() const { return _formatContext->iformat->long_name; }
+	std::string getFilename() const;
+	std::string getFormatName() const;
+	std::string getFormatLongName() const;
 
-	size_t getProgramsCount() const { return _formatContext->nb_programs; }
-	double getStartTime() const { return  1.0 * (unsigned int)_formatContext->start_time / AV_TIME_BASE; }
-	double getDuration() const { return 1.0 * _formatContext->duration / AV_TIME_BASE; }
-	size_t getBitRate() const { return _formatContext->bit_rate; }
-	size_t getPacketSize() const { return _formatContext->packet_size; }
+	size_t getProgramsCount() const;
+	double getStartTime() const;
+	double getDuration() const;
+	size_t getBitRate() const;
+	size_t getPacketSize() const;
 
 	MetadatasMap& getMetadatas() { return _metadatas; }
 
-	size_t getNbStreams() const { return _formatContext->nb_streams; }
+	size_t getNbStreams() const;
 	size_t getNbVideoStreams() const { return _videoStreams.size(); }
 	size_t getNbAudioStreams() const { return _audioStreams.size(); }
 	size_t getNbDataStreams() const { return _dataStreams.size(); }
