diff -Nru kodi-inputstream-ffmpegdirect-1.19.2/CMakeLists.txt kodi-inputstream-ffmpegdirect-1.19.3/CMakeLists.txt --- kodi-inputstream-ffmpegdirect-1.19.2/CMakeLists.txt 2020-04-14 07:35:47.000000000 +0000 +++ kodi-inputstream-ffmpegdirect-1.19.3/CMakeLists.txt 2020-04-14 07:35:47.000000000 +0000 @@ -14,43 +14,43 @@ find_package(ZLIB REQUIRED) find_package(BZip2 REQUIRED) -set(CATCHUP_SOURCES src/StreamManager.cpp - src/stream/DemuxStream.cpp - src/stream/FFmpegCatchupStream.cpp - src/stream/FFmpegLog.cpp - src/stream/FFmpegStream.cpp - src/stream/CurlCatchupInput.cpp - src/stream/CurlInput.cpp - src/stream/TimeshiftBuffer.cpp - src/stream/TimeshiftSegment.cpp - src/stream/TimeshiftStream.cpp - src/stream/url/URL.cpp - src/stream/url/UrlOptions.cpp - src/stream/url/Variant.cpp - src/utils/DiskUtils.cpp - src/utils/FilenameUtils.cpp) - -set(CATCHUP_HEADERS src/StreamManager.h - src/stream/BaseStream.h - src/stream/DemuxStream.h - src/stream/FFmpegCatchupStream.h - src/stream/FFmpegLog.h - src/stream/FFmpegStream.h - src/stream/CurlCatchupInput.h - src/stream/CurlInput.h - src/stream/IManageDemuxPacket.h - src/stream/TimeshiftBuffer.h - src/stream/TimeshiftSegment.h - src/stream/TimeshiftStream.h - src/utils/HttpProxy.h - src/utils/DiskUtils.h - src/utils/FilenameUtils.h - src/utils/Log.h - src/utils/Properties.h - src/utils/TimeUtils.h - src/stream/url/URL.h - src/stream/url/UrlOptions.h - src/stream/url/Variant.h) +set(FFMPEGDIRECT_SOURCES src/StreamManager.cpp + src/stream/DemuxStream.cpp + src/stream/FFmpegCatchupStream.cpp + src/stream/FFmpegLog.cpp + src/stream/FFmpegStream.cpp + src/stream/CurlCatchupInput.cpp + src/stream/CurlInput.cpp + src/stream/TimeshiftBuffer.cpp + src/stream/TimeshiftSegment.cpp + src/stream/TimeshiftStream.cpp + src/stream/url/URL.cpp + src/stream/url/UrlOptions.cpp + src/stream/url/Variant.cpp + src/utils/DiskUtils.cpp + src/utils/FilenameUtils.cpp) + +set(FFMPEGDIRECT_HEADERS src/StreamManager.h + src/stream/BaseStream.h + src/stream/DemuxStream.h + src/stream/FFmpegCatchupStream.h + src/stream/FFmpegLog.h + src/stream/FFmpegStream.h + src/stream/CurlCatchupInput.h + src/stream/CurlInput.h + src/stream/IManageDemuxPacket.h + src/stream/TimeshiftBuffer.h + src/stream/TimeshiftSegment.h + src/stream/TimeshiftStream.h + src/utils/HttpProxy.h + src/utils/DiskUtils.h + src/utils/FilenameUtils.h + src/utils/Log.h + src/utils/Properties.h + src/utils/TimeUtils.h + src/stream/url/URL.h + src/stream/url/UrlOptions.h + src/stream/url/Variant.h) include_directories(${INCLUDES} ${FFMPEG_INCLUDE_DIRS} @@ -101,10 +101,10 @@ list(APPEND DEPLIBS ${FFMPEG_LIBRARIES}) endif() -addon_version(inputstream.ffmpegdirect CATCHUP) -add_definitions(-DCATCHUP_VERSION=${CATCHUP_VERSION}) +addon_version(inputstream.ffmpegdirect FFMPEGDIRECT) +add_definitions(-DFFMPEGDIRECT_VERSION=${FFMPEGDIRECT_VERSION}) -build_addon(inputstream.ffmpegdirect CATCHUP DEPLIBS) +build_addon(inputstream.ffmpegdirect FFMPEGDIRECT DEPLIBS) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # Due to a bug in CMake and frameworks on OSX we strip them from FFMPEG_LDFLAGS diff -Nru kodi-inputstream-ffmpegdirect-1.19.2/debian/changelog kodi-inputstream-ffmpegdirect-1.19.3/debian/changelog --- kodi-inputstream-ffmpegdirect-1.19.2/debian/changelog 2020-04-14 07:35:47.000000000 +0000 +++ kodi-inputstream-ffmpegdirect-1.19.3/debian/changelog 2020-04-14 07:35:47.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-inputstream-ffmpegdirect (1.19.2-1~focal) focal; urgency=low +kodi-inputstream-ffmpegdirect (1.19.3-1~focal) focal; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-inputstream-ffmpegdirect-1.19.2/inputstream.ffmpegdirect/addon.xml.in kodi-inputstream-ffmpegdirect-1.19.3/inputstream.ffmpegdirect/addon.xml.in --- kodi-inputstream-ffmpegdirect-1.19.2/inputstream.ffmpegdirect/addon.xml.in 2020-04-14 07:35:47.000000000 +0000 +++ kodi-inputstream-ffmpegdirect-1.19.3/inputstream.ffmpegdirect/addon.xml.in 2020-04-14 07:35:47.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -26,6 +26,10 @@ fanart.jpg +v1.19.3 +- Update: move verbose playback timeshift logging to debug level +- Update: Update cmakelists to reference FFMPEGDIRECT at build time + v1.19.2 - Update: Demuxer additions from kodi diff -Nru kodi-inputstream-ffmpegdirect-1.19.2/inputstream.ffmpegdirect/changelog.txt kodi-inputstream-ffmpegdirect-1.19.3/inputstream.ffmpegdirect/changelog.txt --- kodi-inputstream-ffmpegdirect-1.19.2/inputstream.ffmpegdirect/changelog.txt 2020-04-14 07:35:47.000000000 +0000 +++ kodi-inputstream-ffmpegdirect-1.19.3/inputstream.ffmpegdirect/changelog.txt 2020-04-14 07:35:47.000000000 +0000 @@ -1,3 +1,7 @@ +v1.19.3 +- Update: move verbose playback timeshift logging to debug level +- Update: Update cmakelists to reference FFMPEGDIRECT at build time + v1.19.2 - Update: Demuxer additions from kodi diff -Nru kodi-inputstream-ffmpegdirect-1.19.2/src/stream/TimeshiftBuffer.cpp kodi-inputstream-ffmpegdirect-1.19.3/src/stream/TimeshiftBuffer.cpp --- kodi-inputstream-ffmpegdirect-1.19.2/src/stream/TimeshiftBuffer.cpp 2020-04-14 07:35:47.000000000 +0000 +++ kodi-inputstream-ffmpegdirect-1.19.3/src/stream/TimeshiftBuffer.cpp 2020-04-14 07:35:47.000000000 +0000 @@ -128,7 +128,7 @@ std::shared_ptr m_previousWriteSegment = m_writeSegment; m_previousWriteSegment->MarkAsComplete(); - Log(LOGLEVEL_INFO, "%s - Writing new segment - seconds: %d, last seg seconds: %d, last seg packet count: %d, new seg index: %d, pts %.2f, dts: %.2f, pts sec: %.0f, dts sec: %.0f", + Log(LOGLEVEL_DEBUG, "%s - Writing new segment - seconds: %d, last seg seconds: %d, last seg packet count: %d, new seg index: %d, pts %.2f, dts: %.2f, pts sec: %.0f, dts sec: %.0f", __FUNCTION__, secondsSinceStart, m_lastSegmentSecondsSinceStart, m_previousWriteSegment->GetPacketCount(), m_currentSegmentIndex, packet->pts, packet->dts, packet->pts / STREAM_TIME_BASE, packet->dts / STREAM_TIME_BASE); @@ -176,7 +176,7 @@ if (kodi::vfs::FileExists(m_timeshiftBufferPath + "/" + segmentFilename)) { kodi::vfs::DeleteFile(m_timeshiftBufferPath + "/" + segmentFilename); - Log(LOGLEVEL_INFO, "%s - Removed oldest on disk segment with ID: %d - currentDemuxTimeSeconds: %d, min on disk time: %d", __FUNCTION__, m_earliestOnDiskSegmentId, m_currentDemuxTimeIndex, m_minOnDiskSeekTimeIndex); + Log(LOGLEVEL_DEBUG, "%s - Removed oldest on disk segment with ID: %d - currentDemuxTimeSeconds: %d, min on disk time: %d", __FUNCTION__, m_earliestOnDiskSegmentId, m_currentDemuxTimeIndex, m_minOnDiskSeekTimeIndex); m_earliestOnDiskSegmentId++; m_segmentTotalCount--; @@ -214,7 +214,7 @@ m_previousReadSegment->ClearPackets(); if (m_readSegment) - Log(LOGLEVEL_INFO, "%s - Reading next segment with id: %d, packet count: %d", __FUNCTION__, m_readSegment->GetSegmentId(), m_readSegment->GetPacketCount()); + Log(LOGLEVEL_DEBUG, "%s - Reading next segment with id: %d, packet count: %d", __FUNCTION__, m_readSegment->GetSegmentId(), m_readSegment->GetPacketCount()); } if (packet && packet->pts != STREAM_NOPTS_VALUE && packet->pts > 0) @@ -248,7 +248,7 @@ else // Jump to live segment m_readSegment = m_segmentTimeIndexMap.rbegin()->second; - Log(LOGLEVEL_INFO, "%s - Buffer - SegmentID: %d, SeekSeconds: %d", __FUNCTION__, m_readSegment->GetSegmentId(), seekSeconds); + Log(LOGLEVEL_DEBUG, "%s - Buffer - SegmentID: %d, SeekSeconds: %d", __FUNCTION__, m_readSegment->GetSegmentId(), seekSeconds); m_readSegment->LoadSegment(); if (m_readSegment->Seek(timeMs)) diff -Nru kodi-inputstream-ffmpegdirect-1.19.2/src/stream/TimeshiftSegment.cpp kodi-inputstream-ffmpegdirect-1.19.3/src/stream/TimeshiftSegment.cpp --- kodi-inputstream-ffmpegdirect-1.19.2/src/stream/TimeshiftSegment.cpp 2020-04-14 07:35:47.000000000 +0000 +++ kodi-inputstream-ffmpegdirect-1.19.3/src/stream/TimeshiftSegment.cpp 2020-04-14 07:35:47.000000000 +0000 @@ -447,7 +447,7 @@ int timeIndexStart = it->first; auto it2 = m_packetTimeIndexMap.rbegin(); int timeIndexEnd = it2->first; - Log(LOGLEVEL_INFO, "%s - Seek segment packet - segment ID: %d, packet index: %d, seek seconds: %d, segment start seconds: %d, segment end seconds: %d", __FUNCTION__, m_segmentId, m_readPacketIndex, seekSeconds, timeIndexStart, timeIndexEnd); + Log(LOGLEVEL_DEBUG, "%s - Seek segment packet - segment ID: %d, packet index: %d, seek seconds: %d, segment start seconds: %d, segment end seconds: %d", __FUNCTION__, m_segmentId, m_readPacketIndex, seekSeconds, timeIndexStart, timeIndexEnd); return true; }