Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ffmpeg dsm6 fixes and misc updates #5711

Merged
merged 18 commits into from
May 7, 2023
Merged

Conversation

th0ma7
Copy link
Contributor

@th0ma7 th0ma7 commented Apr 24, 2023

Description

ffmpeg dsm6 fixes and misc updates:

  • Fix DSM6 permissions
  • Update ffmpeg4 to 4.4.4
  • Update ffmpeg5 to 5.1.3
  • Import ffmpeg4 Synology patches to ffmpeg5-6
  • Update Intel Media Driver 2023Q1 Release (DSM7 only)

Fixes #5710, #5445 and AlexPresso/VideoStation-FFMPEG-Patcher#66

Checklist

  • Build rule all-supported completed successfully
  • New installation of package completed successfully
  • Package upgrade completed successfully (Manually install the package again)
  • Package functionality was tested
  • Any needed documentation is updated/created

Type of change

  • Bug fix
  • New Package
  • Package update
  • Includes small framework changes
  • This change requires a documentation update (e.g. Wiki)

@th0ma7 th0ma7 self-assigned this Apr 24, 2023
@mreid-tt
Copy link
Contributor

@th0ma7, would this fix the issue? I don't see any modifications for the service-setup.sh files which would change the executing user or at least bring consistency between the versions.

@th0ma7
Copy link
Contributor Author

th0ma7 commented Apr 25, 2023

would this fix the issue? I don't see any modifications for the service-setup.sh files which would change the executing user or at least bring consistency between the versions.

@mreid-tt Nope, returning to have files being owned by root for DSM6 like previous behaviour. Although I'm ok at testing other options if you have a few cycles and a DSM6 intel gpu based NAS?

@mreid-tt
Copy link
Contributor

@mreid-tt Nope, returning to have files being owned by root for DSM6 like previous behaviour. Although I'm ok at testing other options if you have a few cycles and a DSM6 intel gpu based NAS?

Sure, happy to help test. I have a DS916+ so hopefully that is compatible.

My main point was that while the path in ffmpeg v4 pointed to the correct directories, v5 and v6 did not in the service-setup.sh script for these versions. As such, this was just a nudge to get them consistent as part of this PR for testing.

@th0ma7
Copy link
Contributor Author

th0ma7 commented Apr 25, 2023

Gotcha! Will fix that, thnx.
Btw, by any chance, any good with C ?
Issue with webm patch failing at build time. I may have to drop it entirely thua removing seek time option.

@th0ma7
Copy link
Contributor Author

th0ma7 commented Apr 25, 2023

@nyanmisaka wondering, would you have a few spare cycles to look over older ffmpeg 4.4 patches? I originally ported them mostly as-is from prior synology sources but I believe some of them may be (or not) of value to jellyfin such as seek time patches.

My C is pretty much rotten... Would you (or someone else from the jellyfin project?) have time to look over them and assist on porting them over to v5-v6 of ffmpeg? Even better if some of it would be integrated into jellyfin's upstream tree. Help would be much welcomed. Thnx in advance.

@nyanmisaka
Copy link

Where did those patches come from? patchwork.ffmpeg.org or the internal tickets of synology?

It's best to leave them as is if they can be successfully compiled.

@th0ma7
Copy link
Contributor Author

th0ma7 commented Apr 26, 2023

Where did those patches come from? patchwork.ffmpeg.org or the internal tickets of synology?

@nyanmisaka I had extracted them manually from Synology provided source code of older ffmpeg releases a while back. Did applied relatively well on v4.x up until now.

It's best to leave them as is if they can be successfully compiled.

Most of them can with one exception: 0103-SYNO-videostation-webm-seek-time.patch

A pair of eye from someone skilled in C and ffmpeg source code in particular would be helpful in order to fix that patch in particular as it has other usages with VideoStation for instance. And (pushing my luck for a bit), by extension, looking at the other patches (0100-0103 and 0110-0113) to confirm they both make sense and are worth keeping would really be awesome :)

@mreid-tt
Copy link
Contributor

mreid-tt commented May 3, 2023

@th0ma7, just a note that this build seems to also include the tvheadend package.

@th0ma7
Copy link
Contributor Author

th0ma7 commented May 3, 2023

just a note that this build seems to also include the tvheadend package.

@mreid-tt this is the way :) As cross/ffmpeg5 got changed it trigerred building it's direct dependency (i.e. tvheadend). With the latest commit now also updating cross/ffmpeg4, chromaprint and comskip should normally be built as well.

@hgy59
Copy link
Contributor

hgy59 commented May 6, 2023

@th0ma7 I propose to use ffmpeg 5 and ffmpeg 6 as DISPLAY_NAME instead of DISPLAY_NAME = ffmpeg $(SPK_VERS)

The display name sould correspond with the package and not change on every update.

@th0ma7 th0ma7 merged commit b715e77 into SynoCommunity:master May 7, 2023
17 checks passed
@th0ma7 th0ma7 deleted the ffmpeg-dsm6-fix branch May 7, 2023 12:52
@th0ma7 th0ma7 added the status/published Published and activated (may take up to 48h until visible in DSM package manager) label May 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/published Published and activated (may take up to 48h until visible in DSM package manager)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FFmpeg 4: "Exited with code 1" on Jellyfin transcode
4 participants