Port to FFmpeg 5.x #204

basilgello · 2022-10-16T23:10:08Z

Fixes #188

src/stream/FFmpegStream.cpp

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

phunkyfish · 2022-11-05T17:08:57Z

src/stream/FFmpegStream.cpp

-  if (iformat && (strcmp(iformat->name, "mov,mp4,m4a,3gp,3g2,mj2") == 0))
-  {
-    CURL url(m_streamUrl);
-    //if (URIUtils::IsRemote(strFile))
-    if (!url.GetProtocol().empty() && !url.IsProtocol("file"))
-      m_pFormatContext->iformat->flags |= AVFMT_NOGENSEARCH;
-  }
-


Why remove this?

@AlwinEsch did this in core PR xbmc/xbmc@aec31f5#diff-bad369057589a59119615d8f380bff839b51c2100f2e8b5fd92b24fb61ea3fc6R546

@AlwinEsch do you recall the reason for this?

herrnst · 2022-11-14T16:33:23Z

Hi, not sure if its okay to already ask questions as even the FFMPEG 5 pull isn't merged into the Kodi repository yet, I'll try anyways:

I picked up current Kodi master (which will become Nexus), applied xbmc/xbmc#21248 and built/installed everything (worked without issues so far). This also installed the ffmpeg-related .a archives in /usr/lib/x864_64-linux-gnu/kodi/ffmpeg/lib/lib*.a and the headers below /usr/include/kodi/lib* (ie. libavcodec et al).

Then I picked up this PR branch (inputstream.ffmpegdirect+ffmpeg5) and invoked CMake with
-DCMAKE_PREFIX_PATH=/usr/lib/x864_64-linux-gnu/kodi/ffmpeg and CMake picks up FFmpeg from Kodi.

Compilation works, but at the end linking fails with

/usr/bin/ld: /usr/lib/x86_64-linux-gnu/kodi/ffmpeg/lib/libavcodec.a(h264_intrapred_10bit.o): warning: relocation against `ff_pw_512' in read-only section `.text'
/usr/bin/ld: /usr/lib/x86_64-linux-gnu/kodi/ffmpeg/lib/libavcodec.a(vc1dsp_mmx.o): relocation R_X86_64_PC32 against symbol `ff_pw_9' can not be used when making a shared object; recompile with -fPIC
/usr/bin/ld: final link failed: bad value
collect2: error: ld returned 1 exit status

This is on a minimal Ubuntu 22.04 install (used solely for packaging purposes) with all current updates installed. What am I doing wrong?

basilgello · 2022-11-14T19:37:05Z

@herrnst How do you build? You build dsc from ppa?

herrnst · 2022-11-14T19:56:38Z

@herrnst How do you build? You build dsc from ppa?

Not sure if the answer is "yes", basically I pick up packaging ("debian/") from xbmc-nightly at launchpad.net/~team-xbmc (https://launchpad.net/~team-xbmc/+archive/ubuntu/xbmc-nightly/+sourcepub/14089652/+listing-archive-extra) and use that to build from the GIT checkout (here with FFMPEG 5 patches applied) using dpkg-buildpackage with all deps installed. Same for inputstream.ffmpegdirect, so thats where kodi-ffmpeg-dev (ie. /usr/lib//libavcodec.a et al) come from.

So, short answer: debian-dir from PPA with GIT tree and debhelper/dh-make and friends, both for Kodi and inputstream.ffmpegdirect.

@Rogo95

Fixes the transport stream playback failures described in https://bugs.debian.org/1016925 @Rogo95 made an excellent technical analysis of the root cause and reported that to the bug thread. Later on, James Almer (@jamrial) suggested the solution to use extract_extradata bitstream filter to replace the removed split() function. Finally, I adapted the following code snippet: https://gist.github.com/moonpfe/f6795d51294d91ee0f82f62ff6985db0 to Kodi and tested it by playing the affected files in TS format. Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

Team Kodi does officially support one major FFmpeg version. This commit is intentionally separated to let *nix distro maintainers revert it if building Kodi 20+ is needed with FFmpeg 4. Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

basilgello · 2023-01-06T11:05:15Z

@phunkyfish The ffmpeg5 PR is merged into master. Can you please create Omega branch so I can rebase the PR into it? As I told previously, we need to use the same ffmpeg version across kodi and addons.

phunkyfish · 2023-01-06T18:14:12Z

Creating a new branch won’t work until all binary add-ons have branches switched from Nexus to Omega (but if you ask me master would be better).

I’m not sure we can branch for a single add-on and leave the others as is.

basilgello · 2023-01-06T18:36:40Z

I am afraid that the ffmpeg5 upgrade on kodi core will break ffmpegdirect earlier built with bundled ffmpeg4 for most users. Windows users might not notice that as well as Debian's, but other Linux / OSX / Android / FreeBSD certainly will :(

As a workaround until the Omega repo goes prime time users can install the artifacts from this PR. In this case this PR should be held on until we have Omega branch.

phunkyfish · 2023-01-06T19:03:21Z

When ffmpeg 4 was released it was out for many months on ffmpegdirect before being in kodi. If it worked then, it could also work now with ffmpeg 5. But the only way to see if it does is if we try it.

lrusak · 2023-01-07T02:34:19Z

Omega is currently pre-alpha so I wouldn't worry about breakage too much.

phunkyfish · 2023-01-07T09:57:47Z

The issue is we could break Nexus as the same version of the add-on would be used for both.

But let’s test both first and see what happens.

basilgello · 2023-01-07T13:13:57Z

OK, did some tests with team's PPA for jammy:

kodi 6:20.0+git20230105.0300-10f29c9fd4-0~jammy (ffmpeg4) + ffmpegdirect 20.5.0 with this PR (ffmpeg5) = works!
kodi 6:20.0+git20230107.0300-8fdbdb1890-0~jammy (ffmpeg5) + ffmpegdirect 20.5.0 from PPA (ffmpeg4) = no picture and symptoms are just like the extradata

So we can merge this PR - and the faster we merge it, the less chance users will get combo number 2 :)

basilgello · 2023-01-07T15:02:13Z

And if we still support Matrix branch, the use-after-free commit likely applies to matrix as well…

phunkyfish · 2023-01-07T15:03:22Z

And if we still support Matrix branch, the use-after-free commit likely applies to matrix as well…

Please PR that change also and I’ll merge it.

lrusak · 2023-01-07T15:06:33Z

The issue is we could break Nexus as the same version of the add-on would be used for both.

But let’s test both first and see what happens.

Ah, why bump to 5.0 for the Nexus version when Kodi Nexus is still 4.x? Is it not valid to keep them in sync?

basilgello · 2023-01-07T15:14:48Z

That was my concern, too :) But things seem to work if core ffmpeg is older than addon's - if the linkage of the addon is static and there are no other binary addons trying to use dynamic ffmpeg library!

lrusak · 2023-01-07T15:18:00Z

That was my concern, too :) But things seem to work if core ffmpeg is older than addon's - if the linkage of the addon is static and there are no other binary addons trying to use dynamic ffmpeg library!

Yea that's annoying. Now LibreELEC (and other distros) need to manage two ffmpeg versions and build them statically.

basilgello · 2023-01-07T15:19:26Z

The alternative is to do quick omega branching and revert this commit :) I can help you with it tonight. And please upload,tzdata to mirrors, too!

phunkyfish · 2023-01-07T15:55:22Z

That was my concern, too :) But things seem to work if core ffmpeg is older than addon's - if the linkage of the addon is static and there are no other binary addons trying to use dynamic ffmpeg library!

Yea that's annoying. Now LibreELEC (and other distros) need to manage two ffmpeg versions and build them statically.

Why? Ffmpegdirect should be able to change the underlying ffmpeg version without impacting kodi.

lrusak · 2023-01-07T16:17:43Z

That was my concern, too :) But things seem to work if core ffmpeg is older than addon's - if the linkage of the addon is static and there are no other binary addons trying to use dynamic ffmpeg library!

Yea that's annoying. Now LibreELEC (and other distros) need to manage two ffmpeg versions and build them statically.

Why? Ffmpegdirect should be able to change the underlying ffmpeg version without impacting kodi.

Until we allow using whatever ffmpeg version available in Kodi core distros will have to manage two ffmpeg versions.

I agree that the add-on should not need the exact version of ffmpeg that core uses but we aren't quite there yet.

HiassofT · 2023-01-08T00:13:00Z

Just a quick heads up: if you start to require a different ffmpeg version than the fork kodi uses (eg 4.x for Nexus) then we (LE) might just choose to not build the ffmpegdirect addon any longer as it'll become too much hassle.

Ideally both kodi and ffmpegdirect should work with non-forked upstreeam ffmpeg versions (ideally both 4.x and 5.x - your choice) as provided by distros - that should be the mid-term goal both for kodi omega and LE12

basilgello · 2023-01-08T02:41:28Z

@HiassofT I did everything to reduce hassle here :)

First of all, LE can build Nexus with ffmpeg5 (using the commit from Debian)

Another option is to add the patch (reverting 60ffdc3) here to build ffmpegdirect with ffmpeg4 (whipe preserving the ability to build with ffmpeg5 at the same time!).

Finally, when Omega gets branched in addons, we can revert this PR as a whole for Nexus. That sounds a proper long-term solution to me.

lrusak · 2023-01-08T04:08:36Z

Finally, when Omega gets branched in addons, we can revert this PR as a whole for Nexus. That sounds a proper long-term solution to me.

I think this is the best option and should happen sooner than later.

Omega can be branched at any time. Nothing is holding that back really.

razzeee · 2023-01-08T14:33:48Z

Why are we merging this to a nexus branch at all then? This is causing failing builds for no reason?

phunkyfish · 2023-01-08T14:39:25Z

Will revert later today.

HiassofT · 2023-01-08T14:51:35Z

@basilgello We are not going to patch kodi Nexus to work with ffmpeg5, this will create a huge maintenance burden.

I, too, find it unfortunate that team kodi decided to ship Nexus with ffmpeg 4 but it is what it is and we have to live with that.

Kodi doesn't sandbox binary addons (eg into spearate processes) yet so you can't easily mix libraries - kodi's address space will already have ffmpeg 4 symbols present and trying to mix that with ffmpeg 5 is crying for problems (and likely very sublte issues that are going to be hard to track down).

I fully understand that you'll want to ship kodi Nexus with ffmpeg 5 on Debian but this means you're going to have to locally patch kodi and addons to do that.

phunkyfish · 2023-01-08T18:25:29Z

Reverted. Once binary add-ons all get branched for Omega we can apply this PR again.

basilgello · 2023-01-08T18:31:11Z

I have no hard feelings about this but I recall there was a script posted by @fuzzard in slack to automate branching. What was the issue there?

phunkyfish · 2023-01-08T19:20:27Z

I did not see the script. But it will need someone with with the correct permissions to run it for all binary addons.

phunkyfish reviewed Oct 17, 2022

View reviewed changes

src/stream/FFmpegStream.cpp Show resolved Hide resolved

basilgello added 2 commits October 30, 2022 11:40

Adapt AlwinEsch's ffmpeg5 port patch

7263ab3

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

Fix use-after-free in TimeshiftSegment

7bb1589

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

phunkyfish reviewed Nov 5, 2022

View reviewed changes

phunkyfish mentioned this pull request Nov 21, 2022

Cannot play AAC encoded streams kodi-pvr/pvr.iptvsimple#652

Open

phunkyfish mentioned this pull request Dec 3, 2022

How to open a video file? #149

Open

basilgello added 4 commits December 21, 2022 16:05

Separate commit to remove FFmpeg 4 support

60ffdc3

Team Kodi does officially support one major FFmpeg version. This commit is intentionally separated to let *nix distro maintainers revert it if building Kodi 20+ is needed with FFmpeg 4. Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

depends: Bump ffmpeg 5.1.2

746ac4e

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

Fix build on Windows-UWP-ARM

17044fe

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

basilgello closed this Dec 27, 2022

basilgello reopened this Dec 27, 2022

basilgello closed this Jan 6, 2023

basilgello reopened this Jan 6, 2023

phunkyfish merged commit 6652d3b into xbmc:Nexus Jan 7, 2023

phunkyfish mentioned this pull request Jan 8, 2023

Revert "Port to FFmpeg 5.x" #217

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port to FFmpeg 5.x #204

Port to FFmpeg 5.x #204

basilgello commented Oct 16, 2022

phunkyfish Nov 5, 2022

basilgello Nov 5, 2022

phunkyfish Nov 5, 2022

herrnst commented Nov 14, 2022

basilgello commented Nov 14, 2022

herrnst commented Nov 14, 2022

basilgello commented Jan 6, 2023

phunkyfish commented Jan 6, 2023

basilgello commented Jan 6, 2023 •

edited

Loading

phunkyfish commented Jan 6, 2023

lrusak commented Jan 7, 2023

phunkyfish commented Jan 7, 2023 •

edited

Loading

basilgello commented Jan 7, 2023 •

edited

Loading

basilgello commented Jan 7, 2023

phunkyfish commented Jan 7, 2023

lrusak commented Jan 7, 2023

basilgello commented Jan 7, 2023 •

edited

Loading

lrusak commented Jan 7, 2023

basilgello commented Jan 7, 2023

phunkyfish commented Jan 7, 2023 •

edited

Loading

lrusak commented Jan 7, 2023

HiassofT commented Jan 8, 2023

basilgello commented Jan 8, 2023 •

edited

Loading

lrusak commented Jan 8, 2023

razzeee commented Jan 8, 2023

phunkyfish commented Jan 8, 2023

HiassofT commented Jan 8, 2023

phunkyfish commented Jan 8, 2023

basilgello commented Jan 8, 2023

phunkyfish commented Jan 8, 2023

Port to FFmpeg 5.x #204

Port to FFmpeg 5.x #204

Conversation

basilgello commented Oct 16, 2022

phunkyfish Nov 5, 2022

Choose a reason for hiding this comment

basilgello Nov 5, 2022

Choose a reason for hiding this comment

phunkyfish Nov 5, 2022

Choose a reason for hiding this comment

herrnst commented Nov 14, 2022

basilgello commented Nov 14, 2022

herrnst commented Nov 14, 2022

basilgello commented Jan 6, 2023

phunkyfish commented Jan 6, 2023

basilgello commented Jan 6, 2023 • edited Loading

phunkyfish commented Jan 6, 2023

lrusak commented Jan 7, 2023

phunkyfish commented Jan 7, 2023 • edited Loading

basilgello commented Jan 7, 2023 • edited Loading

basilgello commented Jan 7, 2023

phunkyfish commented Jan 7, 2023

lrusak commented Jan 7, 2023

basilgello commented Jan 7, 2023 • edited Loading

lrusak commented Jan 7, 2023

basilgello commented Jan 7, 2023

phunkyfish commented Jan 7, 2023 • edited Loading

lrusak commented Jan 7, 2023

HiassofT commented Jan 8, 2023

basilgello commented Jan 8, 2023 • edited Loading

lrusak commented Jan 8, 2023

razzeee commented Jan 8, 2023

phunkyfish commented Jan 8, 2023

HiassofT commented Jan 8, 2023

phunkyfish commented Jan 8, 2023

basilgello commented Jan 8, 2023

phunkyfish commented Jan 8, 2023

basilgello commented Jan 6, 2023 •

edited

Loading

phunkyfish commented Jan 7, 2023 •

edited

Loading

basilgello commented Jan 7, 2023 •

edited

Loading

basilgello commented Jan 7, 2023 •

edited

Loading

phunkyfish commented Jan 7, 2023 •

edited

Loading

basilgello commented Jan 8, 2023 •

edited

Loading