From 45d3bb9bad4d9b86ecc9b1f967c678e55fa4d82b Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sun, 4 Jul 2021 11:36:16 +0200
Subject: [PATCH] Small refactoring of VideoFFmpegComponent.

---
 .../src/components/VideoFFmpegComponent.cpp   | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/es-core/src/components/VideoFFmpegComponent.cpp b/es-core/src/components/VideoFFmpegComponent.cpp
index dff5742b9..ef64069fc 100644
--- a/es-core/src/components/VideoFFmpegComponent.cpp
+++ b/es-core/src/components/VideoFFmpegComponent.cpp
@@ -13,6 +13,8 @@
 #include "Settings.h"
 #include "Window.h"
 
+#define DEBUG_VIDEO false
+
 VideoFFmpegComponent::VideoFFmpegComponent(
         Window* window)
         : VideoComponent(window),
@@ -631,10 +633,10 @@ void VideoFFmpegComponent::getProcessedFrames()
             mAudioFrameResampled) >= 0) {
 
         AudioFrame currFrame;
+        AVRational timeBase;
 
         mAudioFrameResampled->best_effort_timestamp = mAudioFrameResampled->pts;
 
-        AVRational timeBase;
         timeBase.num = 1;
         timeBase.den = mAudioFrameResampled->sample_rate;
 
@@ -671,10 +673,12 @@ void VideoFFmpegComponent::outputFrames()
     while (!mAudioFrameQueue.empty()) {
         if (mAudioFrameQueue.front().pts < mAccumulatedTime + AUDIO_BUFFER) {
             // Enable only when needed, as this generates a lot of debug output.
-//            LOG(LogDebug) << "Processing audio frame with PTS: " <<
-//            mAudioFrameQueue.front().pts;
-//            LOG(LogDebug) << "Total audio frames processed / audio frame queue size: " <<
-//            mAudioFrameCount << " / " << std::to_string(mAudioFrameQueue.size());
+            if (DEBUG_VIDEO) {
+                LOG(LogDebug) << "Processing audio frame with PTS: " <<
+                mAudioFrameQueue.front().pts;
+                LOG(LogDebug) << "Total audio frames processed / audio frame queue size: " <<
+                mAudioFrameCount << " / " << std::to_string(mAudioFrameQueue.size());
+            }
 
             bool outputSound = false;
 
@@ -712,10 +716,12 @@ void VideoFFmpegComponent::outputFrames()
     while (mIsActuallyPlaying && !mVideoFrameQueue.empty()) {
         if (mVideoFrameQueue.front().pts < mAccumulatedTime) {
             // Enable only when needed, as this generates a lot of debug output.
-//            LOG(LogDebug) << "Processing video frame with PTS: " <<
-//                    mVideoFrameQueue.front().pts;
-//            LOG(LogDebug) << "Total video frames processed / video frame queue size: " <<
-//                    mVideoFrameCount << " / " << std::to_string(mVideoFrameQueue.size());
+            if (DEBUG_VIDEO) {
+                LOG(LogDebug) << "Processing video frame with PTS: " <<
+                        mVideoFrameQueue.front().pts;
+                LOG(LogDebug) << "Total video frames processed / video frame queue size: " <<
+                        mVideoFrameCount << " / " << std::to_string(mVideoFrameQueue.size());
+            }
 
             mPictureMutex.lock();