NotificationsYou must be signed in to change notification settings
Fork50
Star165

Commit9b9005b

committed

Merge pull request#201 from cchampet/dev_StreamTranscoderGetProcessCase

StreamTranscoder: refactor how to get the current process case

2 parents2c9198f +0b4ef30 commit9b9005bCopy full SHA for 9b9005b

File tree

2 files changed

+19

-18

lines changed

src/AvTranscoder/transcoder
- StreamTranscoder.cpp
- StreamTranscoder.hpp

2 files changed

+19

-18

lines changed

`‎src/AvTranscoder/transcoder/StreamTranscoder.cpp`

Lines changed: 10 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ void StreamTranscoder::preProcessCodecLatency()`
`309`	`309`	`return;`
`310`	`310`
`311`	`311`	`// set a decoder to preload generated frames`
`312`		`-if(isRewrapCase() )`
	`312`	`+if(getProcessCase() == eProcessCaseRewrap )`
`313`	`313`	`switchToGeneratorDecoder();`
`314`	`314`
`315`	`315`	`while( ( latency-- ) >0 )`
`@@ -328,7 +328,7 @@ bool StreamTranscoder::processFrame()`
`328`	`328`	`{`
`329`	`329`	`LOG_INFO("End of positive offset" )`
`330`	`330`
`331`		`-if(isTranscodeCase() )`
	`331`	`+if(getProcessCase() == eProcessCaseTranscode )`
`332`	`332`	`switchToInputDecoder();`
`333`	`333`	`else`
`334`	`334`	`_currentDecoder =NULL;`
`@@ -356,7 +356,7 @@ bool StreamTranscoder::processFrame()`
`356`	`356`	`}`
`357`	`357`	`}`
`358`	`358`
`359`		`-if(isRewrapCase() )`
	`359`	`+if(getProcessCase() == eProcessCaseRewrap )`
`360`	`360`	`returnprocessRewrap();`
`361`	`361`
`362`	`362`	`returnprocessTranscode( _subStreamIndex );`
`@@ -495,19 +495,14 @@ double StreamTranscoder::getDuration() const`
`495`	`495`	`return std::numeric_limits<double>::max();`
`496`	`496`	`}`
`497`	`497`
`498`		`-boolStreamTranscoder::isTranscodeCase()const`
	`498`	`+StreamTranscoder::EProcessCaseStreamTranscoder::getProcessCase()const`
`499`	`499`	`{`
`500`		`-return _inputStream && _inputDecoder;`
`501`		`-}`
`502`		`-`
`503`		`-boolStreamTranscoder::isRewrapCase()const`
`504`		`-{`
`505`		`-return _inputStream && ! _inputDecoder;`
`506`		`-}`
`507`		`-`
`508`		`-boolStreamTranscoder::isGeneratorCase()const`
`509`		`-{`
`510`		`-return ! _inputStream;`
	`500`	`+if( _inputStream && _inputDecoder )`
	`501`	`+return eProcessCaseTranscode;`
	`502`	`+elseif( _inputStream && ! _inputDecoder )`
	`503`	`+return eProcessCaseRewrap;`
	`504`	`+else`
	`505`	`+return eProcessCaseGenerator;`
`511`	`506`	`}`
`512`	`507`
`513`	`508`	`}`

`‎src/AvTranscoder/transcoder/StreamTranscoder.hpp`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,15 @@ class AvExport StreamTranscoder`
`95`	`95`	`boolprocessRewrap();`
`96`	`96`	`boolprocessTranscode(constint subStreamIndex = -1 );///< By default transcode all channels`
`97`	`97`
`98`		`-boolisTranscodeCase()const;`
`99`		`-boolisRewrapCase()const;`
`100`		`-boolisGeneratorCase()const;`
	`98`	`+//@{`
	`99`	`+// Get the current process case.`
	`100`	`+enum EProcessCase {`
	`101`	`+ eProcessCaseTranscode,`
	`102`	`+ eProcessCaseRewrap,`
	`103`	`+ eProcessCaseGenerator`
	`104`	`+};`
	`105`	`+EProcessCasegetProcessCase()const;`
	`106`	`+//@}`
`101`	`107`
`102`	`108`	`private:`
`103`	`109`	`IInputStream* _inputStream;///< Input stream to read next packet (has link, no ownership)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9b9005b

File tree

2 files changed

2 files changed

`‎src/AvTranscoder/transcoder/StreamTranscoder.cpp`

`‎src/AvTranscoder/transcoder/StreamTranscoder.hpp`

0 commit comments