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

contrib: Update to x265 2.5. #826

Merged
merged 1 commit into from Aug 6, 2017

Conversation

bradleysepos
Copy link
Contributor

Works fine on Mac.

Breaks hb.dll similarly to #825.

@sr55
Copy link
Contributor

sr55 commented Jul 22, 2017

Indeed, the dll is missing all the endpoints. Only has a few of the x265 API's available for use.

@Synapto
Copy link

Synapto commented Jul 24, 2017

You might find this very similar issue interesting:

https://bitbucket.org/multicoreware/x265/issues/360/v25-does-not-work-in-ffmpeg-24x

Then again, the "get-a-life" response from Pradeep isn't encouraging :(

@bradleysepos
Copy link
Contributor Author

Thanks for the heads up. I spent a bunch of time looking for similar reports right before that was posted. Perhaps I should chime in. I may just bisect x265 first.

@bradleysepos
Copy link
Contributor Author

Added my bisect findings to the thread on x265's Bitbucket.

Cross-posting here:


We're having a similar issue updating HandBrake from x265 2.4 to 2.5. Cross-compiling with mingw-w64 5.0.2 (or latest master branch) succeeds without error, but the resulting hb.lib goes from 13.7 MB to a few KB. Looks like this affects cross-compiling for recent Libav as well, and probably FFmpeg (untested).

Results of git bisect:

$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working tree clean
$ git bisect start
$ git log --oneline -1
d5f610973 Add force-flush param option
$ git bisect bad
$ git checkout 2.4
Note: checking out '2.4'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b <new-branch-name>

HEAD is now at 2c55a9dec... release: Release notes for version 2.4
$ git bisect good
Bisecting: 56 revisions left to test after this (roughly 6 steps)
[bb176913097337afdf93e441c8358a98f0441de4] x86inc: Correctly warn on use of SSE2 instructions in SSE functions
$ git bisect bad
Bisecting: 27 revisions left to test after this (roughly 5 steps)
[11a1f827d10d1a01f83d23f5e4754c33d763d457] Insert additional fields in csv file
$ git bisect good
Bisecting: 13 revisions left to test after this (roughly 4 steps)
[2238df48980c0b90fa60bebf2b8010675b761f75] avx2: 'integral4h' asm code -> 6.01x faster than 'C' version
$ git bisect good
Bisecting: 6 revisions left to test after this (roughly 3 steps)
[718a42b23bd3a9192b39ff083e05f766f20002d1] x86inc: Make cpuflag() and notcpuflag() return 0 or 1
$ git bisect bad
Bisecting: 3 revisions left to test after this (roughly 2 steps)
[28bd8c75ed9d970c20cb55523c75a3dc55a5b025] Fix slicetype mismatch between analysis save and load modes
$ git bisect bad
Bisecting: 0 revisions left to test after this (roughly 1 step)
[6681d3313dd6202a1345e350b8e4f8ab4903f4fb] Add csv feature into libx265
$ git bisect bad
Bisecting: 0 revisions left to test after this (roughly 0 steps)
[a553b5a418f244dddb097cceaec506e1dc8227df] add support for hdr-opt even when aq-mode is disabled
$ git bisect good
6681d3313dd6202a1345e350b8e4f8ab4903f4fb is the first bad commit
commit 6681d3313dd6202a1345e350b8e4f8ab4903f4fb
Author: Divya Manivannan <divya@multicorewareinc.com>
Date:   Fri Jun 9 18:21:55 2017 +0530

    Add csv feature into libx265

:040000 040000 0af7c90d53f5614a72a5a7331bbe61fa4fe415f0 6a5d7a6955c65858a01746838f4482f2ee750614 M	doc
:040000 040000 eb8f8139d49dd52d40b3dad244476dc01d0a6345 bdaa5bc820e1f97b022148308ba16847b32347f8 M	source
$ 

So it would seem the first offending commit is https://bitbucket.org/multicoreware/x265/commits/bf93bf6183a70b49007169fe82ec94cd94a3c6e7. Perhaps someone can assign the author.

Any help resolving this is appreciated. Thanks.

@Synapto
Copy link

Synapto commented Jul 31, 2017

Workaround found:
https://bitbucket.org/multicoreware/x265/issues/360/v25-does-not-work-in-ffmpeg-24x#comment-38746528

Simple if/def buggery from the looks of it. Well, I say "simple"... hindsight is 20/20 :)

@bradleysepos
Copy link
Contributor Author

Patch added. This seems to fix the problem. @sr55 please test.

@bradleysepos bradleysepos added this to the 1.1.0 milestone Aug 4, 2017
Adds patch to workaround define issue for mingw.
@bradleysepos bradleysepos merged commit b17018b into HandBrake:master Aug 6, 2017
@bradleysepos bradleysepos deleted the contrib-x265 branch August 6, 2017 18:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

5 participants