From df26f731ebede7d25596cc6109f1f0f95ff93ee8 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 28 Jul 2018 16:06:26 -0700
Subject: [PATCH] Improve debugging messages

---
 app/streaming/audio.cpp                        | 4 ++++
 app/streaming/session.cpp                      | 8 ++++++++
 app/streaming/video/ffmpeg-renderers/dxva2.cpp | 3 +++
 app/streaming/video/ffmpeg-renderers/sdl.cpp   | 4 ++++
 app/streaming/video/ffmpeg-renderers/vaapi.cpp | 4 ++++
 app/streaming/video/ffmpeg-renderers/vt.mm     | 4 ++++
 6 files changed, 27 insertions(+)

diff --git a/app/streaming/audio.cpp b/app/streaming/audio.cpp
index 11c1aaac..3d69fc0c 100644
--- a/app/streaming/audio.cpp
+++ b/app/streaming/audio.cpp
@@ -142,6 +142,10 @@ int Session::sdlAudioInit(int /* audioConfiguration */,
     s_SampleIndex = 0;
     s_PendingDrops = s_PendingHardDrops = 0;
 
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                "Audio stream has %d channels",
+                opusConfig->channelCount);
+
     return 0;
 }
 
diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp
index f6639583..574de274 100644
--- a/app/streaming/session.cpp
+++ b/app/streaming/session.cpp
@@ -153,6 +153,9 @@ int Session::drSetup(int videoFormat, int width, int height, int frameRate, void
     // don't have to hide and show the SDL window (which seems to
     // cause pointer hiding to break on Windows).
 
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Video stream is %dx%dx%d (format 0x%x)",
+                width, height, frameRate, videoFormat);
+
     return 0;
 }
 
@@ -254,6 +257,7 @@ Session::Session(NvComputer* computer, NvApp& app)
     switch (m_Preferences.audioConfig)
     {
     case StreamingPreferences::AC_AUTO:
+        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Autodetecting audio configuration");
         m_StreamConfig.audioConfiguration = sdlDetermineAudioConfiguration();
         break;
     case StreamingPreferences::AC_FORCE_STEREO:
@@ -264,6 +268,10 @@ Session::Session(NvComputer* computer, NvApp& app)
         break;
     }
 
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                "Audio configuration: %d",
+                m_StreamConfig.audioConfiguration);
+
     switch (m_Preferences.videoCodecConfig)
     {
     case StreamingPreferences::VCC_AUTO:
diff --git a/app/streaming/video/ffmpeg-renderers/dxva2.cpp b/app/streaming/video/ffmpeg-renderers/dxva2.cpp
index b86a26dc..832be78c 100644
--- a/app/streaming/video/ffmpeg-renderers/dxva2.cpp
+++ b/app/streaming/video/ffmpeg-renderers/dxva2.cpp
@@ -87,6 +87,9 @@ bool DXVA2Renderer::prepareDecoderContext(AVCodecContext* context)
         return false;
     }
 
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                "Using DXVA2 accelerated renderer");
+
     return true;
 }
 
diff --git a/app/streaming/video/ffmpeg-renderers/sdl.cpp b/app/streaming/video/ffmpeg-renderers/sdl.cpp
index 5244172a..e4175eab 100644
--- a/app/streaming/video/ffmpeg-renderers/sdl.cpp
+++ b/app/streaming/video/ffmpeg-renderers/sdl.cpp
@@ -23,6 +23,10 @@ SdlRenderer::~SdlRenderer()
 bool SdlRenderer::prepareDecoderContext(AVCodecContext*)
 {
     /* Nothing to do */
+
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                "Using SDL software renderer");
+
     return true;
 }
 
diff --git a/app/streaming/video/ffmpeg-renderers/vaapi.cpp b/app/streaming/video/ffmpeg-renderers/vaapi.cpp
index 7180772f..7e566bf0 100644
--- a/app/streaming/video/ffmpeg-renderers/vaapi.cpp
+++ b/app/streaming/video/ffmpeg-renderers/vaapi.cpp
@@ -88,6 +88,10 @@ bool
 VAAPIRenderer::prepareDecoderContext(AVCodecContext* context)
 {
     context->hw_device_ctx = av_buffer_ref(m_HwContext);
+
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                "Using VAAPI accelerated renderer");
+
     return true;
 }
 
diff --git a/app/streaming/video/ffmpeg-renderers/vt.mm b/app/streaming/video/ffmpeg-renderers/vt.mm
index 6f3395c2..319a23e8 100644
--- a/app/streaming/video/ffmpeg-renderers/vt.mm
+++ b/app/streaming/video/ffmpeg-renderers/vt.mm
@@ -253,6 +253,10 @@ public:
     virtual bool prepareDecoderContext(AVCodecContext* context) override
     {
         context->hw_device_ctx = av_buffer_ref(m_HwContext);
+
+        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                    "Using VideoToolbox accelerated renderer");
+
         return true;
     }