Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
multimedia/x265: upgrade to 3.5. Finally...
PR: 274526 Submitted by: takefu Release Notes: https://x265.readthedocs.io/en/master/releasenotes.html#version-3-5
- Loading branch information
Mikhail Teterin
authored and
Mikhail Teterin
committed
Dec 15, 2023
1 parent
f14b1c8
commit 645419c
Showing
10 changed files
with
296 additions
and
40 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| TIMESTAMP = 1600662771 | ||
| SHA256 (x265-3.4.tar.gz) = 01f17d94689ef79807fa2b4bd7f5f58bb18416e72a135c7f56c30162a980cfb8 | ||
| SIZE (x265-3.4.tar.gz) = 1532396 | ||
| TIMESTAMP = 1698027802 | ||
| SHA256 (x265-3.5.tar.gz) = 8a5fcfddb3e2db520b637e475a507fb00117d554bdb3204c5828626d888c306a | ||
| SIZE (x265-3.5.tar.gz) = 1538610 | ||
| SHA256 (x265-asm-warnings.patch) = 0faa3278887a47ed8c968c994e4cc71a2921aac38f5d560dae898124f806871d | ||
| SIZE (x265-asm-warnings.patch) = 4526 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| --- source/common/picyuv.h 2023-06-27 10:11:49.000000000 -0400 | ||
| +++ source/common/picyuv.h 2023-10-22 21:14:09.423270000 -0400 | ||
| @@ -26,5 +26,5 @@ | ||
|
|
||
| #include "common.h" | ||
| -#include "md5.h" | ||
| +#include <md5.h> | ||
| #include "x265.h" | ||
| struct x265_picyuv {}; | ||
| --- source/encoder/frameencoder.h 2023-06-27 10:11:49.000000000 -0400 | ||
| +++ source/encoder/frameencoder.h 2023-10-22 21:14:52.414503000 -0400 | ||
| @@ -31,5 +31,4 @@ | ||
| #include "frame.h" | ||
| #include "picyuv.h" | ||
| -#include "md5.h" | ||
|
|
||
| #include "analysis.h" | ||
| --- source/encoder/sei.h 2023-06-27 10:11:49.000000000 -0400 | ||
| +++ source/encoder/sei.h 2023-10-22 21:15:50.862452000 -0400 | ||
| @@ -29,5 +29,5 @@ | ||
| #include "slice.h" | ||
| #include "nal.h" | ||
| -#include "md5.h" | ||
| +#include <md5.h> | ||
|
|
||
| namespace X265_NS { | ||
| --- source/encoder/frameencoder.cpp 2023-06-27 10:11:49.000000000 -0400 | ||
| +++ source/encoder/frameencoder.cpp 2023-10-22 21:27:55.363979000 -0400 | ||
| @@ -426,5 +426,5 @@ | ||
| m_seiReconPictureDigest.m_method = SEIDecodedPictureHash::MD5; | ||
| for (int i = 0; i < planes; i++) | ||
| - MD5Final(&m_seiReconPictureDigest.m_state[i], m_seiReconPictureDigest.m_digest[i]); | ||
| + MD5Final(m_seiReconPictureDigest.m_digest[i], &m_seiReconPictureDigest.m_state[i]); | ||
| payloadSize = 1 + 16 * planes; | ||
| } | ||
| --- source/CMakeLists.txt 2023-06-27 10:11:49.000000000 -0400 | ||
| +++ source/CMakeLists.txt 2023-10-22 21:54:36.900303000 -0400 | ||
| @@ -96,4 +96,5 @@ | ||
| if(UNIX) | ||
| list(APPEND PLATFORM_LIBS pthread) | ||
| + list(APPEND PLATFORM_LIBS md) | ||
| find_library(LIBRT rt) | ||
| if(LIBRT) | ||
| --- source/common/CMakeLists.txt 2023-06-27 10:11:49.000000000 -0400 | ||
| +++ source/common/CMakeLists.txt 2023-10-22 21:21:56.177834000 -0400 | ||
| @@ -156,5 +156,4 @@ | ||
| threadpool.cpp threadpool.h | ||
| wavefront.h wavefront.cpp | ||
| - md5.cpp md5.h | ||
| bitstream.h bitstream.cpp | ||
| yuv.cpp yuv.h |
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| https://github.com/Netflix/vmaf/commit/122089fa3d23 | ||
|
|
||
| --- source/x265.h.orig 2020-09-16 15:52:49 UTC | ||
| --- source/x265.h.orig 2023-06-27 14:11:49 UTC | ||
| +++ source/x265.h | ||
| @@ -733,7 +733,7 @@ typedef struct x265_vmaf_commondata | ||
| @@ -753,7 +753,7 @@ typedef struct x265_vmaf_commondata | ||
| int enable_conf_interval; | ||
| }x265_vmaf_commondata; | ||
|
|
||
| -static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.pkl", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } }; | ||
| +static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.json", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } }; | ||
|
|
||
| /* x265 input parameters | ||
| * | ||
| typedef struct x265_temporal_layer { | ||
| int poc_offset; /* POC offset */ |
Oops, something went wrong.