Commit66df6a9

authored

Merge pull request#327 from avTranscoder/dev/ffmpeg_5.0

FFmpeg 5.0

2 parentsff94632 +cac5c37 commit66df6a9Copy full SHA for 66df6a9

File tree

+12

-24

lines changed

+12

-24

lines changed

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -204,21 +204,11 @@ bool PixelProperties::isRgbPixelData() const`
`204`	`204`	`return (_pixelDesc->flags & AV_PIX_FMT_FLAG_RGB) == AV_PIX_FMT_FLAG_RGB;`
`205`	`205`	`}`
`206`	`206`
`207`		`-#if LIBAVCODEC_VERSION_MAJOR > 58`
`208`	`207`	`boolPixelProperties::isPaletted()const {`
`209`	`208`	`if (!_pixelDesc)`
`210`	`209`	`throwstd::runtime_error("unable to find pixel description.");`
`211`	`210`
`212`	`211`	`return (_pixelDesc->flags & AV_PIX_FMT_FLAG_PAL) == AV_PIX_FMT_FLAG_PAL;`
`213`		`-#elif LIBAVCODEC_VERSION_MAJOR > 53`
`214`		`-boolPixelProperties::isPseudoPaletted()const {`
`215`		`-if (!_pixelDesc)`
`216`		`-throwstd::runtime_error("unable to find pixel description.");`
`217`		`-`
`218`		`-return (_pixelDesc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) == AV_PIX_FMT_FLAG_PSEUDOPAL;`
`219`		`-#else`
`220`		`-returnfalse;`
`221`		`-#endif`
`222`	`212`	`}`
`223`	`213`
`224`	`214`	`std::vector<Channel>PixelProperties::getChannels()const`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,7 @@ class AvExport PixelProperties`
`71`	`71`	`boolisBitWisePacked()const;`
`72`	`72`	`boolisHardwareAccelerated()const;`
`73`	`73`	`boolisRgbPixelData()const;`
`74`		`-#if LIBAVCODEC_VERSION_MAJOR > 58`
`75`	`74`	`boolisPaletted()const;`
`76`		`-#else`
`77`		`-boolisPseudoPaletted()const;`
`78`		`-#endif`
`79`	`75`
`80`	`76`	`std::vector<Channel>getChannels()const;`
`81`	`77`

Lines changed: 12 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -673,22 +673,24 @@ void Transcoder::fillProcessStat(ProcessStat& processStat)`
`673`	`673`	`// uint8_t picture_type = coded_frame[4];`
`674`	`674`	`uint8_t error_count = coded_frame[5];`
`675`	`675`
`676`		`-uint64_t errors[error_count];`
	`676`	`+std::vector<uint64_t> errors;`
`677`	`677`	`for (int i =0; i < error_count; ++i)`
`678`	`678`	`{`
`679`	`679`	`int index =6 + i;`
`680`		`- errors[i] = (uint64_t) coded_frame[index +7] <<56 \|`
`681`		`- (uint64_t) coded_frame[index +6] <<48 \|`
`682`		`- (uint64_t) coded_frame[index +5] <<40 \|`
`683`		`- (uint64_t) coded_frame[index +4] <<32 \|`
`684`		`- (uint64_t) coded_frame[index +3] <<24 \|`
`685`		`- (uint64_t) coded_frame[2] <<16 \|`
`686`		`- (uint64_t) coded_frame[1] <<8 \|`
`687`		`- (uint64_t) coded_frame[0];`
	`680`	`+ errors.push_back(`
	`681`	`+ (uint64_t) coded_frame[index +7] <<56 \|`
	`682`	`+ (uint64_t) coded_frame[index +6] <<48 \|`
	`683`	`+ (uint64_t) coded_frame[index +5] <<40 \|`
	`684`	`+ (uint64_t) coded_frame[index +4] <<32 \|`
	`685`	`+ (uint64_t) coded_frame[index +3] <<24 \|`
	`686`	`+ (uint64_t) coded_frame[2] <<16 \|`
	`687`	`+ (uint64_t) coded_frame[1] <<8 \|`
	`688`	`+ (uint64_t) coded_frame[0]`
	`689`	`+ );`
`688`	`690`	`}`
`689`	`691`
`690`	`692`	`videoStat.setQuality(quality);`
`691`		`- videoStat.setPSNR((double) errors[0] /`
	`693`	`+ videoStat.setPSNR((double) errors.at(0) /`
`692`	`694`	`(encoderContext.width * encoderContext.height 255.0 255.0));`
`693`	`695`	`}`
`694`	`696`	`}`

Comments

(0)