[PR 12715] Separate VP and RP process info

Author: garbear

cmake/treedata/common/retroplayer.txt

@@ -1,4 +1,5 @@
 xbmc/cores/RetroPlayer                                          cores/RetroPlayer
 xbmc/cores/RetroPlayer/guicontrols                              cores/RetroPlayer/guicontrols
+xbmc/cores/RetroPlayer/process                                  cores/RetroPlayer/process
 xbmc/cores/RetroPlayer/rendering                                cores/RetroPlayer/rendering
 xbmc/cores/RetroPlayer/rendering/VideoRenderers                 cores/RetroPlayer/rendering/VideoRenderers

xbmc/cores/RetroPlayer/CMakeLists.txt

@@ -7,7 +7,6 @@ set(SOURCES RetroPlayer.cpp
 set(HEADERS RetroPlayer.h
             RetroPlayerAudio.h
             RetroPlayerAutoSave.h
-            RetroPlayerDefines.h
             RetroPlayerInput.h
             RetroPlayerVideo.h)
 

xbmc/cores/RetroPlayer/RetroPlayer.cpp

@@ -26,9 +26,9 @@
 #include "addons/AddonManager.h"
 #include "cores/DataCacheCore.h"
 #include "cores/RetroPlayer/guicontrols/GUIGameControlManager.h"
+#include "cores/RetroPlayer/process/RPProcessInfo.h"
 #include "cores/RetroPlayer/rendering/GUIRenderSettings.h"
 #include "cores/RetroPlayer/rendering/RPRenderManager.h"
-#include "cores/VideoPlayer/Process/ProcessInfo.h"
 #include "dialogs/GUIDialogYesNo.h"
 #include "filesystem/File.h"
 #include "games/addons/playback/IGameClientPlayback.h"
@@ -64,10 +64,10 @@ using namespace RETRO;
 CRetroPlayer::CRetroPlayer(IPlayerCallback& callback) :
   IPlayer(callback),
   m_renderManager(new CRPRenderManager),
-  m_processInfo(CProcessInfo::CreateInstance())
+  m_processInfo(CRPProcessInfo::CreateInstance())
 {
   m_processInfo->SetDataCache(&CServiceBroker::GetDataCacheCore());
-  m_processInfo->SetTempo(1.0);
+  m_processInfo->ResetInfo();
 }
 
 CRetroPlayer::~CRetroPlayer()

xbmc/cores/RetroPlayer/RetroPlayer.h

@@ -26,8 +26,6 @@
 
 #include <memory>
 
-class CProcessInfo;
-
 namespace KODI
 {
 namespace RETRO
@@ -36,6 +34,7 @@ namespace RETRO
   class CRetroPlayerAutoSave;
   class CRetroPlayerInput;
   class CRetroPlayerVideo;
+  class CRPProcessInfo;
   class CRPRenderManager;
 
   class CRetroPlayer : public IPlayer
@@ -164,7 +163,7 @@ namespace RETRO
     State                              m_state = State::STARTING;
     double                             m_priorSpeed = 0.0f; // Speed of gameplay before entering OSD
     std::unique_ptr<CRPRenderManager>  m_renderManager;
-    std::unique_ptr<CProcessInfo>      m_processInfo;
+    std::unique_ptr<CRPProcessInfo>    m_processInfo;
     std::unique_ptr<CRetroPlayerAudio> m_audio;
     std::unique_ptr<CRetroPlayerVideo> m_video;
     std::unique_ptr<CRetroPlayerInput> m_input;

xbmc/cores/RetroPlayer/RetroPlayerAudio.cpp

@@ -20,24 +20,18 @@
 
 #include "ServiceBroker.h"
 #include "RetroPlayerAudio.h"
-#include "RetroPlayerDefines.h"
 #include "cores/AudioEngine/Interfaces/AE.h"
 #include "cores/AudioEngine/Interfaces/AEStream.h"
 #include "cores/AudioEngine/Utils/AEChannelInfo.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"
-#include "cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodec.h"
-#include "cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h"
-#include "cores/VideoPlayer/DVDDemuxers/DVDDemux.h"
-#include "cores/VideoPlayer/DVDClock.h"
-#include "cores/VideoPlayer/DVDStreamInfo.h"
-#include "cores/VideoPlayer/Process/ProcessInfo.h"
+#include "cores/RetroPlayer/process/RPProcessInfo.h"
 #include "threads/Thread.h"
 #include "utils/log.h"
 
 using namespace KODI;
 using namespace RETRO;
 
-CRetroPlayerAudio::CRetroPlayerAudio(CProcessInfo& processInfo) :
+CRetroPlayerAudio::CRetroPlayerAudio(CRPProcessInfo& processInfo) :
   m_processInfo(processInfo),
   m_pAudioStream(nullptr),
   m_bAudioEnabled(true)
@@ -101,70 +95,23 @@ bool CRetroPlayerAudio::OpenPCMStream(AEDataFormat format, unsigned int samplera
     return false;
   }
 
+  m_processInfo.SetAudioChannels(audioFormat.m_channelLayout);
+  m_processInfo.SetAudioSampleRate(audioFormat.m_sampleRate);
+  m_processInfo.SetAudioBitsPerSample(CAEUtil::DataFormatToUsedBits(audioFormat.m_dataFormat));
+
   return true;
 }
 
 bool CRetroPlayerAudio::OpenEncodedStream(AVCodecID codec, unsigned int samplerate, const CAEChannelInfo& channelLayout)
 {
-  CDemuxStreamAudio audioStream;
-
-  // Stream
-  audioStream.uniqueId = GAME_STREAM_AUDIO_ID;
-  audioStream.codec = codec;
-  audioStream.type = STREAM_AUDIO;
-  audioStream.source = STREAM_SOURCE_DEMUX;
-  audioStream.realtime = true;
-
-  // Audio
-  audioStream.iChannels = channelLayout.Count();
-  audioStream.iSampleRate = samplerate;
-  audioStream.iChannelLayout = CAEUtil::GetAVChannelLayout(channelLayout);
-
-  CDVDStreamInfo hint(audioStream);
-  m_pAudioCodec.reset(CDVDFactoryCodec::CreateAudioCodec(hint, m_processInfo, false, false, CAEStreamInfo::STREAM_TYPE_NULL));
-
-  if (!m_pAudioCodec)
-  {
-    CLog::Log(LOGERROR, "RetroPlayerAudio: Failed to create audio codec (codec=%d, samplerate=%u)", codec, samplerate);
-    return false;
-  }
-
-  return true;
+  return true; //! @todo
 }
 
 void CRetroPlayerAudio::AddData(const uint8_t* data, unsigned int size)
 {
   if (m_bAudioEnabled)
   {
-    if (m_pAudioCodec)
-    {
-      DemuxPacket packet(const_cast<uint8_t*>(data), size, DVD_NOPTS_VALUE, DVD_NOPTS_VALUE);
-      int consumed = m_pAudioCodec->AddData(packet);
-      if (consumed < 0)
-      {
-        CLog::Log(LOGERROR, "CRetroPlayerAudio::AddData - Decode Error (%d)", consumed);
-        m_pAudioCodec.reset();
-        return;
-      }
-
-      DVDAudioFrame audioframe;
-      m_pAudioCodec->GetData(audioframe);
-
-      if (audioframe.nb_frames != 0)
-      {
-        // Open audio stream if not already open
-        if (!m_pAudioStream)
-        {
-          const AEAudioFormat& format = audioframe.format;
-          if (!OpenPCMStream(format.m_dataFormat, format.m_sampleRate, format.m_channelLayout))
-            m_pAudioCodec.reset();
-        }
-
-        if (m_pAudioStream)
-          m_pAudioStream->AddData(audioframe.data, 0, audioframe.nb_frames);
-      }
-    }
-    else if (m_pAudioStream)
+    if (m_pAudioStream)
     {
       const unsigned int frameSize = m_pAudioStream->GetChannelCount() * (CAEUtil::DataFormatToBits(m_pAudioStream->GetDataFormat()) >> 3);
       m_pAudioStream->AddData(&data, 0, size / frameSize);
@@ -174,11 +121,6 @@ void CRetroPlayerAudio::AddData(const uint8_t* data, unsigned int size)
 
 void CRetroPlayerAudio::CloseStream()
 {
-  if (m_pAudioCodec)
-  {
-    m_pAudioCodec->Dispose();
-    m_pAudioCodec.reset();
-  }
   if (m_pAudioStream)
   {
     CServiceBroker::GetActiveAE().FreeStream(m_pAudioStream);

xbmc/cores/RetroPlayer/RetroPlayerAudio.h

@@ -23,18 +23,18 @@
 
 #include <memory>
 
-class CDVDAudioCodec;
-class CProcessInfo;
 class IAEStream;
 
 namespace KODI
 {
 namespace RETRO
 {
+  class CRPProcessInfo;
+
   class CRetroPlayerAudio : public GAME::IGameAudioCallback
   {
   public:
-    explicit CRetroPlayerAudio(CProcessInfo& processInfo);
+    explicit CRetroPlayerAudio(CRPProcessInfo& processInfo);
     ~CRetroPlayerAudio() override;
 
     // implementation of IGameAudioCallback
@@ -47,9 +47,8 @@ namespace RETRO
     void Enable(bool bEnabled) { m_bAudioEnabled = bEnabled; }
 
   private:
-    CProcessInfo& m_processInfo;
+    CRPProcessInfo& m_processInfo;
     IAEStream* m_pAudioStream;
-    std::unique_ptr<CDVDAudioCodec> m_pAudioCodec;
     bool       m_bAudioEnabled;
   };
 }

xbmc/cores/RetroPlayer/RetroPlayerVideo.cpp

@@ -19,17 +19,14 @@
  */
 
 #include "RetroPlayerVideo.h"
-#include "RetroPlayerDefines.h"
+#include "cores/RetroPlayer/process/RPProcessInfo.h"
 #include "cores/RetroPlayer/rendering/RPRenderManager.h"
-#include "cores/VideoPlayer/Process/ProcessInfo.h" //! @todo
 #include "utils/log.h"
 
-#include <atomic> //! @todo
-
 using namespace KODI;
 using namespace RETRO;
 
-CRetroPlayerVideo::CRetroPlayerVideo(CRPRenderManager& renderManager, CProcessInfo& processInfo) :
+CRetroPlayerVideo::CRetroPlayerVideo(CRPRenderManager& renderManager, CRPProcessInfo& processInfo) :
   m_renderManager(renderManager),
   m_processInfo(processInfo)
 {
@@ -46,16 +43,15 @@ bool CRetroPlayerVideo::OpenPixelStream(AVPixelFormat pixfmt, unsigned int width
 {
   CLog::Log(LOGINFO, "RetroPlayerVideo: Creating video stream with pixel format: %i, %dx%d", pixfmt, width, height);
 
-  //! @todo
-  //m_processInfo.SetVideoPixelFormat(CDVDVideoCodecFFmpeg::GetPixelFormatName(pixfmt));
+  m_processInfo.SetVideoPixelFormat(pixfmt);
   m_processInfo.SetVideoDimensions(width, height);
 
   return m_renderManager.Configure(pixfmt, width, height, orientationDeg);
 }
 
 bool CRetroPlayerVideo::OpenEncodedStream(AVCodecID codec)
 {
-  return false;
+  return false; //! @todo
 }
 
 void CRetroPlayerVideo::AddData(const uint8_t* data, unsigned int size)

xbmc/cores/RetroPlayer/RetroPlayerVideo.h

@@ -22,18 +22,18 @@
 #include "games/addons/GameClientCallbacks.h"
 
 class CPixelConverter;
-class CProcessInfo;
 
 namespace KODI
 {
 namespace RETRO
 {
+  class CRPProcessInfo;
   class CRPRenderManager;
 
   class CRetroPlayerVideo : public GAME::IGameVideoCallback
   {
   public:
-    CRetroPlayerVideo(CRPRenderManager& m_renderManager, CProcessInfo& m_processInfo);
+    CRetroPlayerVideo(CRPRenderManager& m_renderManager, CRPProcessInfo& m_processInfo);
 
     ~CRetroPlayerVideo() override;
 
@@ -46,7 +46,7 @@ namespace RETRO
   private:
     // Construction parameters
     CRPRenderManager& m_renderManager;
-    CProcessInfo&   m_processInfo;
+    CRPProcessInfo&   m_processInfo;
   };
 }
 }

xbmc/cores/RetroPlayer/process/CMakeLists.txt

@@ -0,0 +1,7 @@
+set(SOURCES RPProcessInfo.cpp
+)
+
+set(HEADERS RPProcessInfo.h
+)
+
+core_add_library(rp-process)