forked from FFmpeg/FFmpeg
-
Notifications
You must be signed in to change notification settings - Fork 1
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
Sync release/5.1 with MythTV #11
Open
ulmus-scott
wants to merge
9
commits into
MythTV:release/5.1
Choose a base branch
from
ulmus-scott:sync-release
base: release/5.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
Add dependency in makefile for mythffmpeg so that it gets updated whenever there is a new ffmpeg_g. Same for the other mythff* applications. This bug surfaced when investigating the failure of the mytharchivehelper, fixed now in commit 987da09e83ca80181afdd24a1b457faadd1f2c9f. N.B. The fix is in the mythtv-specific part of an ffmpeg makefile so possibly the mechanism that is used to update the ffmpeg makefile also needs to be updated or regenerated. From MythTV/mythtv@4e5edb7
…iable. Make these rules work on windows compiles in addition to linux/android compiles. On windows builds, EXESUF is set to ".exe". From MythTV/mythtv@40fa546
1) Change the library name in the pkgconfig files to match the changes in the following commits. I.E. libavcodec -> libmythavcodec. 9563786648 Decouple MythTV configure from FFmpeg configure. e1be225768 FFmpeg configure: Update SLIBPREF on windows 2) Add new target to install the pkgconfig files. This was formerly part of the target to install the header files. A new separate target is being added so that cmake builds can install these files without changing the set of files created/installed by traditional make builds. From MythTV/mythtv@05bd259
This is from FFmpeg commit effadce . Author: Rémi Denis-Courmont <remi@remlab.net> Date: Sun Jul 16 18:18:02 2023 +0300 avcodec/x86/mathops: clip constants used with shift instructions within inline assembly Fixes assembling with binutil as >= 2.41 Signed-off-by: James Almer <jamrial@gmail.com> Fixes #765 From MythTV/mythtv@f9f9bba
When there is a change detected in the number of streams or in the type of streams after a new PMT has been received then scan the streams again. It is possible that the streams change during a recording. For instance, a commercial can have one audio stream and then in the following program there can be an audio stream added. This is what the Finnish broadcaster YLE is doing. It is completely standards-conforming but it is as far as I am aware the only broadcaster that does this. The original FFmpeg demuxer looks only at the streams as present in the beginning of the recording and therefore it does not detect changes later in the recording. Detecting stream changes while a recording is playing is a MythTV extension and it requires changes to FFmpeg. This is one reason why there is a copy of FFmpeg included as part of MythTV, instead of using the standard FFmpeg libraries that are part of the Linux system. Initially the streams_changed callback was needed for correct video playback of YLE streams; see commit ebeea33 from 2021. This did fix the problem of the screen sometimes showing only a 640x480 part of the 1920x1080 area. There has been a significant rewrite of the MythTV changes in file mpegts-mythtv.c in 2022 and one result is that the video playback of YLE streams is now correct without rescanning the streams. However, there is still the problem of audio stream changes not being picked up. In commit ad9fb22 from 2022 it is mentioned that: "The streams_changed callback has been disabled as it is now unnecessary in my samples from the Finnish YLE that used to trigger it. It could be re-enabled if necessary." As it appears to be still necessary this commit does exactly that. Note that when the streams_changed callback is called there is a pause of about one second, caused by the SeekReset that is done before the ScanStreams. It is possible that the SeekReset can be omitted. From MythTV/mythtv@4c49293
Some functions were removed from the source code in ffmpeg but are still in the linker visibility file. They cause a linker error with the --no-undefined-version option Fixes #798 From MythTV/mythtv@bd9b6e1
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.
Comparing the files with mythtv/external/FFmpeg shows they are identical now. Git complains:
warning: in the working copy of 'mythtv/external/FFmpeg/tests/ref/fate/wavpack-cuesheet-tags', CRLF will be replaced by LF the next time Git touches it
That is probably due to different settings for the git repositories.
master appears to be missing the commits from July 2023 onwards, but I am not planning on using it for the next merge.
https://github.com/MythTV/FFmpeg/commits/master/
https://github.com/MythTV/mythtv/commits/master/mythtv/external/FFmpeg