From 01e578e7e3fafc63f630197d5f81904c76b84003 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Wed, 3 Dec 2014 14:43:17 +0100 Subject: [PATCH 1/5] mediaProperty: skip unnecessary functions for SWIG --- src/AvTranscoder/mediaProperty/AttachementProperties.hpp | 2 ++ src/AvTranscoder/mediaProperty/AudioProperties.hpp | 2 ++ src/AvTranscoder/mediaProperty/DataProperties.hpp | 2 ++ src/AvTranscoder/mediaProperty/FileProperties.hpp | 2 ++ src/AvTranscoder/mediaProperty/SubtitleProperties.hpp | 2 ++ src/AvTranscoder/mediaProperty/UnknownProperties.hpp | 2 ++ src/AvTranscoder/mediaProperty/VideoProperties.hpp | 2 ++ 7 files changed, 14 insertions(+) diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.hpp b/src/AvTranscoder/mediaProperty/AttachementProperties.hpp index 9e5755ef..6b7791f2 100644 --- a/src/AvTranscoder/mediaProperty/AttachementProperties.hpp +++ b/src/AvTranscoder/mediaProperty/AttachementProperties.hpp @@ -19,7 +19,9 @@ class AvExport AttachementProperties size_t getStreamId() const { return _streamId; } MetadatasMap& getMetadatas() { return _metadatas; } +#ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } +#endif MetadatasMap getDataMap() const; diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp index bc2165f3..9740dfe7 100644 --- a/src/AvTranscoder/mediaProperty/AudioProperties.hpp +++ b/src/AvTranscoder/mediaProperty/AudioProperties.hpp @@ -35,8 +35,10 @@ class AvExport AudioProperties size_t getBitRate() const { return _codecContext->bit_rate; } MetadatasMap& getMetadatas() { return _metadatas; } +#ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } AVCodecContext& getAVCodecContext() { return *_codecContext; } +#endif MetadatasMap getDataMap() const; diff --git a/src/AvTranscoder/mediaProperty/DataProperties.hpp b/src/AvTranscoder/mediaProperty/DataProperties.hpp index 658f84a6..0deb37ac 100644 --- a/src/AvTranscoder/mediaProperty/DataProperties.hpp +++ b/src/AvTranscoder/mediaProperty/DataProperties.hpp @@ -19,7 +19,9 @@ class AvExport DataProperties size_t getStreamId() const { return _streamId; } MetadatasMap& getMetadatas() { return _metadatas; } +#ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } +#endif MetadatasMap getDataMap() const; diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp index 4e87b51f..4c7cc078 100644 --- a/src/AvTranscoder/mediaProperty/FileProperties.hpp +++ b/src/AvTranscoder/mediaProperty/FileProperties.hpp @@ -58,7 +58,9 @@ class AvExport FileProperties std::vector< avtranscoder::UnknownProperties >& getUnknownPropertiesProperties() { return _unknownStreams; } const std::vector< avtranscoder::UnknownProperties >& getUnknownPropertiesProperties() const { return _unknownStreams; } +#ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } +#endif MetadatasMap getDataMap() const; diff --git a/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp b/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp index b08f69c8..49a3c565 100644 --- a/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp +++ b/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp @@ -19,7 +19,9 @@ class AvExport SubtitleProperties size_t getStreamId() const { return _streamId; } MetadatasMap& getMetadatas() { return _metadatas; } +#ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } +#endif MetadatasMap getDataMap() const; diff --git a/src/AvTranscoder/mediaProperty/UnknownProperties.hpp b/src/AvTranscoder/mediaProperty/UnknownProperties.hpp index 3e07a357..05fe457f 100644 --- a/src/AvTranscoder/mediaProperty/UnknownProperties.hpp +++ b/src/AvTranscoder/mediaProperty/UnknownProperties.hpp @@ -19,7 +19,9 @@ class AvExport UnknownProperties size_t getStreamId() const { return _streamId; } MetadatasMap& getMetadatas() { return _metadatas; } +#ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } +#endif MetadatasMap getDataMap() const; diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp index f5143d45..ba95dd22 100644 --- a/src/AvTranscoder/mediaProperty/VideoProperties.hpp +++ b/src/AvTranscoder/mediaProperty/VideoProperties.hpp @@ -93,9 +93,11 @@ class AvExport VideoProperties MetadatasMap& getMetadatas() { return _metadatas; } +#ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } AVCodecContext& getAVCodecContext() { return *_codecContext; } const AVPixFmtDescriptor& getAVPixFmtDescriptor() { return *_pixFmt; } +#endif MetadatasMap getDataMap() const; ///< Warning: the method calls analyseGopStructure, which can modify state of the object From 9c432e8d3da8cf00f4210bebc22da729967fb68a Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Wed, 3 Dec 2014 14:59:44 +0100 Subject: [PATCH 2/5] mediaProperty: check if access of properties is possible Throw exception if it's not possible and we can't return any value. --- .../mediaProperty/AudioProperties.cpp | 30 +++++++++ .../mediaProperty/AudioProperties.hpp | 8 +-- .../mediaProperty/FileProperties.cpp | 64 +++++++++++++++++++ .../mediaProperty/FileProperties.hpp | 18 +++--- 4 files changed, 107 insertions(+), 13 deletions(-) diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp index 751183d9..b00d7a95 100644 --- a/src/AvTranscoder/mediaProperty/AudioProperties.cpp +++ b/src/AvTranscoder/mediaProperty/AudioProperties.cpp @@ -1,5 +1,7 @@ #include "AudioProperties.hpp" +#include + extern "C" { #include #include @@ -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 index 9740dfe7..036b8e94 100644 --- 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 index 4636ca91..60400982 100644 --- a/src/AvTranscoder/mediaProperty/FileProperties.cpp +++ b/src/AvTranscoder/mediaProperty/FileProperties.cpp @@ -1,5 +1,7 @@ #include "FileProperties.hpp" +#include + 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 index 4c7cc078..5e5dec7c 100644 --- 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(); } From ec7852c045ab67440ab1478dc0df414ae1a5c22f Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Wed, 3 Dec 2014 14:59:59 +0100 Subject: [PATCH 3/5] VideoProperties: clean --- .../mediaProperty/VideoProperties.cpp | 24 ------------------- .../mediaProperty/VideoProperties.hpp | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp index 84f04a4e..5408e55c 100644 --- a/src/AvTranscoder/mediaProperty/VideoProperties.cpp +++ b/src/AvTranscoder/mediaProperty/VideoProperties.cpp @@ -7,9 +7,7 @@ extern "C" { } #include -#include #include -#include #ifdef _MSC_VER #include @@ -331,7 +329,6 @@ int64_t VideoProperties::getStartTimecode() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->timecode_frame_start; } @@ -395,7 +392,6 @@ size_t VideoProperties::getCodecId() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->codec_id; } @@ -403,7 +399,6 @@ size_t VideoProperties::getBitRate() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->bit_rate; } @@ -411,7 +406,6 @@ size_t VideoProperties::getMaxBitRate() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->rc_max_rate; } @@ -419,7 +413,6 @@ size_t VideoProperties::getMinBitRate() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->rc_min_rate; } @@ -427,7 +420,6 @@ size_t VideoProperties::getTicksPerFrame() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->ticks_per_frame; } @@ -435,7 +427,6 @@ size_t VideoProperties::getWidth() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->width; } @@ -443,7 +434,6 @@ size_t VideoProperties::getHeight() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->height; } @@ -451,7 +441,6 @@ size_t VideoProperties::getGopSize() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->gop_size; } @@ -459,7 +448,6 @@ size_t VideoProperties::getDtgActiveFormat() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->dtg_active_format; } @@ -467,7 +455,6 @@ size_t VideoProperties::getReferencesFrames() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->refs; } @@ -475,7 +462,6 @@ int VideoProperties::getProfile() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->profile; } @@ -483,7 +469,6 @@ int VideoProperties::getLevel() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return _codecContext->level; } @@ -491,7 +476,6 @@ size_t VideoProperties::getComponentsCount() const { if( ! _pixFmt ) throw std::runtime_error( "unknown pixel format" ); - return _pixFmt->nb_components; } @@ -499,7 +483,6 @@ size_t VideoProperties::getChromaWidth() const { if( ! _pixFmt ) throw std::runtime_error( "unknown pixel format" ); - return _pixFmt->log2_chroma_w; } @@ -507,7 +490,6 @@ size_t VideoProperties::getChromaHeight() const { if( ! _pixFmt ) throw std::runtime_error( "unknown pixel format" ); - return _pixFmt->log2_chroma_h; } @@ -524,7 +506,6 @@ bool VideoProperties::hasBFrames() const { if( ! _codecContext ) throw std::runtime_error( "unknown codec context" ); - return (bool) _codecContext->has_b_frames; } @@ -532,7 +513,6 @@ bool VideoProperties::isIndexedColors() const { if( ! _pixFmt ) throw std::runtime_error( "unknown pixel format" ); - return (bool) _pixFmt->flags & PIX_FMT_PAL; } @@ -540,7 +520,6 @@ bool VideoProperties::isBitWisePacked() const { if( ! _pixFmt ) throw std::runtime_error( "unknown pixel format" ); - return (bool) _pixFmt->flags & PIX_FMT_BITSTREAM; } @@ -548,7 +527,6 @@ bool VideoProperties::isHardwareAccelerated() const { if( ! _pixFmt ) throw std::runtime_error( "unknown pixel format" ); - return (bool) _pixFmt->flags & PIX_FMT_HWACCEL; } @@ -556,7 +534,6 @@ bool VideoProperties::isPlanar() const { if( ! _pixFmt ) throw std::runtime_error( "unknown pixel format" ); - return (bool) _pixFmt->flags & PIX_FMT_PLANAR; } @@ -564,7 +541,6 @@ bool VideoProperties::isRgbPixelData() const { if( ! _pixFmt ) throw std::runtime_error( "unknown pixel format" ); - return (bool) _pixFmt->flags & PIX_FMT_RGB; } diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp index ba95dd22..3c7da89e 100644 --- a/src/AvTranscoder/mediaProperty/VideoProperties.hpp +++ b/src/AvTranscoder/mediaProperty/VideoProperties.hpp @@ -99,7 +99,7 @@ class AvExport VideoProperties const AVPixFmtDescriptor& getAVPixFmtDescriptor() { return *_pixFmt; } #endif - MetadatasMap getDataMap() const; ///< Warning: the method calls analyseGopStructure, which can modify state of the object + MetadatasMap getDataMap() const; private: /** From 8d48d710389cac70d25cdef629c5897e0515c8f5 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Wed, 3 Dec 2014 15:26:11 +0100 Subject: [PATCH 4/5] mediaProperty: rename type MetadatasMap to PropertiesMap This type is not only used for metadatas, so the new name avoid confusion. --- src/AvTranscoder/file/OutputFile.cpp | 4 +-- src/AvTranscoder/file/OutputFile.hpp | 2 +- .../mediaProperty/AttachementProperties.cpp | 4 +-- .../mediaProperty/AttachementProperties.hpp | 6 ++-- .../mediaProperty/AudioProperties.cpp | 4 +-- .../mediaProperty/AudioProperties.hpp | 6 ++-- .../mediaProperty/DataProperties.cpp | 4 +-- .../mediaProperty/DataProperties.hpp | 6 ++-- .../mediaProperty/FileProperties.cpp | 4 +-- .../mediaProperty/FileProperties.hpp | 6 ++-- .../mediaProperty/SubtitleProperties.cpp | 4 +-- .../mediaProperty/SubtitleProperties.hpp | 6 ++-- .../mediaProperty/UnknownProperties.cpp | 4 +-- .../mediaProperty/UnknownProperties.hpp | 6 ++-- .../mediaProperty/VideoProperties.cpp | 4 +-- .../mediaProperty/VideoProperties.hpp | 6 ++-- .../mediaProperty/mediaProperty.i | 4 +-- src/AvTranscoder/mediaProperty/print.hpp | 30 +++++++++---------- src/AvTranscoder/mediaProperty/util.cpp | 10 +++---- src/AvTranscoder/mediaProperty/util.hpp | 14 ++++----- 20 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp index 617c1867..ed49db83 100644 --- a/src/AvTranscoder/file/OutputFile.cpp +++ b/src/AvTranscoder/file/OutputFile.cpp @@ -216,9 +216,9 @@ bool OutputFile::endWrap( ) return true; } -void OutputFile::addMetadata( const MetadatasMap& dataMap ) +void OutputFile::addMetadata( const PropertiesMap& dataMap ) { - for( MetadatasMap::const_iterator it = dataMap.begin(); it != dataMap.end(); ++it ) + for( PropertiesMap::const_iterator it = dataMap.begin(); it != dataMap.end(); ++it ) { addMetadata( it->first, it->second ); } diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp index 52163e4c..97b2ab41 100644 --- a/src/AvTranscoder/file/OutputFile.hpp +++ b/src/AvTranscoder/file/OutputFile.hpp @@ -104,7 +104,7 @@ class AvExport OutputFile * @brief Add metadata to the output file. * @note Depending on the format, you are not sure to find your metadata after the transcode. */ - virtual void addMetadata( const MetadatasMap& dataMap ); + virtual void addMetadata( const PropertiesMap& dataMap ); virtual void addMetadata( const std::string& key, const std::string& value ); virtual void setVerbose( bool verbose = false ){ _verbose = verbose; } diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.cpp b/src/AvTranscoder/mediaProperty/AttachementProperties.cpp index 0250d986..e150c90e 100644 --- a/src/AvTranscoder/mediaProperty/AttachementProperties.cpp +++ b/src/AvTranscoder/mediaProperty/AttachementProperties.cpp @@ -11,9 +11,9 @@ AttachementProperties::AttachementProperties( const AVFormatContext* formatConte detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas ); } -MetadatasMap AttachementProperties::getDataMap() const +PropertiesMap AttachementProperties::getDataMap() const { - MetadatasMap dataMap; + PropertiesMap dataMap; detail::add( dataMap, "streamId", _streamId ); diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.hpp b/src/AvTranscoder/mediaProperty/AttachementProperties.hpp index 6b7791f2..c1d09264 100644 --- a/src/AvTranscoder/mediaProperty/AttachementProperties.hpp +++ b/src/AvTranscoder/mediaProperty/AttachementProperties.hpp @@ -17,19 +17,19 @@ class AvExport AttachementProperties AttachementProperties( const AVFormatContext* formatContext, const size_t index ); size_t getStreamId() const { return _streamId; } - MetadatasMap& getMetadatas() { return _metadatas; } + PropertiesMap& getMetadatas() { return _metadatas; } #ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } #endif - MetadatasMap getDataMap() const; + PropertiesMap getDataMap() const; private: const AVFormatContext* _formatContext; ///< Has link (no ownership) size_t _streamId; - MetadatasMap _metadatas; + PropertiesMap _metadatas; }; } diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp index b00d7a95..0fc43d2b 100644 --- a/src/AvTranscoder/mediaProperty/AudioProperties.cpp +++ b/src/AvTranscoder/mediaProperty/AudioProperties.cpp @@ -154,9 +154,9 @@ size_t AudioProperties::getBitRate() const return _codecContext->bit_rate; } -MetadatasMap AudioProperties::getDataMap() const +PropertiesMap AudioProperties::getDataMap() const { - MetadatasMap dataMap; + PropertiesMap dataMap; detail::add( dataMap, "streamId", getStreamId() ); detail::add( dataMap, "codecId", getCodecId() ); diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp index 036b8e94..f003a607 100644 --- a/src/AvTranscoder/mediaProperty/AudioProperties.hpp +++ b/src/AvTranscoder/mediaProperty/AudioProperties.hpp @@ -33,14 +33,14 @@ class AvExport AudioProperties size_t getSampleRate() const; size_t getChannels() const; size_t getBitRate() const; - MetadatasMap& getMetadatas() { return _metadatas; } + PropertiesMap& getMetadatas() { return _metadatas; } #ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } AVCodecContext& getAVCodecContext() { return *_codecContext; } #endif - MetadatasMap getDataMap() const; + PropertiesMap getDataMap() const; private: const AVFormatContext* _formatContext; ///< Has link (no ownership) @@ -48,7 +48,7 @@ class AvExport AudioProperties AVCodec* _codec; ///< Has link (no ownership) size_t _streamId; - MetadatasMap _metadatas; + PropertiesMap _metadatas; }; } diff --git a/src/AvTranscoder/mediaProperty/DataProperties.cpp b/src/AvTranscoder/mediaProperty/DataProperties.cpp index 6043c44f..ba294125 100644 --- a/src/AvTranscoder/mediaProperty/DataProperties.cpp +++ b/src/AvTranscoder/mediaProperty/DataProperties.cpp @@ -22,9 +22,9 @@ DataProperties::DataProperties( const AVFormatContext* formatContext, const size detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas ); } -MetadatasMap DataProperties::getDataMap() const +PropertiesMap DataProperties::getDataMap() const { - MetadatasMap dataMap; + PropertiesMap dataMap; detail::add( dataMap, "streamId", _streamId ); diff --git a/src/AvTranscoder/mediaProperty/DataProperties.hpp b/src/AvTranscoder/mediaProperty/DataProperties.hpp index 0deb37ac..e11df6db 100644 --- a/src/AvTranscoder/mediaProperty/DataProperties.hpp +++ b/src/AvTranscoder/mediaProperty/DataProperties.hpp @@ -17,13 +17,13 @@ class AvExport DataProperties DataProperties( const AVFormatContext* formatContext, const size_t index ); size_t getStreamId() const { return _streamId; } - MetadatasMap& getMetadatas() { return _metadatas; } + PropertiesMap& getMetadatas() { return _metadatas; } #ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } #endif - MetadatasMap getDataMap() const; + PropertiesMap getDataMap() const; private: void detectAncillaryData(); @@ -32,7 +32,7 @@ class AvExport DataProperties const AVFormatContext* _formatContext; ///< Has link (no ownership) size_t _streamId; - MetadatasMap _metadatas; + PropertiesMap _metadatas; }; } diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp index 60400982..1132ecae 100644 --- a/src/AvTranscoder/mediaProperty/FileProperties.cpp +++ b/src/AvTranscoder/mediaProperty/FileProperties.cpp @@ -81,9 +81,9 @@ size_t FileProperties::getNbStreams() const return _formatContext->nb_streams; } -MetadatasMap FileProperties::getDataMap() const +PropertiesMap FileProperties::getDataMap() const { - MetadatasMap dataMap; + PropertiesMap dataMap; detail::add( dataMap, "filename", getFilename() ); detail::add( dataMap, "formatName", getFormatName() ); diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp index 5e5dec7c..b05a0195 100644 --- a/src/AvTranscoder/mediaProperty/FileProperties.hpp +++ b/src/AvTranscoder/mediaProperty/FileProperties.hpp @@ -35,7 +35,7 @@ class AvExport FileProperties size_t getBitRate() const; size_t getPacketSize() const; - MetadatasMap& getMetadatas() { return _metadatas; } + PropertiesMap& getMetadatas() { return _metadatas; } size_t getNbStreams() const; size_t getNbVideoStreams() const { return _videoStreams.size(); } @@ -62,7 +62,7 @@ class AvExport FileProperties const AVFormatContext& getAVFormatContext() { return *_formatContext; } #endif - MetadatasMap getDataMap() const; + PropertiesMap getDataMap() const; private: const AVFormatContext* _formatContext; ///< Has link (no ownership) @@ -74,7 +74,7 @@ class AvExport FileProperties std::vector< AttachementProperties > _attachementStreams; ///< Array of properties per attachement stream std::vector< UnknownProperties > _unknownStreams; ///< Array of properties per unknown stream - MetadatasMap _metadatas; + PropertiesMap _metadatas; }; } diff --git a/src/AvTranscoder/mediaProperty/SubtitleProperties.cpp b/src/AvTranscoder/mediaProperty/SubtitleProperties.cpp index 8dd124ca..3d2a202a 100644 --- a/src/AvTranscoder/mediaProperty/SubtitleProperties.cpp +++ b/src/AvTranscoder/mediaProperty/SubtitleProperties.cpp @@ -11,9 +11,9 @@ SubtitleProperties::SubtitleProperties( const AVFormatContext* formatContext, co detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas ); } -MetadatasMap SubtitleProperties::getDataMap() const +PropertiesMap SubtitleProperties::getDataMap() const { - MetadatasMap dataMap; + PropertiesMap dataMap; detail::add( dataMap, "streamId", _streamId ); diff --git a/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp b/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp index 49a3c565..2569a6f9 100644 --- a/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp +++ b/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp @@ -17,19 +17,19 @@ class AvExport SubtitleProperties SubtitleProperties( const AVFormatContext* formatContext, const size_t index ); size_t getStreamId() const { return _streamId; } - MetadatasMap& getMetadatas() { return _metadatas; } + PropertiesMap& getMetadatas() { return _metadatas; } #ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } #endif - MetadatasMap getDataMap() const; + PropertiesMap getDataMap() const; private: const AVFormatContext* _formatContext; ///< Has link (no ownership) size_t _streamId; - MetadatasMap _metadatas; + PropertiesMap _metadatas; }; } diff --git a/src/AvTranscoder/mediaProperty/UnknownProperties.cpp b/src/AvTranscoder/mediaProperty/UnknownProperties.cpp index 386838a3..75663656 100644 --- a/src/AvTranscoder/mediaProperty/UnknownProperties.cpp +++ b/src/AvTranscoder/mediaProperty/UnknownProperties.cpp @@ -11,9 +11,9 @@ UnknownProperties::UnknownProperties( const AVFormatContext* formatContext, cons detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas ); } -MetadatasMap UnknownProperties::getDataMap() const +PropertiesMap UnknownProperties::getDataMap() const { - MetadatasMap dataMap; + PropertiesMap dataMap; detail::add( dataMap, "streamId", _streamId ); diff --git a/src/AvTranscoder/mediaProperty/UnknownProperties.hpp b/src/AvTranscoder/mediaProperty/UnknownProperties.hpp index 05fe457f..340eaa0c 100644 --- a/src/AvTranscoder/mediaProperty/UnknownProperties.hpp +++ b/src/AvTranscoder/mediaProperty/UnknownProperties.hpp @@ -17,19 +17,19 @@ class AvExport UnknownProperties UnknownProperties( const AVFormatContext* formatContext, const size_t index ); size_t getStreamId() const { return _streamId; } - MetadatasMap& getMetadatas() { return _metadatas; } + PropertiesMap& getMetadatas() { return _metadatas; } #ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } #endif - MetadatasMap getDataMap() const; + PropertiesMap getDataMap() const; private: const AVFormatContext* _formatContext; ///< Has link (no ownership) size_t _streamId; - MetadatasMap _metadatas; + PropertiesMap _metadatas; }; } diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp index 5408e55c..b996ba5f 100644 --- a/src/AvTranscoder/mediaProperty/VideoProperties.cpp +++ b/src/AvTranscoder/mediaProperty/VideoProperties.cpp @@ -648,9 +648,9 @@ std::vector VideoProperties::getChannels() const return channels; } -MetadatasMap VideoProperties::getDataMap() const +PropertiesMap VideoProperties::getDataMap() const { - MetadatasMap dataMap; + PropertiesMap dataMap; detail::add( dataMap, "streamId", getStreamId() ); detail::add( dataMap, "codecId", getCodecId() ); diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp index 3c7da89e..3e57c4ae 100644 --- a/src/AvTranscoder/mediaProperty/VideoProperties.hpp +++ b/src/AvTranscoder/mediaProperty/VideoProperties.hpp @@ -91,7 +91,7 @@ class AvExport VideoProperties std::vector getChannels() const; - MetadatasMap& getMetadatas() { return _metadatas; } + PropertiesMap& getMetadatas() { return _metadatas; } #ifndef SWIG const AVFormatContext& getAVFormatContext() { return *_formatContext; } @@ -99,7 +99,7 @@ class AvExport VideoProperties const AVPixFmtDescriptor& getAVPixFmtDescriptor() { return *_pixFmt; } #endif - MetadatasMap getDataMap() const; + PropertiesMap getDataMap() const; private: /** @@ -121,7 +121,7 @@ class AvExport VideoProperties bool _isTopFieldFirst; std::vector< std::pair< char, bool > > _gopStructure; //@} - MetadatasMap _metadatas; + PropertiesMap _metadatas; }; } diff --git a/src/AvTranscoder/mediaProperty/mediaProperty.i b/src/AvTranscoder/mediaProperty/mediaProperty.i index 2d6fa5fd..502c3579 100644 --- a/src/AvTranscoder/mediaProperty/mediaProperty.i +++ b/src/AvTranscoder/mediaProperty/mediaProperty.i @@ -34,8 +34,8 @@ namespace std { %template(AttachementVector) vector< avtranscoder::AttachementProperties >; %template(UnknownVector) vector< avtranscoder::UnknownProperties >; -%template(MetadataPair) pair< string, string >; -%template(MetadatasVector) vector< pair< string, string > >; +%template(PropertyPair) pair< string, string >; +%template(PropertyVector) vector< pair< string, string > >; %template(GopPair) pair< char, bool >; %template(GopVector) vector< pair< char, bool > >; diff --git a/src/AvTranscoder/mediaProperty/print.hpp b/src/AvTranscoder/mediaProperty/print.hpp index 92ce2561..724ad7b9 100644 --- a/src/AvTranscoder/mediaProperty/print.hpp +++ b/src/AvTranscoder/mediaProperty/print.hpp @@ -14,13 +14,13 @@ namespace avtranscoder static const size_t keyWidth = 32; static const std::string separator = "===================="; -std::ostream& operator<<( std::ostream& flux, const FileProperties& properties ) +std::ostream& operator<<( std::ostream& flux, const FileProperties& fileProperties ) { flux << std::left; flux << separator << " Wrapper " << separator << std::endl; - MetadatasMap dataMap = properties.getDataMap(); - for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it ) + PropertiesMap properties = fileProperties.getDataMap(); + for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; } @@ -33,8 +33,8 @@ std::ostream& operator<<( std::ostream& flux, const VideoProperties& videoProper flux << std::left; flux << separator << " Video stream " << separator << std::endl; - MetadatasMap dataMap = videoProperties.getDataMap(); - for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it ) + PropertiesMap properties = videoProperties.getDataMap(); + for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; } @@ -47,8 +47,8 @@ std::ostream& operator<<( std::ostream& flux, const AudioProperties& audioProper flux << std::left; flux << separator << " Audio stream " << separator << std::endl; - MetadatasMap dataMap = audioProperties.getDataMap(); - for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it ) + PropertiesMap properties = audioProperties.getDataMap(); + for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; } @@ -60,8 +60,8 @@ std::ostream& operator<<( std::ostream& flux, const DataProperties& dataProperti { flux << separator << " Data stream " << separator << std::endl; - MetadatasMap dataMap = dataProperties.getDataMap(); - for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it ) + PropertiesMap properties = dataProperties.getDataMap(); + for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; } @@ -73,8 +73,8 @@ std::ostream& operator<<( std::ostream& flux, const SubtitleProperties& subtitle { flux << separator << " Subtitle stream " << separator << std::endl; - MetadatasMap dataMap = subtitleProperties.getDataMap(); - for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it ) + PropertiesMap properties = subtitleProperties.getDataMap(); + for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; } @@ -86,8 +86,8 @@ std::ostream& operator<<( std::ostream& flux, const AttachementProperties& attac { flux << separator << " Attachement stream " << separator << std::endl; - MetadatasMap dataMap = attachementProperties.getDataMap(); - for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it ) + PropertiesMap properties = attachementProperties.getDataMap(); + for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; } @@ -99,8 +99,8 @@ std::ostream& operator<<( std::ostream& flux, const UnknownProperties& unknownPr { flux << separator << " Unknown stream " << separator << std::endl; - MetadatasMap dataMap = unknownProperties.getDataMap(); - for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it ) + PropertiesMap properties = unknownProperties.getDataMap(); + for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; } diff --git a/src/AvTranscoder/mediaProperty/util.cpp b/src/AvTranscoder/mediaProperty/util.cpp index 6b4ab4dc..8aff1a47 100644 --- a/src/AvTranscoder/mediaProperty/util.cpp +++ b/src/AvTranscoder/mediaProperty/util.cpp @@ -11,18 +11,18 @@ namespace detail { template<> -void add( MetadatasMap& dataMap, const std::string& key, const std::string& value ) +void add( PropertiesMap& propertiesMap, const std::string& key, const std::string& value ) { - dataMap.push_back( std::make_pair( key, value ) ); + propertiesMap.push_back( std::make_pair( key, value ) ); } template<> -void add( MetadatasMap& dataMap, const std::string& key, const bool& value ) +void add( PropertiesMap& propertiesMap, const std::string& key, const bool& value ) { - add( dataMap, key, value ? "True" : "False" ); + add( propertiesMap, key, value ? "True" : "False" ); } -void fillMetadataDictionnary( AVDictionary* avdictionnary, MetadatasMap& metadata ) +void fillMetadataDictionnary( AVDictionary* avdictionnary, PropertiesMap& metadata ) { AVDictionaryEntry* tag = NULL; while( ( tag = av_dict_get( avdictionnary, "", tag, AV_DICT_IGNORE_SUFFIX ) ) ) diff --git a/src/AvTranscoder/mediaProperty/util.hpp b/src/AvTranscoder/mediaProperty/util.hpp index 34e7e034..c63618c1 100644 --- a/src/AvTranscoder/mediaProperty/util.hpp +++ b/src/AvTranscoder/mediaProperty/util.hpp @@ -12,31 +12,31 @@ namespace avtranscoder { /** - * @brief Can get all data of Properties structures by getDataMap(), which return a MetadatasMap. + * @brief PropertyMap is a vector of pair, because the order of properties matters to us. */ -typedef std::vector< std::pair > MetadatasMap; +typedef std::vector< std::pair > PropertiesMap; namespace detail { template -void add( MetadatasMap& dataMap, const std::string& key, const T& value ) +void add( PropertiesMap& propertiesMap, const std::string& key, const T& value ) { std::stringstream ss; ss << value; - add( dataMap, key, ss.str() ); + add( propertiesMap, key, ss.str() ); } template<> -void add( MetadatasMap& dataMap, const std::string& key, const std::string& value ); +void add( PropertiesMap& propertiesMap, const std::string& key, const std::string& value ); template<> -void add( MetadatasMap& dataMap, const std::string& key, const bool& value ); +void add( PropertiesMap& propertiesMap, const std::string& key, const bool& value ); /** * @brief Fill metadata parameter with the given AVDictionary. */ -void AvExport fillMetadataDictionnary( AVDictionary* avdictionnary, MetadatasMap& metadata ); +void AvExport fillMetadataDictionnary( AVDictionary* avdictionnary, PropertiesMap& metadata ); } From 6f0532f9ec637538e7879a856dddafd18c39f828 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Wed, 3 Dec 2014 15:31:15 +0100 Subject: [PATCH 5/5] mediaProperty: rename getDataMap to getPropertiesAsMap --- .../mediaProperty/AttachementProperties.cpp | 2 +- .../mediaProperty/AttachementProperties.hpp | 2 +- src/AvTranscoder/mediaProperty/AudioProperties.cpp | 2 +- src/AvTranscoder/mediaProperty/AudioProperties.hpp | 2 +- src/AvTranscoder/mediaProperty/DataProperties.cpp | 2 +- src/AvTranscoder/mediaProperty/DataProperties.hpp | 2 +- src/AvTranscoder/mediaProperty/FileProperties.cpp | 2 +- src/AvTranscoder/mediaProperty/FileProperties.hpp | 2 +- .../mediaProperty/SubtitleProperties.cpp | 2 +- .../mediaProperty/SubtitleProperties.hpp | 2 +- .../mediaProperty/UnknownProperties.cpp | 2 +- .../mediaProperty/UnknownProperties.hpp | 2 +- src/AvTranscoder/mediaProperty/VideoProperties.cpp | 2 +- src/AvTranscoder/mediaProperty/VideoProperties.hpp | 3 +-- src/AvTranscoder/mediaProperty/print.hpp | 14 +++++++------- 15 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.cpp b/src/AvTranscoder/mediaProperty/AttachementProperties.cpp index e150c90e..3745b2da 100644 --- a/src/AvTranscoder/mediaProperty/AttachementProperties.cpp +++ b/src/AvTranscoder/mediaProperty/AttachementProperties.cpp @@ -11,7 +11,7 @@ AttachementProperties::AttachementProperties( const AVFormatContext* formatConte detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas ); } -PropertiesMap AttachementProperties::getDataMap() const +PropertiesMap AttachementProperties::getPropertiesAsMap() const { PropertiesMap dataMap; diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.hpp b/src/AvTranscoder/mediaProperty/AttachementProperties.hpp index c1d09264..3b63aca2 100644 --- a/src/AvTranscoder/mediaProperty/AttachementProperties.hpp +++ b/src/AvTranscoder/mediaProperty/AttachementProperties.hpp @@ -23,7 +23,7 @@ class AvExport AttachementProperties const AVFormatContext& getAVFormatContext() { return *_formatContext; } #endif - PropertiesMap getDataMap() const; + PropertiesMap getPropertiesAsMap() const; ///< Return all attachement properties as a map (name of property: value) private: const AVFormatContext* _formatContext; ///< Has link (no ownership) diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp index 0fc43d2b..83e83c57 100644 --- a/src/AvTranscoder/mediaProperty/AudioProperties.cpp +++ b/src/AvTranscoder/mediaProperty/AudioProperties.cpp @@ -154,7 +154,7 @@ size_t AudioProperties::getBitRate() const return _codecContext->bit_rate; } -PropertiesMap AudioProperties::getDataMap() const +PropertiesMap AudioProperties::getPropertiesAsMap() const { PropertiesMap dataMap; diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp index f003a607..7d209d55 100644 --- a/src/AvTranscoder/mediaProperty/AudioProperties.hpp +++ b/src/AvTranscoder/mediaProperty/AudioProperties.hpp @@ -40,7 +40,7 @@ class AvExport AudioProperties AVCodecContext& getAVCodecContext() { return *_codecContext; } #endif - PropertiesMap getDataMap() const; + PropertiesMap getPropertiesAsMap() const; ///< Return all audio properties as a map (name of property: value) private: const AVFormatContext* _formatContext; ///< Has link (no ownership) diff --git a/src/AvTranscoder/mediaProperty/DataProperties.cpp b/src/AvTranscoder/mediaProperty/DataProperties.cpp index ba294125..24f32578 100644 --- a/src/AvTranscoder/mediaProperty/DataProperties.cpp +++ b/src/AvTranscoder/mediaProperty/DataProperties.cpp @@ -22,7 +22,7 @@ DataProperties::DataProperties( const AVFormatContext* formatContext, const size detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas ); } -PropertiesMap DataProperties::getDataMap() const +PropertiesMap DataProperties::getPropertiesAsMap() const { PropertiesMap dataMap; diff --git a/src/AvTranscoder/mediaProperty/DataProperties.hpp b/src/AvTranscoder/mediaProperty/DataProperties.hpp index e11df6db..337f7ad9 100644 --- a/src/AvTranscoder/mediaProperty/DataProperties.hpp +++ b/src/AvTranscoder/mediaProperty/DataProperties.hpp @@ -23,7 +23,7 @@ class AvExport DataProperties const AVFormatContext& getAVFormatContext() { return *_formatContext; } #endif - PropertiesMap getDataMap() const; + PropertiesMap getPropertiesAsMap() const; ///< Return all data properties as a map (name of property: value) private: void detectAncillaryData(); diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp index 1132ecae..39221883 100644 --- a/src/AvTranscoder/mediaProperty/FileProperties.cpp +++ b/src/AvTranscoder/mediaProperty/FileProperties.cpp @@ -81,7 +81,7 @@ size_t FileProperties::getNbStreams() const return _formatContext->nb_streams; } -PropertiesMap FileProperties::getDataMap() const +PropertiesMap FileProperties::getPropertiesAsMap() const { PropertiesMap dataMap; diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp index b05a0195..70708ca5 100644 --- a/src/AvTranscoder/mediaProperty/FileProperties.hpp +++ b/src/AvTranscoder/mediaProperty/FileProperties.hpp @@ -62,7 +62,7 @@ class AvExport FileProperties const AVFormatContext& getAVFormatContext() { return *_formatContext; } #endif - PropertiesMap getDataMap() const; + PropertiesMap getPropertiesAsMap() const; ///< Return all file properties as a map (name of property: value) private: const AVFormatContext* _formatContext; ///< Has link (no ownership) diff --git a/src/AvTranscoder/mediaProperty/SubtitleProperties.cpp b/src/AvTranscoder/mediaProperty/SubtitleProperties.cpp index 3d2a202a..28dcb324 100644 --- a/src/AvTranscoder/mediaProperty/SubtitleProperties.cpp +++ b/src/AvTranscoder/mediaProperty/SubtitleProperties.cpp @@ -11,7 +11,7 @@ SubtitleProperties::SubtitleProperties( const AVFormatContext* formatContext, co detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas ); } -PropertiesMap SubtitleProperties::getDataMap() const +PropertiesMap SubtitleProperties::getPropertiesAsMap() const { PropertiesMap dataMap; diff --git a/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp b/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp index 2569a6f9..b0430e86 100644 --- a/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp +++ b/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp @@ -23,7 +23,7 @@ class AvExport SubtitleProperties const AVFormatContext& getAVFormatContext() { return *_formatContext; } #endif - PropertiesMap getDataMap() const; + PropertiesMap getPropertiesAsMap() const; ///< Return all subtitle properties as a map (name of property: value) private: const AVFormatContext* _formatContext; ///< Has link (no ownership) diff --git a/src/AvTranscoder/mediaProperty/UnknownProperties.cpp b/src/AvTranscoder/mediaProperty/UnknownProperties.cpp index 75663656..14d449e3 100644 --- a/src/AvTranscoder/mediaProperty/UnknownProperties.cpp +++ b/src/AvTranscoder/mediaProperty/UnknownProperties.cpp @@ -11,7 +11,7 @@ UnknownProperties::UnknownProperties( const AVFormatContext* formatContext, cons detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas ); } -PropertiesMap UnknownProperties::getDataMap() const +PropertiesMap UnknownProperties::getPropertiesAsMap() const { PropertiesMap dataMap; diff --git a/src/AvTranscoder/mediaProperty/UnknownProperties.hpp b/src/AvTranscoder/mediaProperty/UnknownProperties.hpp index 340eaa0c..ebb42717 100644 --- a/src/AvTranscoder/mediaProperty/UnknownProperties.hpp +++ b/src/AvTranscoder/mediaProperty/UnknownProperties.hpp @@ -23,7 +23,7 @@ class AvExport UnknownProperties const AVFormatContext& getAVFormatContext() { return *_formatContext; } #endif - PropertiesMap getDataMap() const; + PropertiesMap getPropertiesAsMap() const; ///< Return unknown properties as a map (name of property: value) private: const AVFormatContext* _formatContext; ///< Has link (no ownership) diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp index b996ba5f..0ea701d2 100644 --- a/src/AvTranscoder/mediaProperty/VideoProperties.cpp +++ b/src/AvTranscoder/mediaProperty/VideoProperties.cpp @@ -648,7 +648,7 @@ std::vector VideoProperties::getChannels() const return channels; } -PropertiesMap VideoProperties::getDataMap() const +PropertiesMap VideoProperties::getPropertiesAsMap() const { PropertiesMap dataMap; diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp index 3e57c4ae..f38322b9 100644 --- a/src/AvTranscoder/mediaProperty/VideoProperties.hpp +++ b/src/AvTranscoder/mediaProperty/VideoProperties.hpp @@ -81,7 +81,6 @@ class AvExport VideoProperties //@{ // Warning: Can acces these data when analyse first gop - // Construct the VideoProperties with level = eAnalyseLevelFull // @see EAnalyseLevel // @see analyseGopStructure bool isInterlaced() const { return _isInterlaced; } @@ -99,7 +98,7 @@ class AvExport VideoProperties const AVPixFmtDescriptor& getAVPixFmtDescriptor() { return *_pixFmt; } #endif - PropertiesMap getDataMap() const; + PropertiesMap getPropertiesAsMap() const; ///< Return all video properties as a map (name of property: value) private: /** diff --git a/src/AvTranscoder/mediaProperty/print.hpp b/src/AvTranscoder/mediaProperty/print.hpp index 724ad7b9..f9c96324 100644 --- a/src/AvTranscoder/mediaProperty/print.hpp +++ b/src/AvTranscoder/mediaProperty/print.hpp @@ -19,7 +19,7 @@ std::ostream& operator<<( std::ostream& flux, const FileProperties& fileProperti flux << std::left; flux << separator << " Wrapper " << separator << std::endl; - PropertiesMap properties = fileProperties.getDataMap(); + PropertiesMap properties = fileProperties.getPropertiesAsMap(); for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; @@ -33,7 +33,7 @@ std::ostream& operator<<( std::ostream& flux, const VideoProperties& videoProper flux << std::left; flux << separator << " Video stream " << separator << std::endl; - PropertiesMap properties = videoProperties.getDataMap(); + PropertiesMap properties = videoProperties.getPropertiesAsMap(); for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; @@ -47,7 +47,7 @@ std::ostream& operator<<( std::ostream& flux, const AudioProperties& audioProper flux << std::left; flux << separator << " Audio stream " << separator << std::endl; - PropertiesMap properties = audioProperties.getDataMap(); + PropertiesMap properties = audioProperties.getPropertiesAsMap(); for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; @@ -60,7 +60,7 @@ std::ostream& operator<<( std::ostream& flux, const DataProperties& dataProperti { flux << separator << " Data stream " << separator << std::endl; - PropertiesMap properties = dataProperties.getDataMap(); + PropertiesMap properties = dataProperties.getPropertiesAsMap(); for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; @@ -73,7 +73,7 @@ std::ostream& operator<<( std::ostream& flux, const SubtitleProperties& subtitle { flux << separator << " Subtitle stream " << separator << std::endl; - PropertiesMap properties = subtitleProperties.getDataMap(); + PropertiesMap properties = subtitleProperties.getPropertiesAsMap(); for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; @@ -86,7 +86,7 @@ std::ostream& operator<<( std::ostream& flux, const AttachementProperties& attac { flux << separator << " Attachement stream " << separator << std::endl; - PropertiesMap properties = attachementProperties.getDataMap(); + PropertiesMap properties = attachementProperties.getPropertiesAsMap(); for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl; @@ -99,7 +99,7 @@ std::ostream& operator<<( std::ostream& flux, const UnknownProperties& unknownPr { flux << separator << " Unknown stream " << separator << std::endl; - PropertiesMap properties = unknownProperties.getDataMap(); + PropertiesMap properties = unknownProperties.getPropertiesAsMap(); for( PropertiesMap::iterator it = properties.begin(); it != properties.end(); ++it ) { flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;