InputStream: add getProperties method

Clement Champetier · Clement Champetier · commit 88af4f68382e · 2015-10-30T12:05:38.000+01:00
diff --git a/src/AvTranscoder/stream/IInputStream.hpp b/src/AvTranscoder/stream/IInputStream.hpp
@@ -1,9 +1,12 @@
 #ifndef _AV_TRANSCODER_CODED_STREAM_I_INPUT_STREAM_HPP_
 #define _AV_TRANSCODER_CODED_STREAM_I_INPUT_STREAM_HPP_
 
+#include <AvTranscoder/mediaProperty/StreamProperties.hpp>
+
 #include <AvTranscoder/codec/AudioCodec.hpp>
 #include <AvTranscoder/codec/VideoCodec.hpp>
 #include <AvTranscoder/codec/DataCodec.hpp>
+
 #include <AvTranscoder/frame/Frame.hpp>
 
 namespace avtranscoder
@@ -21,6 +24,12 @@ class AvExport IInputStream
 	 **/
 	virtual bool readNextPacket( CodedData& data ) = 0;
 
+	/**
+	 * @note The returned object could be cast depending on the type of the stream (video, audio...)
+	 * @see VideoProperties, AudioProperties...
+	 * @return the properties of the stream
+	 */
+	virtual const StreamProperties& getProperties() const = 0;
 	virtual size_t getStreamIndex() const = 0;
 	virtual float getDuration() const = 0;  ///< Get duration of the stream, in seconds
 	virtual AVMediaType getStreamType() const = 0;
diff --git a/src/AvTranscoder/stream/InputStream.cpp b/src/AvTranscoder/stream/InputStream.cpp
@@ -108,6 +108,11 @@ DataCodec& InputStream::getDataCodec()
 	return *static_cast<DataCodec*>( _codec );
 }
 
+const StreamProperties& InputStream::getProperties() const
+{
+	return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex );
+}
+
 AVMediaType InputStream::getStreamType() const
 {
 	return _inputFile->getFormatContext().getAVStream( _streamIndex ).codec->codec_type;
diff --git a/src/AvTranscoder/stream/InputStream.hpp b/src/AvTranscoder/stream/InputStream.hpp
@@ -24,6 +24,7 @@ class AvExport InputStream : public IInputStream
 
 	bool readNextPacket( CodedData& data );
 
+	const StreamProperties& getProperties() const;
 	size_t getStreamIndex() const { return _streamIndex; }
 	float getDuration() const;
 	AVMediaType getStreamType() const;

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,11 @@ DataCodec& InputStream::getDataCodec()`
`108`	`108`	`return static_cast<DataCodec>( _codec );`
`109`	`109`	`}`
`110`	`110`
	`111`	`+const StreamProperties& InputStream::getProperties() const`
	`112`	`+{`
	`113`	`+ return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex );`
	`114`	`+}`
	`115`	`+`
`111`	`116`	`AVMediaType InputStream::getStreamType() const`
`112`	`117`	`{`
`113`	`118`	`return _inputFile->getFormatContext().getAVStream( _streamIndex ).codec->codec_type;`