From d29ad97a7db8a3adea503a955965fbdcf664efcc Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 17 Nov 2017 14:42:39 +0100 Subject: [PATCH 1/2] add dependency to libswscale for armbox Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a9c11c538fef9a29bbd4ec7b2ac882a7df085ac3 Author: Jacek Jendrzej Date: 2017-11-17 (Fri, 17 Nov 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 5 +++++ src/Makefile.am | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index e3b5e1d34..b476e1633 100644 --- a/configure.ac +++ b/configure.ac @@ -134,6 +134,11 @@ TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng) TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat) TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec) TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil) + +if test "$BOXTYPE" = "armbox"; then +TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale) +fi + if test "$BOXTYPE" = "coolstream"; then TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray) fi diff --git a/src/Makefile.am b/src/Makefile.am index 7a96ccf5a..f29ffed37 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -194,6 +194,10 @@ neutrino_LDADD += \ @AVUTIL_LIBS@ \ @AVCODEC_LIBS@ +if BOXTYPE_ARMBOX +neutrino_LDADD += @SWSCALE_LIBS@ +endif + if BOXMODEL_RASPI neutrino_LDADD += \ -L/opt/vc/lib/ -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt From 856057de6be003a5ed66ed27aa4be78aa0becf0f Mon Sep 17 00:00:00 2001 From: FlatTV Date: Mon, 13 Nov 2017 19:13:16 +0100 Subject: [PATCH 2/2] capmt.cpp: Fix stop decoding don't stop decoding if record stops, this break overlapped record on cst Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1f86b6aa629c8476b6c26e26fc6904b95e0cc25e Author: FlatTV Date: 2017-11-13 (Mon, 13 Nov 2017) ------------------ This commit was generated by Migit --- src/zapit/src/capmt.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index 5c41da4c3..56fc0045a 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -285,9 +285,8 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start mode, start ? "START" : "STOP", source, oldmask, newmask, force_update, rmode); //INFO("source %d old mask %d new mask %d force update %s", source, oldmask, newmask, force_update ? "yes" : "no"); - - /* stop decoding if record stops unless it's the live channel. TODO:PIP? */ #if ! HAVE_COOL_HARDWARE + /* stop decoding if record stops unless it's the live channel. TODO:PIP? */ /* all the modes: RECORD, STREAM, PIP except PLAY now stopping here !! */ if (mode && start == false && source != cDemux::GetSource(0)) { INFO("MODE not PLAY:(%d) start=false, src %d getsrc %d", mode, source, cDemux::GetSource(0)); @@ -300,12 +299,6 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start channel_map.erase(channel_id); } } -#else - if (mode == RECORD && start == false && source != cDemux::GetSource(0)) { - INFO("MODE!=record(%d) start=false, src %d getsrc %d", mode, source, cDemux::GetSource(0)); - cam->sendMessage(NULL, 0, false); - cam->sendCaPmt(channel->getChannelID(), NULL, 0, CA_SLOT_TYPE_ALL); - } #endif if((oldmask != newmask) || force_update) {