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

add ffmpeg pixeldensity feature for retina displays #26520

Merged
merged 3 commits into from
Nov 26, 2024

Conversation

i3roly
Copy link
Contributor

@i3roly i3roly commented Nov 9, 2024

sorry for the additional pull request, but i had to cleave out the nodejs patches and things were messy.

the comments to the patch files have been added.

the change does not affect people who do not have retina displays. you must invoke -movflags write_pixeldensity for the feature to have any effect.

as shown in the portfile comments, daniel kaiser has done all of the legwork but the ffmpeg team does not seem interested in adding the functionality. i did make a properly-formatted git patch for them and they seemed to not care.

Type(s)
  • bugfix
  • enhancement
  • security fix
Tested on

macOS 10.14.6 18G9323 x86_64
Xcode 11.3.1 11C505

Verification

Have you

  • followed our Commit Message Guidelines?
  • squashed and minimized your commits?
  • checked that there aren't other open pull requests for the same change?
  • referenced existing tickets on Trac with full URL in commit message?
  • checked your Portfile with port lint --nitpick?
  • tried existing tests with sudo port test?
  • tried a full install with sudo port -vst install?
  • tested basic functionality of all binary files?
  • checked that the Portfile's most important variants haven't been broken?

@macportsbot
Copy link

Notifying maintainers:
@dbevans for port ffmpeg.
@jeremyhu for port ffmpeg.
@mascguy for port ffmpeg-devel, ffmpeg.

@i3roly
Copy link
Contributor Author

i3roly commented Nov 10, 2024

i have updated the patches. i didn't realise that the "a/" and "b/" suffixes would cause problems.

@barracuda156
Copy link
Contributor

@i3roly Would you mind adding an unrelated fix here to avoid another revbump of all ffmpeg ports?
We need to add a dependency on xorg-libXv info x11 variant. See: https://trac.macports.org/ticket/71280

@i3roly
Copy link
Contributor Author

i3roly commented Nov 12, 2024 via email

@barracuda156
Copy link
Contributor

what exactly should i do here? it seems that it is trying to link some libraries that don’t exist for or something? some more directions would be helpful. if i can, i will.

On Nov 11, 2024, at 7:10 PM, Sergey Fedorov @.***> wrote: @i3roly Would you mind adding an unrelated fix here to avoid another revbump of all ffmpeg ports? We need to add a dependency on xorg-libXv info x11 variant. See: https://trac.macports.org/ticket/71280 — Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you were mentioned.

Ah, wait, it is a bit more tricky. Originally this error was found with x11 variant and fixed: https://trac.macports.org/ticket/58617
Apparently, however, ffmpeg links to some x11 libs even without +x11 variant, which is wrong.

I will look into why that happens.

@i3roly
Copy link
Contributor Author

i3roly commented Nov 25, 2024

can we merge what we have now please? i don't want to keep applying the patch every time there's an ffmpeg update

@barracuda156
Copy link
Contributor

@i3roly Yeah, no need to wait for x11 issue to be sorted out, it may take a bit of time. There is a ticket for it: https://trac.macports.org/ticket/71353
Rather revbump all ffmpegs whenever that gets fixed.

Copy link
Member

@mascguy mascguy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you so much for your contribution!

@mascguy mascguy merged commit dc6f621 into macports:master Nov 26, 2024
2 of 3 checks passed
Comment on lines +74 to +76
+ if (mov->flags & FF_MOV_FLAG_PIXELDENSITY) {
+ mov_write_pixeldensity_meta_tag(pb, mov, track, st);
+ }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something wrong with this patch? Why is this mentioned twice? Same for the ffmpeg7 port in #27440.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintainer: open Affects an openmaintainer port type: enhancement
Development

Successfully merging this pull request may close these issues.

7 participants