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

Fixes for recent FFmpeg versions #394

Merged
merged 10 commits into from
Aug 25, 2024

Conversation

jonfryd
Copy link
Contributor

@jonfryd jonfryd commented Aug 20, 2024

  1. Fixes an issue with parsing the kilobyte unit (KiB) in newer FFmpeg versions.
  2. Fixed the testExceptionIsThrownIfFfmpegExitsWithError unit test (again, because the output has recently changed).
  3. I noticed a regression in my own software and added testFrameCountingWithStreamCopyAndProgressListener to test frame counting while performing a stream copy. It runs as expected on older FFmpeg versions but fails with recent versions (6.1.x and 7.0.x) due to a bug (which was fixed a week ago on their master branch).

@jonfryd jonfryd changed the title Recent ffmpeg version fixes Fixes for recent FFmpeg versions Aug 20, 2024
@jonfryd jonfryd force-pushed the recent-ffmpeg-version-fixes branch from 3100b2a to b92db0c Compare August 22, 2024 09:22
@kokorin
Copy link
Owner

kokorin commented Aug 24, 2024

@jonfryd it looks like test failures are not related to this PR, right? Probably I have to revisit testing approach in favor of cross ffmpeg version testing instead of testing against latest version. But then cross Java version testing should be dropped. Otherwise it would require too many resources.

@kokorin
Copy link
Owner

kokorin commented Aug 24, 2024

I will merge this PR, but not sure when the next release will be. As mentioned, current issues should be fixed first.

@jonfryd
Copy link
Contributor Author

jonfryd commented Aug 24, 2024

@jonfryd it looks like test failures are not related to this PR, right? Probably I have to revisit testing approach in favor of cross ffmpeg version testing instead of testing against latest version. But then cross Java version testing should be dropped. Otherwise it would require too many resources.

Correct, the test failures are not related. I noticed Mac OS and Windows builds seem to be failing for all active PRs for some reason (didn’t look into it).

Yeah, a pragmatic trade off is necessary like you say. It is not practical to test all platforms and many FFmpeg versions on every build.

@jonfryd
Copy link
Contributor Author

jonfryd commented Aug 24, 2024

I will merge this PR, but not sure when the next release will be. As mentioned, current issues should be fixed first.

OK, sounds good. We’re sticking with FFmpeg 6.0 for now anyway. Take your time.

Thanks for your help. Have a good weekend!

@jonfryd jonfryd closed this Aug 24, 2024
@jonfryd jonfryd reopened this Aug 24, 2024
@kokorin kokorin changed the base branch from master to develop August 25, 2024 08:08
@kokorin kokorin force-pushed the recent-ffmpeg-version-fixes branch from b92db0c to 96fd294 Compare August 25, 2024 08:19
@kokorin
Copy link
Owner

kokorin commented Aug 25, 2024

@jonfryd I have rebased this PR on top of develop branch and changed target branch to develop too.

@kokorin kokorin merged commit 66f28b8 into kokorin:develop Aug 25, 2024
7 of 13 checks passed
@kokorin
Copy link
Owner

kokorin commented Aug 29, 2024

@jonfryd https://github.com/kokorin/Jaffree/releases/tag/R2024.08.29

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants