Port FFmpeg 7.0 to ffmpegdirect Piers #304
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@phunkyfish I tested that on Omega in Debian - works so far! |
|
We can’t do this on omega, we don’t change ffmpeg for released versions. It needs to be on the Piers branch. |
|
But should apply the same on Piers. And nice work! |
|
It id targeting Piers branch, despite the commit name! |
phunkyfish
changed the title
|
Updated! |
|
Can you rebase and update from the parent PR? That’s on 7.0.2 now and the Android build issues are fixed on Piers. So it should build fully on Jenkins. Also, please check that any patches apply cleanly for ffmpeg. There are 5 altogether I think. |
|
Roger that! :) |
|
@phunkyfish the rebased original PR does not bring anything meaningful for FFmpegDirect: But I will update to 7.0.2 and ensure patches make sense |
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 0a67421cae..9ea4294d1f 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -11351,27 +11351,23 @@ msgstr ""
#. Label for a select option or list item, representing an icon graphic (like a TV channel icon)
#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
-#: xbmc/pvr/guilib/PVRGUIActionsEPG.cpp
msgctxt "#19282"
msgid "Current icon"
msgstr ""
#. Label for a select option or list item, representing an icon graphic (like a TV channel icon)
#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
-#: xbmc/pvr/guilib/PVRGUIActionsEPG.cpp
msgctxt "#19283"
msgid "No icon"
msgstr ""
-#. used by several skins and PVR
-#: xbmc/pvr/PVRContextMenus.cpp
+#. used by several skins
msgctxt "#19284"
msgid "Choose icon"
msgstr ""
#. Label for a select/menu option to select an icon graphic
#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
-#: xbmc/pvr/guilib/PVRGUIActionsEPG.cpp
msgctxt "#19285"
msgid "Browse for icon"
msgstr ""
@@ -17915,39 +17911,8 @@ msgctxt "#34113"
msgid "To keep certain AVRs powered we send an inaudible random noise signal. You can disable this setting if you are using headphone or analog output."
msgstr ""
-#. Indicates if Audio Engine should include lfe when downmixing
-#: system/settings/settings.xml
-msgctxt "#34114"
-msgid "Include LFE when downmixing"
-msgstr ""
-
-#. Description of setting with label #34114 "Include LFE when downmixing"
-#: system/settings/settings.xml
-msgctxt "#34115"
-msgid "If enabled, this setting will include lfe channel into the mixing when there is no dedicated LFE output channel available. This only makes sense for full range speakers."
-msgstr ""
-
-#. Description of setting with label #34114 "Include LFE when downmixing"
-#: system/settings/settings.xml
-msgctxt "#34116"
-msgid "Off"
-msgstr ""
-
-#. Description of setting with label #34114 "Include LFE when downmixing"
-#: system/settings/settings.xml
-msgctxt "#34117"
-msgid "50%"
-msgstr ""
-
-#. Description of setting with label #34114 "Include LFE when downmixing"
-#: system/settings/settings.xml
-msgctxt "#34118"
-msgid "100%"
-msgstr ""
-
-
#empty strings from id 34114 to 34119
-#34119 reserved for future use
+#34114-34119 reserved for future use
#: system/settings/settings.xml
msgctxt "#34120"
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp
index a4fc91554f..6fce0af981 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp
@@ -29,15 +29,8 @@ CActiveAEResampleFFMPEG::~CActiveAEResampleFFMPEG()
swr_free(&m_pContext);
}
-bool CActiveAEResampleFFMPEG::Init(SampleConfig dstConfig,
- SampleConfig srcConfig,
- bool upmix,
- bool normalize,
- double centerMix,
- CAEChannelInfo* remapLayout,
- AEQuality quality,
- bool force_resample,
- float sublevel)
+bool CActiveAEResampleFFMPEG::Init(SampleConfig dstConfig, SampleConfig srcConfig, bool upmix, bool normalize, double centerMix,
+ CAEChannelInfo *remapLayout, AEQuality quality, bool force_resample)
{
m_dst_chan_layout = dstConfig.channel_layout;
m_dst_channels = dstConfig.channels;
@@ -141,9 +134,6 @@ bool CActiveAEResampleFFMPEG::Init(SampleConfig dstConfig,
return false;
}
- if (sublevel > 0.0f)
- av_opt_set_double(m_pContext, "lfe_mix_level", static_cast<double>(sublevel), 0);
-
if (hasMatrix)
{
if (swr_set_matrix(m_pContext, reinterpret_cast<const double*>(m_rematrix), AE_CH_MAX) < 0) |
basilgello
force-pushed
the
ffmpeg7.0-Piers
branch
from
5fd7eef to
646ec08
Compare
|
Looks like 1h is definitely not enough for the pipeline. |
We in only need to worry about Jenkins. Everything else will timeout. |
|
The patches do not apply cleanly. Can you fix them? I don't see patch 4 being applied. Maybe it is no longer required. |
|
I have removed one patch and renamed 0005 to 0004. OK I will re-export them |
From xbmc/xbmc#24972 Signed-off-by: Vasyl Gello <[email protected]>
basilgello
force-pushed
the
ffmpeg7.0-Piers
branch
from
646ec08 to
92c7dd4
Compare
Perfect, thanks! |
phunkyfish
approved these changes
Aug 20, 2024
|
I tested under Debian 12 with KODI v22 Piers and it works great. Thanks! |
|
@zuzia-dev You did build ffmpeg 7.0.2 for 12 or reverted the ffmpeg6 patch? |
@basilgello |
|
Thanks. In Debian 12 I will need to build against ffmpeg6, just in case :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
From xbmc/xbmc#24972
Signed-off-by: Vasyl Gello [email protected]