move c++ framereader to selfdrive/ui/replay (#21053)

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

selfdrive/ui/replay/filereader.cc

@@ -2,8 +2,6 @@
 
 #include <QtNetwork>
 
-#include "tools/clib/framereader.h"
-
 FileReader::FileReader(const QString& file_) : file(file_) {
 }
 

selfdrive/ui/replay/framereader.cc

@@ -1,4 +1,4 @@
-#include "tools/clib/framereader.h"
+#include "selfdrive/ui/replay/framereader.h"
 
 #include <assert.h>
 #include <unistd.h>
@@ -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);
 

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;

tools/clib/.gitignore

@@ -1 +0,0 @@
-cframereader.cpp

tools/clib/SConscript

@@ -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'])
-

tools/clib/cframereader.pyx

@@ -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)
-