Code cleanup: remove old ffmpeg decoder

What's done:
- remove old decoder
- namespace PlaybackEngineInternal seems to be not needed, so
  it's removed
- some minor clean up with unique_ptr usage
- logic is not changed

Pick-to: 6.5
Change-Id: I5089c87ef4c424930bca96d5f2935bfd88c20f5f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>

1 files changed, 2 insertions, 10 deletions

diff --git a/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h b/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h
index 979717113..48e939f82 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h
+++ b/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h
@@ -48,6 +48,7 @@
 #include "playbackengine/qffmpegplaybackenginedefs_p.h"
 #include "playbackengine/qffmpegtimecontroller_p.h"
 #include "playbackengine/qffmpegmediadataholder_p.h"
+#include "playbackengine/qffmpegcodec_p.h"
 
 #include <unordered_map>
 
@@ -61,7 +62,7 @@ class QFFmpegMediaPlayer;
 namespace QFFmpeg
 {
 
-class PlaybackEngine : public QObject, protected PlaybackEngineInternal::MediaDataHolder
+class PlaybackEngine : public QObject, protected MediaDataHolder
 {
     Q_OBJECT
 public:
@@ -115,15 +116,6 @@ signals:
     void errorOccured(int, const QString &);
 
 protected: // objects managing
-    using Demuxer = PlaybackEngineInternal::Demuxer;
-    using PlaybackEngineObject = PlaybackEngineInternal::PlaybackEngineObject;
-    using Renderer = PlaybackEngineInternal::Renderer;
-    using AudioRenderer = PlaybackEngineInternal::AudioRenderer;
-    using VideoRenderer = PlaybackEngineInternal::VideoRenderer;
-    using SubtitleRenderer = PlaybackEngineInternal::SubtitleRenderer;
-    using StreamDecoder = PlaybackEngineInternal::StreamDecoder;
-    using TimeController = PlaybackEngineInternal::TimeController;
-
     struct ObjectDeleter
     {
         void operator()(PlaybackEngineObject *) const;