NotificationsYou must be signed in to change notification settings
Fork50
Star165

Commit691e4fe

committed

StreamTranscoder: check end of positive offset based on number of generated frames

1 parentc06898b commit691e4feCopy full SHA for 691e4fe

File tree

1 file changed

+14

-10

lines changed

src/AvTranscoder/transcoder
- StreamTranscoder.cpp

1 file changed

+14

-10

lines changed

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

Lines changed: 14 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -588,15 +588,6 @@ void StreamTranscoder::preProcessCodecLatency()`
`588`	`588`	`wasARewrapCase =true;`
`589`	`589`	`}`
`590`	`590`
`591`		`-if(_offset >0) {`
`592`		`-constdouble fps =1.0 * _outputEncoder->getCodec().getAVCodecContext().time_base.den /`
`593`		`- (_outputEncoder->getCodec().getAVCodecContext().time_base.num * _outputEncoder->getCodec().getAVCodecContext().ticks_per_frame);`
`594`		`-constdouble frame_duration =1.0 / fps;`
`595`		`-constdouble output_latency_duration = frame_duration * (latency -1);`
`596`		`-LOG_WARN("Compensate for offset with codec latency by" << output_latency_duration <<" seconds (fps=" << fps <<", latency=" << latency <<")");`
`597`		`- _offset -= output_latency_duration;`
`598`		`- }`
`599`		`-`
`600`	`591`	`while((latency--) >0)`
`601`	`592`	`{`
`602`	`593`	`processFrame();`
`@@ -626,7 +617,20 @@ bool StreamTranscoder::processFrame()`
`626`	`617`	`// Manage offset`
`627`	`618`	`if(_offset >0)`
`628`	`619`	`{`
`629`		`-constbool endOfOffset = _outputStream->getStreamDuration() >= _offset;`
	`620`	`+bool endOfOffset =false;`
	`621`	`+if(_currentDecoder == _generators.at(0))`
	`622`	`+ {`
	`623`	`+constdouble fps =1.0 * _outputEncoder->getCodec().getAVCodecContext().time_base.den /`
	`624`	`+ (_outputEncoder->getCodec().getAVCodecContext().time_base.num * _outputEncoder->getCodec().getAVCodecContext().ticks_per_frame);`
	`625`	`+constdouble frame_duration =1.0 / fps;`
	`626`	`+constdouble generated_duration = _currentDecoder->getNbDecodedFrames() * frame_duration;`
	`627`	`+ endOfOffset = generated_duration >= _offset;`
	`628`	`+ }`
	`629`	`+else`
	`630`	`+ {`
	`631`	`+ endOfOffset = _outputStream->getStreamDuration() >= _offset;`
	`632`	`+ }`
	`633`	`+`
`630`	`634`	`if(endOfOffset)`
`631`	`635`	`{`
`632`	`636`	`LOG_INFO("End of positive offset")`

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!

Commit691e4fe

File tree

1 file changed

1 file changed

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

0 commit comments