Skip to content

Commit 2a17a4c

Browse files
cchampetcchampet
authored
Merge branch 'develop' into travis_addLibTheora
2 parents 74423f8 + faff281 commit 2a17a4c

File tree

11 files changed

+65
-59
lines changed

11 files changed

+65
-59
lines changed

‎src/AvTranscoder/common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define AVTRANSCODER_VERSION_MAJOR 0
55
#define AVTRANSCODER_VERSION_MINOR 9
6-
#define AVTRANSCODER_VERSION_MICRO 6
6+
#define AVTRANSCODER_VERSION_MICRO 7
77

88
#include <AvTranscoder/system.hpp>
99

‎src/AvTranscoder/decoder/AudioDecoder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer)
9797
&got_frame, &data.getAVPacket());
9898
if(ret < 0)
9999
{
100-
throw std::runtime_error("an error occured during audio decoding" + getDescriptionFromErrorCode(ret));
100+
throw std::runtime_error("An error occurred during audio decoding: " + getDescriptionFromErrorCode(ret));
101101
}
102102

103103
// if no frame could be decompressed

‎src/AvTranscoder/decoder/VideoDecoder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ bool VideoDecoder::decodeNextFrame(Frame& frameBuffer)
9595
&got_frame, &data.getAVPacket());
9696
if(ret < 0)
9797
{
98-
throw std::runtime_error("an error occured during video decoding - " + getDescriptionFromErrorCode(ret));
98+
throw std::runtime_error("An error occurred during video decoding: " + getDescriptionFromErrorCode(ret));
9999
}
100100

101101
// if no frame could be decompressed

‎src/AvTranscoder/properties/StreamProperties.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ StreamProperties::StreamProperties(const FileProperties& fileProperties, const s
3838
if(_codec)
3939
{
4040
// load specific options of the codec
41-
if(avcodec_open2(_codecContext, _codec, NULL) == 0)
42-
{
43-
loadOptions(_options, _codecContext);
44-
avcodec_close(_codecContext);
45-
}
41+
loadOptions(_options, _codecContext);
4642
}
4743
}
4844
}

‎src/AvTranscoder/properties/VideoProperties.hpp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,18 @@ class AvExport VideoProperties : public StreamProperties
4040
Rational getSar() const; // sample/pixel aspect ratio
4141
Rational getDar() const; // display aspect ratio
4242

43-
size_t getBitRate() const; ///< in bits/s, 0 if unknown
43+
/**
44+
* @return The video bitrate in bits/s.
45+
* @warning If there is no such info available in the container, this data is estimated by decoding the first GOP.
46+
*/
47+
size_t getBitRate() const;
4448
size_t getMaxBitRate() const;
4549
size_t getMinBitRate() const;
46-
size_t getNbFrames() const; ///< 0 if unknown
50+
/**
51+
* @note 0 if unknown.
52+
* @warning In case of a raw format, this data is estimated from the fps and the duration.
53+
*/
54+
size_t getNbFrames() const;
4755
size_t getTicksPerFrame() const;
4856
size_t getWidth() const;
4957
size_t getHeight() const;
@@ -63,7 +71,8 @@ class AvExport VideoProperties : public StreamProperties
6371

6472
/**
6573
* @brief Override method.
66-
* @return the stream duration in seconds, 0 if not available
74+
* @return The stream duration in seconds, 0 if not available.
75+
* @warning In case of a raw format, this data is estimated from the file size.
6776
*/
6877
float getDuration() const;
6978

‎src/AvTranscoder/transcoder/StreamTranscoder.cpp

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,8 @@ void StreamTranscoder::preProcessCodecLatency()
355355

356356
bool StreamTranscoder::processFrame()
357357
{
358-
const EProcessCase processCase = getProcessCase();
359358
std::string msg = "Current process case of the stream is a ";
360-
switch(processCase)
359+
switch(getProcessCase())
361360
{
362361
case eProcessCaseTranscode:
363362
msg += "transcode.";
@@ -371,9 +370,6 @@ bool StreamTranscoder::processFrame()
371370
}
372371
LOG_DEBUG(msg)
373372

374-
if(processCase == eProcessCaseGenerator)
375-
return processTranscode();
376-
377373
// Manage offset
378374
if(_offset > 0)
379375
{
@@ -382,7 +378,7 @@ bool StreamTranscoder::processFrame()
382378
{
383379
LOG_INFO("End of positive offset")
384380

385-
if(getProcessCase() == eProcessCaseTranscode)
381+
if(_inputDecoder)
386382
switchToInputDecoder();
387383
else
388384
_currentDecoder = NULL;
@@ -392,9 +388,7 @@ bool StreamTranscoder::processFrame()
392388
{
393389
// process generator
394390
if(_currentDecoder != _generator)
395-
{
396391
switchToGeneratorDecoder();
397-
}
398392
}
399393
}
400394
else if(_offset < 0)
@@ -405,14 +399,14 @@ bool StreamTranscoder::processFrame()
405399
{
406400
LOG_INFO("End of negative offset")
407401

408-
switchToGeneratorDecoder();
402+
if(_needToSwitchToGenerator)
403+
switchToGeneratorDecoder();
409404
_offset = 0;
410405
}
411406
}
412407

413-
if(processCase == eProcessCaseRewrap)
408+
if(getProcessCase() == eProcessCaseRewrap)
414409
return processRewrap();
415-
416410
return processTranscode(_subStreamIndex);
417411
}
418412

‎src/AvTranscoder/transcoder/StreamTranscoder.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ class AvExport StreamTranscoder
106106
void setOffset(const float offset);
107107

108108
//@{
109-
// Get the current process case.
109+
// @brief Get the current process case.
110+
// @warning Could vary during the process.
110111
enum EProcessCase
111112
{
112113
eProcessCaseTranscode,

‎src/AvTranscoder/transcoder/Transcoder.cpp

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -235,30 +235,21 @@ bool Transcoder::processFrame()
235235
return false;
236236

237237
// For each stream, process a frame
238-
size_t nbStreamProcessStatusFailed = 0;
239238
for(size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex)
240239
{
241-
LOG_DEBUG("Process stream " << streamIndex << "/" << (_streamTranscoders.size() - 1))
240+
LOG_DEBUG("Process stream " << streamIndex + 1 << "/" << _streamTranscoders.size())
241+
242+
// if a stream failed to process
242243
if(!_streamTranscoders.at(streamIndex)->processFrame())
243244
{
244-
LOG_WARN("Failed to process stream " << streamIndex)
245-
++nbStreamProcessStatusFailed;
246-
}
247-
}
248-
249-
// Get the number of streams without the generators (they always succeed)
250-
size_t nbStreamsWithoutGenerator = _streamTranscoders.size();
251-
for(size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex)
252-
{
253-
if(_streamTranscoders.at(streamIndex)->getProcessCase() == StreamTranscoder::eProcessCaseGenerator)
254-
--nbStreamsWithoutGenerator;
255-
}
245+
LOG_WARN("Failed to process stream at index " << streamIndex)
256246

257-
// If all streams failed to process a new frame
258-
if(nbStreamsWithoutGenerator != 0 && nbStreamsWithoutGenerator == nbStreamProcessStatusFailed)
259-
{
260-
LOG_INFO("End of process because all streams (except generators) failed to process a new frame.")
261-
return false;
247+
// if this is the end of the main stream
248+
if(streamIndex == _mainStreamIndex) {
249+
LOG_INFO("End of process because the main stream at index " << _mainStreamIndex << " failed to process a new frame.")
250+
return false;
251+
}
252+
}
262253
}
263254
return true;
264255
}
@@ -304,7 +295,7 @@ ProcessStat Transcoder::process(IProgress& progress)
304295
}
305296

306297
// check progressDuration
307-
if(progressDuration >= expectedOutputDuration)
298+
if(_eProcessMethod == eProcessMethodBasedOnDuration && progressDuration >= expectedOutputDuration)
308299
{
309300
LOG_INFO("End of process because the output program duration ("
310301
<< progressDuration << "s) is equal or upper than " << expectedOutputDuration << "s.")
@@ -314,7 +305,7 @@ ProcessStat Transcoder::process(IProgress& progress)
314305

315306
_outputFile.endWrap();
316307

317-
LOG_INFO("End of process: " << frame << " frames processed")
308+
LOG_INFO("End of process: " << ++frame << " frames processed")
318309

319310
LOG_INFO("Get process statistics")
320311
ProcessStat processStat;
@@ -498,32 +489,43 @@ ProfileLoader::Profile Transcoder::getProfileFromFile(InputFile& inputFile, cons
498489
return profile;
499490
}
500491

501-
float Transcoder::getStreamDuration(size_t indexStream) const
492+
float Transcoder::getStreamDuration(const size_t indexStream) const
502493
{
503494
return _streamTranscoders.at(indexStream)->getDuration();
504495
}
505496

506-
float Transcoder::getMinTotalDuration() const
497+
float Transcoder::getMinTotalDuration()
507498
{
508499
float minTotalDuration = std::numeric_limits<float>::max();
509-
for(size_t i = 0; i < _streamTranscoders.size(); ++i)
500+
for(size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex)
510501
{
511-
minTotalDuration = std::min(getStreamDuration(i), minTotalDuration);
502+
const float streamDuration = getStreamDuration(streamIndex);
503+
if(std::min(streamDuration, minTotalDuration) == streamDuration)
504+
{
505+
minTotalDuration = streamDuration;
506+
_mainStreamIndex = streamIndex;
507+
}
508+
512509
}
513510
return minTotalDuration;
514511
}
515512

516-
float Transcoder::getMaxTotalDuration() const
513+
float Transcoder::getMaxTotalDuration()
517514
{
518515
float maxTotalDuration = 0;
519-
for(size_t i = 0; i < _streamTranscoders.size(); ++i)
516+
for(size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex)
520517
{
521-
maxTotalDuration = std::max(getStreamDuration(i), maxTotalDuration);
518+
const float streamDuration = getStreamDuration(streamIndex);
519+
if(std::max(streamDuration, maxTotalDuration) == streamDuration)
520+
{
521+
maxTotalDuration = streamDuration;
522+
_mainStreamIndex = streamIndex;
523+
}
522524
}
523525
return maxTotalDuration;
524526
}
525527

526-
float Transcoder::getExpectedOutputDuration() const
528+
float Transcoder::getExpectedOutputDuration()
527529
{
528530
switch(_eProcessMethod)
529531
{

‎src/AvTranscoder/transcoder/Transcoder.hpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,20 +197,22 @@ class AvExport Transcoder
197197
float getStreamDuration(size_t indexStream) const;
198198

199199
/**
200-
* @brief Get the duration of the shortest stream, in seconds
201-
*/
202-
float getMinTotalDuration() const;
200+
* @brief Get the duration of the shortest stream, in seconds
201+
* @note Set the index of the main stream to stop the process at the end of the shortest stream.
202+
*/
203+
float getMinTotalDuration();
203204

204205
/**
205206
* @brief Get the duration of the longest stream, in seconds
207+
* @note Set the index of the main stream to stop the process at the end of the longest stream.
206208
*/
207-
float getMaxTotalDuration() const;
209+
float getMaxTotalDuration();
208210

209211
/**
210212
* @brief Get the expected duration of the output program
211213
* @note Depends on the streams, the process method, and the main stream index.
212214
*/
213-
float getExpectedOutputDuration() const;
215+
float getExpectedOutputDuration();
214216

215217
/**
216218
* @brief Get the current duration of the output program
@@ -240,7 +242,7 @@ class AvExport Transcoder
240242

241243
EProcessMethod _eProcessMethod; ///< Processing policy
242244
size_t
243-
_mainStreamIndex; ///< Index of stream used to stop the process of transcode in case of eProcessMethodBasedOnStream.
245+
_mainStreamIndex; ///< Index of stream used to stop the process.
244246
float _outputDuration; ///< Duration of output media used to stop the process of transcode in case of
245247
/// eProcessMethodBasedOnDuration.
246248
};

‎test/pyTest/testEProcessMethod.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def testEProcessMethodShortest():
2828
transcoder.setProcessMethod( av.eProcessMethodShortest )
2929

3030
transcoder.add( inputFileName_longest, 0 )
31-
transcoder.add( inputFileName_shortest, 0 )
31+
transcoder.add( inputFileName_shortest, 1 )
3232

3333
progress = av.ConsoleProgress()
3434
transcoder.process( progress )

‎test/pyTest/testOffset.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ def testRewrapAudioNegativeOffset():
137137
assert_equals( src_audioStream.getNbSamples() + ( offset * dst_audioStream.getSampleRate() * dst_audioStream.getNbChannels() ), dst_audioStream.getNbSamples() )
138138

139139

140+
# The output video stream has not the correct duration.
141+
@nottest
140142
def testTranscodeVideoPositiveOffset():
141143
"""
142144
Transcode one video stream (profile mpeg2) with offset at the beginning of the process.

0 commit comments

Comments
 (0)