ui/replay: file extensions to .cc and .h (#20805)

old-commit-hash: bdf4a94cd0
commatwo_master
Dean Lee 4 years ago committed by GitHub
parent 8a759792c4
commit 9159291a09
  1. 2
      selfdrive/ui/SConscript
  2. 2
      selfdrive/ui/replay/FileReader.cc
  3. 2
      selfdrive/ui/replay/FileReader.h
  4. 2
      selfdrive/ui/replay/Unlogger.h
  5. 2
      selfdrive/ui/replay/replay.h
  6. 2
      tools/clib/FrameReader.cc
  7. 2
      tools/clib/FrameReader.h
  8. 2
      tools/clib/SConscript
  9. 2
      tools/clib/cframereader.pyx
  10. 0
      tools/clib/channel.h

@ -64,7 +64,7 @@ if arch == 'x86_64' and os.path.exists(Dir("#tools/").get_abspath()):
qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"] qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"]
replay_lib_src = ["replay/replay.cc", "replay/Unlogger.cc", replay_lib_src = ["replay/replay.cc", "replay/Unlogger.cc",
"replay/FileReader.cc", "#tools/clib/FrameReader.cpp"] "replay/FileReader.cc", "#tools/clib/FrameReader.cc"]
replay_lib = qt_env.Library("qt_replay", replay_lib_src, LIBS=base_libs) replay_lib = qt_env.Library("qt_replay", replay_lib_src, LIBS=base_libs)
replay_libs = [replay_lib, 'avutil', 'avcodec', 'avformat', 'swscale', 'bz2'] + qt_libs replay_libs = [replay_lib, 'avutil', 'avcodec', 'avformat', 'swscale', 'bz2'] + qt_libs

@ -1,5 +1,5 @@
#include "FileReader.h" #include "FileReader.h"
#include "FrameReader.hpp" #include "FrameReader.h"
#include <QtNetwork> #include <QtNetwork>

@ -16,7 +16,7 @@
#include "cereal/gen/cpp/log.capnp.h" #include "cereal/gen/cpp/log.capnp.h"
#include <thread> #include <thread>
#include "channel.hpp" #include "channel.h"
class FileReader : public QObject { class FileReader : public QObject {
Q_OBJECT Q_OBJECT

@ -5,7 +5,7 @@
#include "clutil.h" #include "clutil.h"
#include "messaging.hpp" #include "messaging.hpp"
#include "FileReader.h" #include "FileReader.h"
#include "FrameReader.hpp" #include "FrameReader.h"
#include "visionipc_server.h" #include "visionipc_server.h"
class Unlogger : public QObject { class Unlogger : public QObject {

@ -11,7 +11,7 @@
#include "qt/api.h" #include "qt/api.h"
#include "Unlogger.h" #include "Unlogger.h"
#include "FileReader.h" #include "FileReader.h"
#include "FrameReader.hpp" #include "FrameReader.h"
#include "visionipc_server.h" #include "visionipc_server.h"
#include "common/util.h" #include "common/util.h"

@ -1,4 +1,4 @@
#include "FrameReader.hpp" #include "FrameReader.h"
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>

@ -9,7 +9,7 @@
#include <list> #include <list>
#include <condition_variable> #include <condition_variable>
#include "channel.hpp" #include "channel.h"
// independent of QT, needs ffmpeg // independent of QT, needs ffmpeg
extern "C" { extern "C" {

@ -4,5 +4,5 @@ env['CPPPATH'] += [get_paths()['include']]
from Cython.Build import cythonize from Cython.Build import cythonize
cythonize("cframereader.pyx") cythonize("cframereader.pyx")
env.SharedLibrary(File('cframereader.so'), ['cframereader.cpp', 'FrameReader.cpp'], LIBS=['avformat', 'avcodec', 'avutil', 'swscale']) env.SharedLibrary(File('cframereader.so'), ['cframereader.cpp', 'FrameReader.cc'], LIBS=['avformat', 'avcodec', 'avutil', 'swscale'])

@ -1,7 +1,7 @@
# distutils: language = c++ # distutils: language = c++
# cython: language_level=3 # cython: language_level=3
cdef extern from "FrameReader.hpp": cdef extern from "FrameReader.h":
cdef cppclass CFrameReader "FrameReader": cdef cppclass CFrameReader "FrameReader":
CFrameReader(const char *) CFrameReader(const char *)
char *get(int) char *get(int)

Loading…
Cancel
Save