Skip to content

8294400: Provide media support for libavcodec version 59#932

Closed
sashamatveev wants to merge 2 commits intoopenjdk:masterfrom
sashamatveev:JDK-8294400
Closed

8294400: Provide media support for libavcodec version 59#932
sashamatveev wants to merge 2 commits intoopenjdk:masterfrom
sashamatveev:JDK-8294400

Conversation

@sashamatveev
Copy link
Member

@sashamatveev sashamatveev commented Oct 25, 2022 •
edited by openjdk bot
Loading

  • Added support for libavcodec 59.
  • libavcodec 59 removed several deprecated APIs and avplugin code was updated to use replacement APIs instead.
  • No changes to avplugin when used with 58 or below.
  • Note: Support for libavcodec 59 was added based on ffmpeg only. libav does not have version 59.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

  • JDK-8294400: Provide media support for libavcodec version 59

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx pull/932/head:pull/932
$ git checkout pull/932

Update a local copy of the PR:
$ git checkout pull/932
$ git pull https://git.openjdk.org/jfx pull/932/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 932

View PR using the GUI difftool:
$ git pr show -t 932

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/932.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 25, 2022

👋 Welcome back almatvee! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Ready for review label Oct 25, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 25, 2022 •
edited
Loading

Webrevs

kevinrushforth
kevinrushforth reviewed Oct 25, 2022
View reviewed changes
Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

I did a successful test build, but I don't currently have a system with libav59 libraries to test it on.

The fix looks good to me with one exception. You also need to add an entry for "avplugin-ffmpeg-59" in the NativeMediaManager constructor.

@sashamatveev
Copy link
Member Author

sashamatveev commented Oct 25, 2022

8294400: Provide media support for libavcodec version 59 [v2]

  • Added avplugin-ffmpeg-59 in the NativeMediaManager constructor.

@openjdk
Copy link

openjdk bot commented Oct 25, 2022 •
edited
Loading

@sashamatveev This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8294400: Provide media support for libavcodec version 59

Reviewed-by: kcr, jvos

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 2 new commits pushed to the master branch:

  • b3eec1d: 8295725: Update copyright header for files modified in 2022
  • 91e1a27: 8278426: ImagePool uses terminally deprecated System.runFinalization method

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Ready to be integrated label Oct 25, 2022
@kevinrushforth
Copy link
Member

kevinrushforth commented Oct 25, 2022

/reviewers 2

@openjdk
Copy link

openjdk bot commented Oct 25, 2022

@kevinrushforth
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

@kevinrushforth
Copy link
Member

kevinrushforth commented Oct 25, 2022

This needs a second reviewer.

@openjdk openjdk bot removed the ready Ready to be integrated label Oct 25, 2022
@kevinrushforth
Copy link
Member

kevinrushforth commented Oct 27, 2022

@johanvos or @tiainen Do you want to test this? It should be a straight-forward update, but since it doesn't get run via GitHub actions, you might want to urn this in your CI. We've already run it on our CI.

@johanvos
Copy link
Collaborator

johanvos commented Oct 27, 2022

I'll build + do basic tests

@johanvos
Copy link
Collaborator

johanvos commented Oct 28, 2022

Works fine, but fails to build on win32.

@kevinrushforth
Copy link
Member

kevinrushforth commented Oct 28, 2022

Works fine, but fails to build on win32.

That is surprising since the libav changes are limited to Linux-specific code. Have you confirmed that the win32 build passes without this fix and fails with this fix? How does it fail?

@johanvos
Copy link
Collaborator

johanvos commented Nov 2, 2022

Works fine, but fails to build on win32.

That is surprising since the libav changes are limited to Linux-specific code. Have you confirmed that the win32 build passes without this fix and fails with this fix? How does it fail?

Failures were CI-related. They are fixed now, and everything looks good.

@openjdk openjdk bot added the ready Ready to be integrated label Nov 2, 2022
@sashamatveev
Copy link
Member Author

sashamatveev commented Nov 2, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Nov 2, 2022

Going to push as commit ac8382b.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 4a2afb4: 8295962: Reference to State in Task.java is ambiguous when building with JDK 19
  • b3eec1d: 8295725: Update copyright header for files modified in 2022
  • 91e1a27: 8278426: ImagePool uses terminally deprecated System.runFinalization method

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 2, 2022
@openjdk openjdk bot closed this Nov 2, 2022
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review labels Nov 2, 2022
@openjdk
Copy link

openjdk bot commented Nov 2, 2022

@sashamatveev Pushed as commit ac8382b.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@emilazy emilazy mentioned this pull request Aug 1, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kevinrushforth kevinrushforth kevinrushforth approved these changes

@tiainen tiainen Awaiting requested review from tiainen

+1 more reviewer

@johanvos johanvos johanvos approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

integrated Pull request has been integrated

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sashamatveev @kevinrushforth @johanvos