commit b8ec658da99d80c75011f8d21dad8bce92ad76db
Author: Jakub Bogusz <[email protected]>
Date: Thu Apr 13 20:10:37 2023 +0200
- updated to 5.2.0
mediastreamer-plugin-msopenh264-openh264.patch | 22 --------------
mediastreamer-plugin-msopenh264.spec | 19 +++++-------
msopenh264-ms2-update.patch | 40 --------------------------
3 files changed, 7 insertions(+), 74 deletions(-)
---
diff --git a/mediastreamer-plugin-msopenh264.spec
b/mediastreamer-plugin-msopenh264.spec
index f4627a1..7c9f57b 100644
--- a/mediastreamer-plugin-msopenh264.spec
+++ b/mediastreamer-plugin-msopenh264.spec
@@ -1,26 +1,23 @@
Summary: H.264 video codec for mediastreamer based on the openh264
library
Summary(pl.UTF-8): Kodek obrazu H.264 dla mediastreamera oparty na
bibliotece openh264
Name: mediastreamer-plugin-msopenh264
-Version: 1.2.1
-Release: 11
+Version: 5.2.0
+Release: 1
License: GPL v2+
Group: Libraries
#Source0Download: https://gitlab.linphone.org/BC/public/msopenh264/-/tags
-#Source0:
https://gitlab.linphone.org/BC/public/msopenh264/-/archive/%{version}/msopenh264-%{version}.tar.bz2
-Source0:
https://linphone.org/releases/old/sources/plugins/msopenh264/msopenh264-%{version}.tar.gz
-# Source0-md5: 8e4dfaed03dbe10d1b32d70eea23ce9c
-Patch0: msopenh264-ms2-update.patch
-Patch1: %{name}-openh264.patch
-URL: http://www.linphone.org/technical-corner/mediastreamer2/overview
+Source0:
https://gitlab.linphone.org/BC/public/msopenh264/-/archive/%{version}/msopenh264-%{version}.tar.bz2
+# Source0-md5: f854bfa3db3244b388571c2359a895ee
+URL:
https://www.linphone.org/technical-corner/mediastreamer2/overview
BuildRequires: autoconf >= 2.50
BuildRequires: automake
-BuildRequires: mediastreamer-devel >= 2.14.0
+BuildRequires: mediastreamer-devel >= 5
BuildRequires: openh264-devel >= 1.4.0
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: pkgconfig
Requires: openh264 >= 1.4.0
-Requires: mediastreamer >= 2.14.0
+Requires: mediastreamer >= 5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -33,8 +30,6 @@ opartą na bibliotece openh264.
%prep
%setup -q -n msopenh264-%{version}
-%patch0 -p1
-%patch1 -p1
%build
%{__libtoolize}
diff --git a/mediastreamer-plugin-msopenh264-openh264.patch
b/mediastreamer-plugin-msopenh264-openh264.patch
deleted file mode 100644
index 1d7cf2c..0000000
--- a/mediastreamer-plugin-msopenh264-openh264.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- msopenh264-1.2.1/src/msopenh264dec.cpp.orig 2021-07-26
17:10:18.273730645 +0200
-+++ msopenh264-1.2.1/src/msopenh264dec.cpp 2021-07-26 17:12:35.940935025
+0200
-@@ -62,7 +62,7 @@ void MSOpenH264Decoder::initialize()
- mUnpacker=rfc3984_new_with_factory(mFilter->factory);
- if (mDecoder != 0) {
- SDecodingParam params = { 0 };
--#if (OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6)
-+#if (OPENH264_MAJOR > 1) || ((OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6))
- #else
- params.eOutputColorFormat = videoFormatI420;
- #endif
---- msopenh264-1.2.1/src/msopenh264enc.cpp.orig 2017-07-20
15:56:32.000000000 +0200
-+++ msopenh264-1.2.1/src/msopenh264enc.cpp 2019-08-09 15:30:24.520666582
+0200
-@@ -127,7 +127,7 @@
- params.sSpatialLayers[0].iSpatialBitrate =
targetBitrate;
- params.sSpatialLayers[0].iMaxSpatialBitrate =
maxBitrate;
-
--#if (OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6)
-+#if (OPENH264_MAJOR > 1) || ((OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6))
- params.sSpatialLayers[0].sSliceArgument.uiSliceMode =
SM_SIZELIMITED_SLICE;
-
params.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint =
ms_factory_get_payload_max_size(mFilter->factory);
- #else
diff --git a/msopenh264-ms2-update.patch b/msopenh264-ms2-update.patch
deleted file mode 100644
index e9a8336..0000000
--- a/msopenh264-ms2-update.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 87b973e0560a590db0aed0bf657c4e79dfc72f7f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micka=C3=ABl=20Turnel?=
- <[email protected]>
-Date: Thu, 30 Nov 2017 15:50:17 +0100
-Subject: [PATCH] Fix H264 not using defined MTU
-
----
- src/msopenh264dec.cpp | 2 +-
- src/msopenh264enc.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/msopenh264dec.cpp b/src/msopenh264dec.cpp
-index 0662246..c13c704 100644
---- a/src/msopenh264dec.cpp
-+++ b/src/msopenh264dec.cpp
-@@ -59,7 +59,7 @@ void MSOpenH264Decoder::initialize()
- {
- if (!mInitialized) {
- mFirstImageDecoded = false;
-- mUnpacker=rfc3984_new();
-+ mUnpacker=rfc3984_new_with_factory(mFilter->factory);
- if (mDecoder != 0) {
- SDecodingParam params = { 0 };
- #if (OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6)
-diff --git a/src/msopenh264enc.cpp b/src/msopenh264enc.cpp
-index 66637e7..e9bf1bd 100644
---- a/src/msopenh264enc.cpp
-+++ b/src/msopenh264enc.cpp
-@@ -85,7 +85,7 @@ MSOpenH264Encoder::~MSOpenH264Encoder()
- void MSOpenH264Encoder::initialize()
- {
- mFrameCount = 0;
-- mPacker = rfc3984_new();
-+ mPacker = rfc3984_new_with_factory(mFilter->factory);
- if (mPacketisationModeSet)
- rfc3984_set_mode(mPacker, mPacketisationMode);
- else rfc3984_set_mode(mPacker, 1); // in absence of explicit directive
from the other end, allow mode 1 because it allows to send big slices which is
necessary for large images
---
-GitLab
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mediastreamer-plugin-msopenh264.git/commitdiff/b8ec658da99d80c75011f8d21dad8bce92ad76db
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
