NotificationsYou must be signed in to change notification settings
Fork50
Star165

Commit0b4ef30

Clement Champetier

committed

StreamTranscoder: refactor how to get the current process case

* Add EProcessCase enum.* Add getProcessCase method.* Remove 3 methods isTranscodeCase, isRewrapCase, isGeneratorCase.*Fix#180

1 parent9f75cb9 commit0b4ef30Copy full SHA for 0b4ef30

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
`@@ -315,7 +315,7 @@ void StreamTranscoder::preProcessCodecLatency()`
`315`	`315`	`return;`
`316`	`316`
`317`	`317`	`// set a decoder to preload generated frames`
`318`		`-if(isRewrapCase() )`
	`318`	`+if(getProcessCase() == eProcessCaseRewrap )`
`319`	`319`	`switchToGeneratorDecoder();`
`320`	`320`
`321`	`321`	`while( ( latency-- ) >0 )`
`@@ -334,7 +334,7 @@ bool StreamTranscoder::processFrame()`
`334`	`334`	`{`
`335`	`335`	`LOG_INFO("End of positive offset" )`
`336`	`336`
`337`		`-if(isTranscodeCase() )`
	`337`	`+if(getProcessCase() == eProcessCaseTranscode )`
`338`	`338`	`switchToInputDecoder();`
`339`	`339`	`else`
`340`	`340`	`_currentDecoder =NULL;`
`@@ -362,7 +362,7 @@ bool StreamTranscoder::processFrame()`
`362`	`362`	`}`
`363`	`363`	`}`
`364`	`364`
`365`		`-if(isRewrapCase() )`
	`365`	`+if(getProcessCase() == eProcessCaseRewrap )`
`366`	`366`	`returnprocessRewrap();`
`367`	`367`
`368`	`368`	`returnprocessTranscode( _subStreamIndex );`
`@@ -501,19 +501,14 @@ double StreamTranscoder::getDuration() const`
`501`	`501`	`return std::numeric_limits<double>::max();`
`502`	`502`	`}`
`503`	`503`
`504`		`-boolStreamTranscoder::isTranscodeCase()const`
	`504`	`+StreamTranscoder::EProcessCaseStreamTranscoder::getProcessCase()const`
`505`	`505`	`{`
`506`		`-return _inputStream && _inputDecoder;`
`507`		`-}`
`508`		`-`
`509`		`-boolStreamTranscoder::isRewrapCase()const`
`510`		`-{`
`511`		`-return _inputStream && ! _inputDecoder;`
`512`		`-}`
`513`		`-`
`514`		`-boolStreamTranscoder::isGeneratorCase()const`
`515`		`-{`
`516`		`-return ! _inputStream;`
	`506`	`+if( _inputStream && _inputDecoder )`
	`507`	`+return eProcessCaseTranscode;`
	`508`	`+elseif( _inputStream && ! _inputDecoder )`
	`509`	`+return eProcessCaseRewrap;`
	`510`	`+else`
	`511`	`+return eProcessCaseGenerator;`
`517`	`512`	`}`
`518`	`513`
`519`	`514`	`}`

`‎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!

Commit0b4ef30

File tree

2 files changed

2 files changed

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

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

0 commit comments