Skip to content

Commit 356c166

Browse files
author
Clement Champetier
committed
StreamTranscoder: renamed Frame buffer attributes
* _sourceBuffers to _decodedData. * _frameBuffers to _convertedData.
1 parent 732791a commit 356c166

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

‎src/AvTranscoder/transcoder/StreamTranscoder.cpp

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
2424
, _inputStreams()
2525
, _currentInputStream(&inputStream)
2626
, _outputStream(NULL)
27-
, _sourceBuffers()
28-
, _frameBuffers()
27+
, _decodedData()
28+
, _transformedData()
2929
, _inputDecoders()
3030
, _generators()
3131
, _currentDecoder(NULL)
@@ -56,8 +56,8 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
5656
_generators.push_back(new VideoGenerator(inputFrameDesc));
5757

5858
// buffers to process
59-
_sourceBuffers.push_back(new VideoFrame(inputFrameDesc));
60-
_frameBuffers.push_back(new VideoFrame(inputFrameDesc));
59+
_decodedData.push_back(new VideoFrame(inputFrameDesc));
60+
_transformedData.push_back(new VideoFrame(inputFrameDesc));
6161

6262
// transform
6363
_transform = new VideoTransform();
@@ -91,8 +91,8 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
9191
_generators.push_back(new AudioGenerator(inputFrameDesc));
9292

9393
// buffers to process
94-
_sourceBuffers.push_back(new AudioFrame(inputFrameDesc));
95-
_frameBuffers.push_back(new AudioFrame(inputFrameDesc));
94+
_decodedData.push_back(new AudioFrame(inputFrameDesc));
95+
_transformedData.push_back(new AudioFrame(inputFrameDesc));
9696

9797
// transform
9898
_transform = new AudioTransform();
@@ -129,8 +129,8 @@ StreamTranscoder::StreamTranscoder(const InputStreamDesc& inputStreamDesc, IInpu
129129
, _inputStreams()
130130
, _currentInputStream(&inputStream)
131131
, _outputStream(NULL)
132-
, _sourceBuffers()
133-
, _frameBuffers()
132+
, _decodedData()
133+
, _transformedData()
134134
, _inputDecoders()
135135
, _generators()
136136
, _currentDecoder(NULL)
@@ -169,8 +169,8 @@ StreamTranscoder::StreamTranscoder(const InputStreamDesc& inputStreamDesc, IInpu
169169
_outputStream = &outputFile.addVideoStream(outputVideo->getVideoCodec());
170170

171171
// buffers to process
172-
_sourceBuffers.push_back(new VideoFrame(_currentInputStream->getVideoCodec().getVideoFrameDesc()));
173-
_frameBuffers.push_back(new VideoFrame(outputVideo->getVideoCodec().getVideoFrameDesc()));
172+
_decodedData.push_back(new VideoFrame(_currentInputStream->getVideoCodec().getVideoFrameDesc()));
173+
_transformedData.push_back(new VideoFrame(outputVideo->getVideoCodec().getVideoFrameDesc()));
174174

175175
// transform
176176
_transform = new VideoTransform();
@@ -209,8 +209,8 @@ StreamTranscoder::StreamTranscoder(const InputStreamDesc& inputStreamDesc, IInpu
209209
if(inputStreamDesc.demultiplexing())
210210
inputFrameDesc._nbChannels = inputStreamDesc._channelIndexArray.size();
211211

212-
_sourceBuffers.push_back(new AudioFrame(inputFrameDesc));
213-
_frameBuffers.push_back(new AudioFrame(outputAudio->getAudioCodec().getAudioFrameDesc()));
212+
_decodedData.push_back(new AudioFrame(inputFrameDesc));
213+
_transformedData.push_back(new AudioFrame(outputAudio->getAudioCodec().getAudioFrameDesc()));
214214

215215
// transform
216216
_transform = new AudioTransform();
@@ -234,8 +234,8 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:
234234
, _inputStreams()
235235
, _currentInputStream(NULL)
236236
, _outputStream(NULL)
237-
, _sourceBuffers()
238-
, _frameBuffers()
237+
, _decodedData()
238+
, _transformedData()
239239
, _inputDecoders()
240240
, _generators()
241241
, _currentDecoder(NULL)
@@ -263,8 +263,8 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:
263263
// buffers to process
264264
VideoFrameDesc outputFrameDesc = inputFrameDesc;
265265
outputFrameDesc.setParameters(profile);
266-
_sourceBuffers.push_back(new VideoFrame(inputFrameDesc));
267-
_frameBuffers.push_back(new VideoFrame(outputFrameDesc));
266+
_decodedData.push_back(new VideoFrame(inputFrameDesc));
267+
_transformedData.push_back(new VideoFrame(outputFrameDesc));
268268

269269
// transform
270270
_transform = new VideoTransform();
@@ -295,8 +295,8 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:
295295
// buffers to process
296296
AudioFrameDesc outputFrameDesc = inputFrameDesc;
297297
outputFrameDesc.setParameters(profile);
298-
_sourceBuffers.push_back(new AudioFrame(inputFrameDesc));
299-
_frameBuffers.push_back(new AudioFrame(outputFrameDesc));
298+
_decodedData.push_back(new AudioFrame(inputFrameDesc));
299+
_transformedData.push_back(new AudioFrame(outputFrameDesc));
300300

301301
// transform
302302
_transform = new AudioTransform();
@@ -317,11 +317,11 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:
317317

318318
StreamTranscoder::~StreamTranscoder()
319319
{
320-
for(std::vector<Frame*>::iterator it = _sourceBuffers.begin(); it != _sourceBuffers.end(); ++it)
320+
for(std::vector<Frame*>::iterator it = _decodedData.begin(); it != _decodedData.end(); ++it)
321321
{
322322
delete(*it);
323323
}
324-
for(std::vector<Frame*>::iterator it = _frameBuffers.begin(); it != _frameBuffers.end(); ++it)
324+
for(std::vector<Frame*>::iterator it = _transformedData.begin(); it != _transformedData.end(); ++it)
325325
{
326326
delete(*it);
327327
}
@@ -474,30 +474,30 @@ bool StreamTranscoder::processTranscode()
474474
assert(_outputStream != NULL);
475475
assert(_currentDecoder != NULL);
476476
assert(_outputEncoder != NULL);
477-
assert(! _sourceBuffers.empty());
478-
assert(! _frameBuffers.empty());
477+
assert(! _decodedData.empty());
478+
assert(! _transformedData.empty());
479479
assert(_transform != NULL);
480480

481481
LOG_DEBUG("StreamTranscoder::processTranscode")
482482

483483
LOG_DEBUG("Decode next frame")
484484
bool decodingStatus = false;
485485
if(! _inputStreamDesc.empty() && _inputStreamDesc.at(0).demultiplexing())
486-
decodingStatus = _currentDecoder->decodeNextFrame(*_sourceBuffers.at(0), _inputStreamDesc.at(0)._channelIndexArray);
486+
decodingStatus = _currentDecoder->decodeNextFrame(*_decodedData.at(0), _inputStreamDesc.at(0)._channelIndexArray);
487487
else
488-
decodingStatus = _currentDecoder->decodeNextFrame(*_sourceBuffers.at(0));
488+
decodingStatus = _currentDecoder->decodeNextFrame(*_decodedData.at(0));
489489

490490
CodedData data;
491491
if(decodingStatus)
492492
{
493493
LOG_DEBUG("Filtering")
494-
_filterGraph->process(_sourceBuffers, *_sourceBuffers.at(0));
494+
_filterGraph->process(_decodedData, *_decodedData.at(0));
495495

496496
LOG_DEBUG("Convert")
497-
_transform->convert(*_sourceBuffers.at(0), *_frameBuffers.at(0));
497+
_transform->convert(*_decodedData.at(0), *_transformedData.at(0));
498498

499499
LOG_DEBUG("Encode")
500-
_outputEncoder->encodeFrame(*_frameBuffers.at(0), data);
500+
_outputEncoder->encodeFrame(*_transformedData.at(0), data);
501501
}
502502
else
503503
{
@@ -566,7 +566,7 @@ float StreamTranscoder::getDuration() const
566566

567567
bool StreamTranscoder::canSwitchToGenerator()
568568
{
569-
if(! _sourceBuffers.empty() && ! _frameBuffers.empty() && ! _generators.empty() && _outputEncoder && _transform)
569+
if(! _decodedData.empty() && ! _transformedData.empty() && ! _generators.empty() && _outputEncoder && _transform)
570570
return true;
571571
return false;
572572
}

‎src/AvTranscoder/transcoder/StreamTranscoder.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ class AvExport StreamTranscoder
127127
IInputStream* _currentInputStream; ///< Current input stream (has link, no ownership)
128128
IOutputStream* _outputStream; ///< Output stream to wrap next packet (has link, no ownership)
129129

130-
std::vector<Frame*> _sourceBuffers; ///< Buffer of decoded data (has ownership).
131-
std::vector<Frame*> _frameBuffers; ///< Buffer if transformed data (has ownership).
130+
std::vector<Frame*> _decodedData; ///< Buffer of decoded data (has ownership).
131+
std::vector<Frame*> _transformedData; ///< Buffer of transformed data (has ownership).
132132

133133
std::vector<IDecoder*> _inputDecoders; ///< Decoders of packets read from _inputStream (has ownership)
134134
std::vector<IDecoder*> _generators; ///< Generators of audio or video packets (has ownership)

0 commit comments

Comments
 (0)