Video/Audio frames: remove desc method

Clement Champetier · Clement Champetier · commit 7e20933378d7 · 2016-10-27T18:54:56.000+02:00
This info can be found from elsewhere, and the method is not so used.
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.hpp b/src/AvTranscoder/data/decoded/AudioFrame.hpp
@@ -53,7 +53,6 @@ class AvExport AudioFrame : public Frame
     std::string getChannelLayoutDesc() const; ///< Get a description of a channel layout (example: '5.1').
     AVSampleFormat getSampleFormat() const { return static_cast<AVSampleFormat>(_frame->format); }
     size_t getNbSamplesPerChannel() const { return _frame->nb_samples; }
-    AudioFrameDesc desc() const { return AudioFrameDesc(getSampleRate(), getNbChannels(), getSampleFormat()); }
 
     size_t getSize() const;
 
diff --git a/src/AvTranscoder/data/decoded/VideoFrame.hpp b/src/AvTranscoder/data/decoded/VideoFrame.hpp
@@ -57,7 +57,6 @@ class AvExport VideoFrame : public Frame
     size_t getWidth() const { return _frame->width; }
     size_t getHeight() const { return _frame->height; }
     AVPixelFormat getPixelFormat() const { return static_cast<AVPixelFormat>(_frame->format); }
-    VideoFrameDesc desc() const { return VideoFrameDesc(getWidth(), getHeight(), getPixelFormat()); }
 
     size_t getSize() const;
 
diff --git a/src/AvTranscoder/reader/AudioReader.cpp b/src/AvTranscoder/reader/AudioReader.cpp
@@ -45,15 +45,16 @@ void AudioReader::init()
     _currentDecoder = _decoder;
 
     // create src frame
-    _srcFrame = new AudioFrame(_inputFile->getStream(_streamIndex).getAudioCodec().getAudioFrameDesc());
+    const AudioFrameDesc srcFrameDesc = _inputFile->getStream(_streamIndex).getAudioCodec().getAudioFrameDesc();
+    _srcFrame = new AudioFrame(srcFrameDesc);
     AudioFrame* srcFrame = static_cast<AudioFrame*>(_srcFrame);
     // create dst frame
     _outputSampleRate = srcFrame->getSampleRate();
     _outputNbChannels = (_channelIndex == -1) ? srcFrame->getNbChannels() : 1;
     _dstFrame = new AudioFrame(AudioFrameDesc(_outputSampleRate, _outputNbChannels, _outputSampleFormat));
 
     // generator
-    _generator = new AudioGenerator(srcFrame->desc());
+    _generator = new AudioGenerator(srcFrameDesc);
 
     // create transform
     _transform = new AudioTransform();
diff --git a/src/AvTranscoder/reader/VideoReader.cpp b/src/AvTranscoder/reader/VideoReader.cpp
@@ -44,15 +44,16 @@ void VideoReader::init()
     _currentDecoder = _decoder;
 
     // create src frame
-    _srcFrame = new VideoFrame(_inputFile->getStream(_streamIndex).getVideoCodec().getVideoFrameDesc());
+    const VideoFrameDesc srcFrameDesc = _inputFile->getStream(_streamIndex).getVideoCodec().getVideoFrameDesc();
+    _srcFrame = new VideoFrame(srcFrameDesc);
     VideoFrame* srcFrame = static_cast<VideoFrame*>(_srcFrame);
     // create dst frame
     _outputWidth = srcFrame->getWidth();
     _outputHeight = srcFrame->getHeight();
     _dstFrame = new VideoFrame(VideoFrameDesc(_outputWidth, _outputHeight, getOutputPixelFormat()));
 
     // generator
-    _generator = new VideoGenerator(srcFrame->desc());
+    _generator = new VideoGenerator(srcFrameDesc);
 
     // create transform
     _transform = new VideoTransform();
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -247,7 +247,7 @@ void StreamTranscoder::addDecoder(const InputStreamDesc& inputStreamDesc, IInput
             _decodedData.push_back(inputFrame);
 
             // generator decoder
-            _generators.push_back(new VideoGenerator(inputFrame->desc()));
+            _generators.push_back(new VideoGenerator(inputStream.getVideoCodec().getVideoFrameDesc()));
 
             break;
         }

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ void StreamTranscoder::addDecoder(const InputStreamDesc& inputStreamDesc, IInput`
`247`	`247`	`_decodedData.push_back(inputFrame);`
`248`	`248`
`249`	`249`	`// generator decoder`
`250`		`- _generators.push_back(new VideoGenerator(inputFrame->desc()));`
	`250`	`+ _generators.push_back(new VideoGenerator(inputStream.getVideoCodec().getVideoFrameDesc()));`
`251`	`251`
`252`	`252`	`break;`
`253`	`253`	`}`