From e35eb45e7f45739da39ba0f9d0b23c2940f4e5db Mon Sep 17 00:00:00 2001 From: Valentin NOEL Date: Thu, 2 Jun 2022 18:00:57 +0200 Subject: [PATCH 1/2] Fix compilation with MSVC error C2131: expression did not evaluate to a constant --- src/AvTranscoder/transcoder/Transcoder.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp index 0d578fff..9db3174b 100644 --- a/src/AvTranscoder/transcoder/Transcoder.cpp +++ b/src/AvTranscoder/transcoder/Transcoder.cpp @@ -673,22 +673,24 @@ void Transcoder::fillProcessStat(ProcessStat& processStat) // uint8_t picture_type = coded_frame[4]; uint8_t error_count = coded_frame[5]; - uint64_t errors[error_count]; + std::vector errors; for (int i = 0; i < error_count; ++i) { int index = 6 + i; - errors[i] = (uint64_t) coded_frame[index + 7] << 56 | - (uint64_t) coded_frame[index + 6] << 48 | - (uint64_t) coded_frame[index + 5] << 40 | - (uint64_t) coded_frame[index + 4] << 32 | - (uint64_t) coded_frame[index + 3] << 24 | - (uint64_t) coded_frame[2] << 16 | - (uint64_t) coded_frame[1] << 8 | - (uint64_t) coded_frame[0]; + errors.push_back( + (uint64_t) coded_frame[index + 7] << 56 | + (uint64_t) coded_frame[index + 6] << 48 | + (uint64_t) coded_frame[index + 5] << 40 | + (uint64_t) coded_frame[index + 4] << 32 | + (uint64_t) coded_frame[index + 3] << 24 | + (uint64_t) coded_frame[2] << 16 | + (uint64_t) coded_frame[1] << 8 | + (uint64_t) coded_frame[0] + ); } videoStat.setQuality(quality); - videoStat.setPSNR((double) errors[0] / + videoStat.setPSNR((double) errors.at(0) / (encoderContext.width * encoderContext.height * 255.0 * 255.0)); } } From cac5c3740ab1d0dcd776e9fa2a3a98fd3b981569 Mon Sep 17 00:00:00 2001 From: Valentin NOEL Date: Thu, 2 Jun 2022 18:09:47 +0200 Subject: [PATCH 2/2] Remove PixelProperties::isPseudoPaletted() function --- src/AvTranscoder/properties/PixelProperties.cpp | 10 ---------- src/AvTranscoder/properties/PixelProperties.hpp | 4 ---- 2 files changed, 14 deletions(-) diff --git a/src/AvTranscoder/properties/PixelProperties.cpp b/src/AvTranscoder/properties/PixelProperties.cpp index 48961d0a..1ca56fe3 100644 --- a/src/AvTranscoder/properties/PixelProperties.cpp +++ b/src/AvTranscoder/properties/PixelProperties.cpp @@ -204,21 +204,11 @@ bool PixelProperties::isRgbPixelData() const return (_pixelDesc->flags & AV_PIX_FMT_FLAG_RGB) == AV_PIX_FMT_FLAG_RGB; } -#if LIBAVCODEC_VERSION_MAJOR > 58 bool PixelProperties::isPaletted() const { if (!_pixelDesc) throw std::runtime_error("unable to find pixel description."); return (_pixelDesc->flags & AV_PIX_FMT_FLAG_PAL) == AV_PIX_FMT_FLAG_PAL; -#elif LIBAVCODEC_VERSION_MAJOR > 53 -bool PixelProperties::isPseudoPaletted() const { - if (!_pixelDesc) - throw std::runtime_error("unable to find pixel description."); - - return (_pixelDesc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) == AV_PIX_FMT_FLAG_PSEUDOPAL; -#else - return false; -#endif } std::vector PixelProperties::getChannels() const diff --git a/src/AvTranscoder/properties/PixelProperties.hpp b/src/AvTranscoder/properties/PixelProperties.hpp index b5ba672c..56607ce8 100644 --- a/src/AvTranscoder/properties/PixelProperties.hpp +++ b/src/AvTranscoder/properties/PixelProperties.hpp @@ -71,11 +71,7 @@ class AvExport PixelProperties bool isBitWisePacked() const; bool isHardwareAccelerated() const; bool isRgbPixelData() const; -#if LIBAVCODEC_VERSION_MAJOR > 58 bool isPaletted() const; -#else - bool isPseudoPaletted() const; -#endif std::vector getChannels() const; pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy