Skip to content

Commit bd84a46

Browse files
committed
Remove old video pipeline.
1 parent 9dc87ce commit bd84a46

22 files changed

+4
-2703
lines changed

SerialPrograms/CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -457,26 +457,17 @@ file(GLOB MAIN_SOURCES
457457
Source/CommonFramework/Tools/VideoStream.h
458458
Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp
459459
Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h
460-
Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.cpp
461-
Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.h
462460
Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp
463461
Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.h
464462
Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp
465463
Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.h
466464
Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.cpp
467465
Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.h
468466
Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.h
469-
Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.cpp
470-
Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.h
471467
Source/CommonFramework/VideoPipeline/CameraInfo.h
472-
Source/CommonFramework/VideoPipeline/CameraOption.cpp
473-
Source/CommonFramework/VideoPipeline/CameraOption.h
474-
Source/CommonFramework/VideoPipeline/CameraSession.h
475468
Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.h
476469
Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.cpp
477470
Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h
478-
Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.cpp
479-
Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.h
480471
Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp
481472
Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.h
482473
Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp
@@ -485,7 +476,6 @@ file(GLOB MAIN_SOURCES
485476
Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h
486477
Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp
487478
Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.h
488-
Source/CommonFramework/VideoPipeline/UI/VideoWidget.h
489479
Source/CommonFramework/VideoPipeline/VideoFeed.h
490480
Source/CommonFramework/VideoPipeline/VideoOverlay.cpp
491481
Source/CommonFramework/VideoPipeline/VideoOverlay.h

SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
//using std::cout;
1515
//using std::endl;
1616

17-
#if QT_VERSION_MAJOR == 5
18-
#include "VideoToolsQt5.h"
19-
#include "CameraWidgetQt5.h"
20-
//#include "CameraWidgetQt5v2.h"
17+
#if 0
2118
#elif QT_VERSION_MAJOR == 6
2219
#include "CameraWidgetQt6.h"
2320
#if QT_VERSION_MINOR >= 5
@@ -53,12 +50,6 @@ struct CameraBackends{
5350
}
5451

5552
CameraBackends(){
56-
#if QT_VERSION_MAJOR == 5
57-
m_backends.emplace_back(
58-
"qt5-QCameraViewfinder", "Qt5: QCameraViewfinder",
59-
std::make_unique<CameraQt5QCameraViewfinder::CameraBackend>()
60-
);
61-
#endif
6253
#if QT_VERSION_MAJOR == 6
6354
m_backends.emplace_back(
6455
"qt6-QVideoSink", "Qt6: QVideoSink",
@@ -90,8 +81,7 @@ VideoBackendOption::VideoBackendOption()
9081
"<b>Video Pipeline Backend:</b>",
9182
CameraBackends::instance().m_database,
9283
LockMode::LOCK_WHILE_RUNNING,
93-
#if QT_VERSION_MAJOR == 5
94-
0
84+
#if 0
9585
#elif QT_VERSION_MAJOR == 6
9686
#if QT_VERSION_MINOR >= 5
9787
1

SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
#include "CommonFramework/Logging/Logger.h"
1313
#include "CommonFramework/VideoPipeline/VideoSourceDescriptor.h"
1414
#include "CommonFramework/VideoPipeline/CameraInfo.h"
15-
#include "CommonFramework/VideoPipeline/CameraSession.h"
16-
#include "CommonFramework/VideoPipeline/UI/VideoWidget.h"
1715

1816
namespace PokemonAutomation{
1917

@@ -37,7 +35,6 @@ class CameraBackend{
3735
const CameraInfo& info,
3836
Resolution resolution
3937
) const = 0;
40-
virtual std::unique_ptr<CameraSession> make_camera(Logger& logger, Resolution default_resolution) const = 0;
4138
};
4239

4340

0 commit comments

Comments
 (0)