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

valnoel · web-flow · commit 66df6a92f9cb · 2022-06-03T11:03:28.000+02:00
FFmpeg 5.0
diff --git 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<Channel> PixelProperties::getChannels() const
diff --git 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<Channel> getChannels() const;
 
diff --git 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<uint64_t> 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));
                     }
                 }
