From 42d06e7a7af5f932632c52813775458628ea4506 Mon Sep 17 00:00:00 2001 From: phunkyfish Date: Thu, 30 Jan 2020 20:51:24 +0000 Subject: [PATCH] cleanup logging --- inputstream.ffmpegdirect/addon.xml.in | 5 ++++- inputstream.ffmpegdirect/changelog.txt | 3 +++ src/StreamManager.cpp | 2 +- src/stream/FFmpegCatchupStream.cpp | 18 +++++++++--------- src/stream/FFmpegStream.cpp | 5 +---- src/stream/commons/Exception.cpp | 2 +- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/inputstream.ffmpegdirect/addon.xml.in b/inputstream.ffmpegdirect/addon.xml.in index 1b9042a1..b5e52918 100644 --- a/inputstream.ffmpegdirect/addon.xml.in +++ b/inputstream.ffmpegdirect/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -17,6 +17,9 @@ InputStream Client for streams that can be opened by FFmpeg's libavformat such as plain TS, HLS and DASH (without DRM) streams. The addon also has support for Archive/Catchup services where there is a replay windows (usually in days) and can timeshift across that span. For documenation visit: https://github.com/xbmc/inputstream.ffmpegdirect/blob/Matrix/README.md @PLATFORM@ +v1.4.1 +- Update: Cleanup logging + v1.4.0 - Added: gnutls patch to add libdl to support newer OSes - Added: Add support for mms and rtp/udp streams with sources diff --git a/inputstream.ffmpegdirect/changelog.txt b/inputstream.ffmpegdirect/changelog.txt index 552730c4..c35664ff 100644 --- a/inputstream.ffmpegdirect/changelog.txt +++ b/inputstream.ffmpegdirect/changelog.txt @@ -1,3 +1,6 @@ +v1.4.1 +- Update: Cleanup logging + v1.4.0 - Added: gnutls patch to add libdl to support newer OSes - Added: Add support for mms and rtp/udp streams with sources diff --git a/src/StreamManager.cpp b/src/StreamManager.cpp index 2422ecb5..2a9d61ce 100644 --- a/src/StreamManager.cpp +++ b/src/StreamManager.cpp @@ -200,7 +200,7 @@ void CInputStreamLibavformat::DemuxSetSpeed(int speed) void CInputStreamLibavformat::SetVideoResolution(int width, int height) { - Log(LOGLEVEL_NOTICE, "inputstream.ffmpegdirect: SetVideoResolution()"); + Log(LOGLEVEL_DEBUG, "inputstream.ffmpegdirect: SetVideoResolution()"); m_videoWidth = width; m_videoHeight = height; diff --git a/src/stream/FFmpegCatchupStream.cpp b/src/stream/FFmpegCatchupStream.cpp index f807618e..c4b08d49 100644 --- a/src/stream/FFmpegCatchupStream.cpp +++ b/src/stream/FFmpegCatchupStream.cpp @@ -141,13 +141,13 @@ int64_t FFmpegCatchupStream::SeekStream(int64_t position, int whence /* SEEK_SET int64_t ret = -1; if (m_catchupBufferStartTime > 0) { - Log(LOGLEVEL_NOTICE, "SeekLiveStream - iPosition = %lld, iWhence = %d", position, whence); + Log(LOGLEVEL_DEBUG, "SeekLiveStream - iPosition = %lld, iWhence = %d", position, whence); const time_t timeNow = time(0); switch (whence) { case SEEK_SET: { - Log(LOGLEVEL_NOTICE, "SeekLiveStream - SeekSet: %lld", static_cast(position)); + Log(LOGLEVEL_DEBUG, "SeekLiveStream - SeekSet: %lld", static_cast(position)); position += 500; position /= 1000; if (m_catchupBufferStartTime + position < timeNow - 10) @@ -170,12 +170,12 @@ int64_t FFmpegCatchupStream::SeekStream(int64_t position, int whence /* SEEK_SET case SEEK_CUR: { int64_t offset = m_catchupBufferOffset; - //Log(LOGLEVEL_NOTICE, "SeekLiveStream - timeNow = %d, startTime = %d, iTvgShift = %d, offset = %d", timeNow, m_catchupStartTime, m_programmeChannelTvgShift, offset); + //Log(LOGLEVEL_DEBUG, "SeekLiveStream - timeNow = %d, startTime = %d, iTvgShift = %d, offset = %d", timeNow, m_catchupStartTime, m_programmeChannelTvgShift, offset); ret = offset * DVD_TIME_BASE; } break; default: - Log(LOGLEVEL_NOTICE, "SeekLiveStream - Unsupported SEEK command (%d)", whence); + Log(LOGLEVEL_DEBUG, "SeekLiveStream - Unsupported SEEK command (%d)", whence); break; } } @@ -192,7 +192,7 @@ int64_t FFmpegCatchupStream::LengthStream() length = static_cast(times.ptsEnd - times.ptsBegin); } - Log(LOGLEVEL_NOTICE, "LengthLiveStream: %lld", static_cast(length)); + Log(LOGLEVEL_DEBUG, "LengthLiveStream: %lld", static_cast(length)); return length; } @@ -211,9 +211,9 @@ bool FFmpegCatchupStream::GetTimes(INPUTSTREAM_TIMES& times) else // it's like a video times.ptsEnd = static_cast(std::min(dateTimeNow, m_catchupBufferEndTime) - times.startTime) * DVD_TIME_BASE; - // Log(LOGLEVEL_NOTICE, "GetStreamTimes - Ch = %u \tTitle = \"%s\" \tepgTag->startTime = %ld \tepgTag->endTime = %ld", + // Log(LOGLEVEL_DEBUG, "GetStreamTimes - Ch = %u \tTitle = \"%s\" \tepgTag->startTime = %ld \tepgTag->endTime = %ld", // m_programmeUniqueChannelId, m_programmeTitle.c_str(), m_catchupBufferStartTime, m_catchupBufferEndTime); - Log(LOGLEVEL_NOTICE, "GetStreamTimes - startTime = %ld \tptsStart = %lld \tptsBegin = %lld \tptsEnd = %lld", + Log(LOGLEVEL_DEBUG, "GetStreamTimes - startTime = %ld \tptsStart = %lld \tptsBegin = %lld \tptsEnd = %lld", times.startTime, static_cast(times.ptsStart), static_cast(times.ptsBegin), static_cast(times.ptsEnd)); return true; @@ -312,7 +312,7 @@ std::string FormatDateTime(time_t dateTimeEpg, time_t duration, const std::strin FormatUtc("{duration}", duration, fomrattedUrl); FormatOffset(dateTimeNow - dateTimeEpg, fomrattedUrl); - Log(LOGLEVEL_NOTICE, "CArchiveConfig::FormatDateTime - \"%s\"", fomrattedUrl.c_str()); + Log(LOGLEVEL_DEBUG, "CArchiveConfig::FormatDateTime - \"%s\"", fomrattedUrl.c_str()); return fomrattedUrl; } @@ -330,7 +330,7 @@ std::string FFmpegCatchupStream::GetUpdatedCatchupUrl() const if (m_programmeStartTime > 0 && m_programmeStartTime < m_programmeEndTime) duration = m_programmeEndTime - m_programmeStartTime; - Log(LOGLEVEL_NOTICE, "Offset Time - \"%lld\" - %s", static_cast(offset), m_catchupUrlFormatString.c_str()); + Log(LOGLEVEL_DEBUG, "Offset Time - \"%lld\" - %s", static_cast(offset), m_catchupUrlFormatString.c_str()); std::string catchupUrl = FormatDateTime(offset - m_timezoneShift, duration, m_catchupUrlFormatString); if (!catchupUrl.empty()) diff --git a/src/stream/FFmpegStream.cpp b/src/stream/FFmpegStream.cpp index 498b00f0..95ea752a 100644 --- a/src/stream/FFmpegStream.cpp +++ b/src/stream/FFmpegStream.cpp @@ -126,9 +126,7 @@ bool FFmpegStream::Open(const std::string& streamUrl, const std::string& mimeTyp // checkStreamInfo = false; // } -Log(LOGLEVEL_NOTICE, "AttemptOpen"); m_opened = Open(checkStreamInfo); -Log(LOGLEVEL_NOTICE, "AttemptOpen %d", m_opened); return m_opened; } @@ -187,7 +185,7 @@ INPUTSTREAM_INFO FFmpegStream::GetStream(int streamid) 0, 0, 0, 0, 0, CRYPTO_INFO::CRYPTO_KEY_SYSTEM_NONE ,0 ,0 ,0}; - Log(LOGLEVEL_NOTICE, "GetStream(%d)", streamid); + Log(LOGLEVEL_DEBUG, "GetStream(%d)", streamid); DemuxStream* stream = nullptr; auto streamPair = m_streams.find(streamid); @@ -308,7 +306,6 @@ DemuxPacket* FFmpegStream::DemuxRead() if (IsProgramChange()) { - Log(LOGLEVEL_NOTICE, "CDVDDemuxFFmpeg::Read() stream change XXXXX"); av_dump_format(m_pFormatContext, 0, CURL::GetRedacted(m_streamUrl).c_str(), 0); // update streams diff --git a/src/stream/commons/Exception.cpp b/src/stream/commons/Exception.cpp index 593ff16c..3f22ef45 100644 --- a/src/stream/commons/Exception.cpp +++ b/src/stream/commons/Exception.cpp @@ -16,7 +16,7 @@ namespace XbmcCommons void Exception::LogThrowMessage(const char* prefix) const { - Log(LOGLEVEL_ERROR,"EXCEPTION Thrown (%s) : %s", classname.c_str(), message.c_str()); + Log(LOGLEVEL_ERROR, "EXCEPTION Thrown (%s) : %s", classname.c_str(), message.c_str()); } }