From 085c424cf923f8a2886dbfaf7be71b1c38d28101 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Sun, 17 Oct 2021 04:56:04 +0800 Subject: [PATCH] framereader: remove swscale (#22578) --- selfdrive/ui/SConscript | 2 +- selfdrive/ui/replay/framereader.cc | 8 -------- selfdrive/ui/replay/framereader.h | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index c5bdced7ac..bfbf2c06d5 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -111,7 +111,7 @@ if arch in ['x86_64', 'Darwin'] and os.path.exists(Dir("#tools/").get_abspath()) replay_lib_src = ["replay/replay.cc", "replay/camera.cc", "replay/logreader.cc", "replay/framereader.cc", "replay/route.cc", "replay/util.cc"] replay_lib = qt_env.Library("qt_replay", replay_lib_src, LIBS=base_libs) - replay_libs = [replay_lib, 'avutil', 'avcodec', 'avformat', 'swscale', 'bz2', 'curl', 'yuv'] + qt_libs + replay_libs = [replay_lib, 'avutil', 'avcodec', 'avformat', 'bz2', 'curl', 'yuv'] + qt_libs qt_env.Program("replay/replay", ["replay/main.cc"], LIBS=replay_libs) qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs) diff --git a/selfdrive/ui/replay/framereader.cc b/selfdrive/ui/replay/framereader.cc index 8f578835d0..4915dd9e87 100644 --- a/selfdrive/ui/replay/framereader.cc +++ b/selfdrive/ui/replay/framereader.cc @@ -57,9 +57,6 @@ FrameReader::~FrameReader() { if (pFormatCtx_) { avformat_close_input(&pFormatCtx_); } - if (sws_ctx_) { - sws_freeContext(sws_ctx_); - } } bool FrameReader::load(const std::string &url) { @@ -86,11 +83,6 @@ bool FrameReader::load(const std::string &url) { width = pCodecCtxOrig->width; height = pCodecCtxOrig->height; - sws_ctx_ = sws_getContext(width, height, AV_PIX_FMT_YUV420P, - width, height, AV_PIX_FMT_BGR24, - SWS_BILINEAR, NULL, NULL, NULL); - if (!sws_ctx_) return false; - frames_.reserve(60 * 20); // 20fps, one minute do { Frame &frame = frames_.emplace_back(); diff --git a/selfdrive/ui/replay/framereader.h b/selfdrive/ui/replay/framereader.h index cb383e19ca..785e2fef53 100644 --- a/selfdrive/ui/replay/framereader.h +++ b/selfdrive/ui/replay/framereader.h @@ -12,7 +12,6 @@ extern "C" { #include #include -#include } class FrameReader { @@ -41,7 +40,6 @@ private: AVFormatContext *pFormatCtx_ = nullptr; AVCodecContext *pCodecCtx_ = nullptr; - struct SwsContext *sws_ctx_ = nullptr; std::mutex mutex_; std::condition_variable cv_decode_;