From a436b51e849093f2e0b355ee2f730a915fb7f60d Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Fri, 28 May 2021 07:00:11 +0800 Subject: [PATCH] move c++ framereader to selfdrive/ui/replay (#21053) old-commit-hash: bb5bcc7e49b8a1ae04e951ffc03848432edd8859 --- selfdrive/ui/SConscript | 3 +-- selfdrive/ui/replay/filereader.cc | 2 -- .../ui/replay}/framereader.cc | 5 +++-- .../ui/replay}/framereader.h | 0 selfdrive/ui/replay/replay.h | 2 +- tools/clib/.gitignore | 1 - tools/clib/SConscript | 8 -------- tools/clib/cframereader.pyx | 20 ------------------- 8 files changed, 5 insertions(+), 36 deletions(-) rename {tools/clib => selfdrive/ui/replay}/framereader.cc (97%) rename {tools/clib => selfdrive/ui/replay}/framereader.h (100%) delete mode 100644 tools/clib/.gitignore delete mode 100644 tools/clib/SConscript delete mode 100644 tools/clib/cframereader.pyx diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index c9fe988ca9..ec1867e9ff 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -74,10 +74,9 @@ if arch != 'aarch64' and "BUILD_SETUP" in os.environ: # build headless replay if arch == 'x86_64' and os.path.exists(Dir("#tools/").get_abspath()): - qt_env['CPPPATH'] += ["#tools/clib"] qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"] - replay_lib_src = ["replay/replay.cc", "replay/filereader.cc", "#tools/clib/framereader.cc"] + replay_lib_src = ["replay/replay.cc", "replay/filereader.cc", "replay/framereader.cc"] replay_lib = qt_env.Library("qt_replay", replay_lib_src, LIBS=base_libs) replay_libs = [replay_lib, 'avutil', 'avcodec', 'avformat', 'swscale', 'bz2'] + qt_libs diff --git a/selfdrive/ui/replay/filereader.cc b/selfdrive/ui/replay/filereader.cc index dd0f8c2429..2a16983032 100644 --- a/selfdrive/ui/replay/filereader.cc +++ b/selfdrive/ui/replay/filereader.cc @@ -2,8 +2,6 @@ #include -#include "tools/clib/framereader.h" - FileReader::FileReader(const QString& file_) : file(file_) { } diff --git a/tools/clib/framereader.cc b/selfdrive/ui/replay/framereader.cc similarity index 97% rename from tools/clib/framereader.cc rename to selfdrive/ui/replay/framereader.cc index f4bc63701b..f921041c92 100644 --- a/tools/clib/framereader.cc +++ b/selfdrive/ui/replay/framereader.cc @@ -1,4 +1,4 @@ -#include "tools/clib/framereader.h" +#include "selfdrive/ui/replay/framereader.h" #include #include @@ -79,7 +79,8 @@ void FrameReader::process() { delete pkt; break; } - Frame *frame = new Frame{.pkt = pkt}; + Frame *frame = new Frame; + frame->pkt = pkt; frames.push_back(frame); } while (true); diff --git a/tools/clib/framereader.h b/selfdrive/ui/replay/framereader.h similarity index 100% rename from tools/clib/framereader.h rename to selfdrive/ui/replay/framereader.h diff --git a/selfdrive/ui/replay/replay.h b/selfdrive/ui/replay/replay.h index 7b86ee2ece..11d634108d 100644 --- a/selfdrive/ui/replay/replay.h +++ b/selfdrive/ui/replay/replay.h @@ -12,7 +12,7 @@ #include "selfdrive/common/util.h" #include "selfdrive/ui/qt/api.h" #include "selfdrive/ui/replay/filereader.h" -#include "tools/clib/framereader.h" +#include "selfdrive/ui/replay/framereader.h" constexpr int FORWARD_SEGS = 2; diff --git a/tools/clib/.gitignore b/tools/clib/.gitignore deleted file mode 100644 index ae8a795a92..0000000000 --- a/tools/clib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -cframereader.cpp diff --git a/tools/clib/SConscript b/tools/clib/SConscript deleted file mode 100644 index 278df02585..0000000000 --- a/tools/clib/SConscript +++ /dev/null @@ -1,8 +0,0 @@ -Import('env') -from sysconfig import get_paths -env['CPPPATH'] += [get_paths()['include']] - -from Cython.Build import cythonize -cythonize("cframereader.pyx") -env.SharedLibrary(File('cframereader.so'), ['cframereader.cpp', 'framereader.cc'], LIBS=['avformat', 'avcodec', 'avutil', 'swscale']) - diff --git a/tools/clib/cframereader.pyx b/tools/clib/cframereader.pyx deleted file mode 100644 index ecf5057b68..0000000000 --- a/tools/clib/cframereader.pyx +++ /dev/null @@ -1,20 +0,0 @@ -# distutils: language = c++ -# cython: language_level=3 - -cdef extern from "framereader.h": - cdef cppclass CFrameReader "FrameReader": - CFrameReader(const char *) - char *get(int) - -cdef class FrameReader(): - cdef CFrameReader *fr - - def __cinit__(self, fn): - self.fr = new CFrameReader(fn) - - def __dealloc__(self): - del self.fr - - def get(self, idx): - self.fr.get(idx) -