Merge pull request #52 from phunkyfish/ffmpeg-4-3

Ffmpeg 4 3
xbmc · Jun 19, 2020 · 0a4162a · 0a4162a
2 parents 7e1ba92 + f104299
commit 0a4162a
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 252 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -104,7 +104,10 @@ if(WIN32)
                       Winmm.lib
                       WS2_32.lib
                       Bcrypt.lib
-                      Secur32.lib)
+                      Secur32.lib
+                      Mfplat.lib
+                      Mfuuid.lib
+                      Strmiids.lib)
 elseif(CORE_SYSTEM_NAME STREQUAL osx OR
        CORE_SYSTEM_NAME STREQUAL darwin_embedded)
   find_library(AUDIOTOOLBOX AudioToolbox)

diff --git a/depends/common/ffmpeg/01-ffmpeg-detect-openssl-windows.patch b/depends/common/ffmpeg/01-ffmpeg-detect-openssl-windows.patch
@@ -1,7 +1,7 @@
-diff -ur ffmpeg/configure ffmpeg-patch/configure
---- ffmpeg/configure	2020-01-31 13:00:16.000000000 +0000
-+++ ffmpeg-patch/configure	2020-01-31 13:02:44.000000000 +0000
-@@ -6358,6 +6358,8 @@
+diff -ur FFmpeg-n4.3/configure FFmpeg-n4.3-01/configure
+--- FFmpeg-n4.3/configure	2020-06-15 19:41:15.000000000 +0100
++++ FFmpeg-n4.3-01/configure	2020-06-18 09:00:30.000000000 +0100
+@@ -6468,6 +6468,8 @@
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||

diff --git a/depends/common/ffmpeg/02-ffmpeg-zlib-config-conflict-windows.patch b/depends/common/ffmpeg/02-ffmpeg-zlib-config-conflict-windows.patch
@@ -1,13 +1,13 @@
-diff -ur ffmpeg/configure ffmpeg-patch/configure
---- ffmpeg/configure	2020-01-31 13:06:00.000000000 +0000
-+++ ffmpeg-patch/configure	2020-01-31 13:06:40.000000000 +0000
-@@ -7439,6 +7439,9 @@
+diff -ur FFmpeg-n4.3-01/configure FFmpeg-n4.3-02/configure
+--- FFmpeg-n4.3-01/configure	2020-06-18 09:00:30.000000000 +0100
++++ FFmpeg-n4.3-02/configure	2020-06-18 09:05:33.000000000 +0100
+@@ -7555,6 +7555,9 @@
                                       $CONFIG_EXTRA      \
                                       $ALL_COMPONENTS    \
- 
+
 +echo "#if defined(HAVE_UNISTD_H) && HAVE_UNISTD_H == 0" >> $TMPH
 +echo "#undef HAVE_UNISTD_H" >> $TMPH
 +echo "#endif" >> $TMPH
  echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
  echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak
- 
+
diff --git a/depends/common/ffmpeg/03-ffmpeg-static-windows.patch b/depends/common/ffmpeg/03-ffmpeg-static-windows.patch
@@ -1,7 +1,7 @@
-diff -ur ffmpeg/configure ffmpeg-patch/configure
---- ffmpeg/configure	2020-01-31 13:07:30.000000000 +0000
-+++ ffmpeg-patch/configure	2020-01-31 13:08:30.000000000 +0000
-@@ -5312,6 +5312,8 @@
+diff -ur FFmpeg-n4.3-02/configure FFmpeg-n4.3-03/configure
+--- FFmpeg-n4.3-02/configure	2020-06-18 09:05:33.000000000 +0100
++++ FFmpeg-n4.3-03/configure	2020-06-18 09:12:22.000000000 +0100
+@@ -5401,6 +5401,8 @@
          enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres
          enabled x86_32 && check_ldflags -Wl,--large-address-aware
          shlibdir_default="$bindir_default"
@@ -10,7 +10,7 @@ diff -ur ffmpeg/configure ffmpeg-patch/configure
          SLIBPREF=""
          SLIBSUF=".dll"
          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
-@@ -5361,6 +5363,8 @@
+@@ -5450,6 +5452,8 @@
          fi
          enabled x86_32 && check_ldflags -LARGEADDRESSAWARE
          shlibdir_default="$bindir_default"

diff --git a/depends/common/ffmpeg/04-ffmpeg-ssl-support-both-pre-1.1.0-and-post-1.1.0-init-windows.patch b/depends/common/ffmpeg/04-ffmpeg-ssl-support-both-pre-1.1.0-and-post-1.1.0-init-windows.patch
diff --git a/depends/common/ffmpeg/05-ffmpeg-dont-use-libcrypto-locking-functions-windows.patch b/depends/common/ffmpeg/05-ffmpeg-dont-use-libcrypto-locking-functions-windows.patch
diff --git a/depends/common/ffmpeg/06-ffmpeg-rtp-sources-missing.patch b/depends/common/ffmpeg/06-ffmpeg-rtp-sources-missing.patch
diff --git a/depends/common/ffmpeg/07-ffmpeg-w32pthreads.patch b/depends/common/ffmpeg/07-ffmpeg-w32pthreads.patch
diff --git a/depends/common/ffmpeg/ffmpeg.sha256 b/depends/common/ffmpeg/ffmpeg.sha256
@@ -1 +1 @@
-5447ca061444e574dc0d5e6da1657f49a64a0e660403995c7744beee3e69b2b8
+481558577f43f38e1f85421e937f186263743df3284003980895f3d48be67efc
diff --git a/depends/common/ffmpeg/ffmpeg.txt b/depends/common/ffmpeg/ffmpeg.txt
@@ -1 +1 @@
-ffmpeg https://github.com/FFmpeg/FFmpeg/archive/n4.2.2.tar.gz
+ffmpeg https://github.com/FFmpeg/FFmpeg/archive/n4.3.tar.gz
diff --git a/inputstream.ffmpegdirect/addon.xml.in b/inputstream.ffmpegdirect/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="inputstream.ffmpegdirect"
-  version="1.14.2"
+  version="1.14.3"
   name="Inputstream FFmpeg Direct"
   provider-name="Ross Nicholson">
   <requires>@ADDON_DEPENDS@</requires>
@@ -24,6 +24,9 @@
       <fanart>fanart.jpg</fanart>
     </assets>
     <news>
+v1.14.3
+- Update: Use FFmpeg 4.3
+
 v1.14.2
 - Fixed: Debian packaging
 

diff --git a/inputstream.ffmpegdirect/changelog.txt b/inputstream.ffmpegdirect/changelog.txt
@@ -1,3 +1,6 @@
+v1.14.3
+- Update: Use FFmpeg 4.3
+
 v1.14.2
 - Fixed: Debian packaging
 

diff --git a/src/stream/TimeshiftBuffer.cpp b/src/stream/TimeshiftBuffer.cpp
@@ -111,7 +111,6 @@ void TimeshiftBuffer::AddPacket(DemuxPacket* packet)
 
       if (m_segmentIndexFileHandle.IsOpen())
       {
-        //std::string line = std::to_string(m_previousWriteSegment->GetSegmentId()) + "," + std::to_string(m_lastSegmentSecondsSinceStart) + "," + std::to_string(secondsSinceStart) + "\n";
         std::string line = StringUtils::Format("%9d,%9d,%9d\n", m_previousWriteSegment->GetSegmentId(), m_lastSegmentSecondsSinceStart, secondsSinceStart); // 30 characters per line
         m_segmentIndexFileHandle.Write(line.c_str(), line.length());
       }

diff --git a/src/stream/TimeshiftSegment.cpp b/src/stream/TimeshiftSegment.cpp
@@ -411,7 +411,7 @@ bool TimeshiftSegment::Seek(double timeMs)
   return false;
 }
 
-/* For refernce */
+/* For reference */
 
 // typedef struct DemuxPacket
 // {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		5447ca061444e574dc0d5e6da1657f49a64a0e660403995c7744beee3e69b2b8
		481558577f43f38e1f85421e937f186263743df3284003980895f3d48be67efc
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ffmpeg https://github.com/FFmpeg/FFmpeg/archive/n4.2.2.tar.gz
		ffmpeg https://github.com/FFmpeg/FFmpeg/archive/n4.3.tar.gz