cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: segmentation fault for hist-scenecut option.

Browse Source 
from upstream via Brad (maintainer)
This commit is contained in:
ajacoutot 2020-03-27 07:34:08 +00:00
parent 3171478cd7
commit ee600dee25
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/x265/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.46 2020/02/24 18:41:19 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.47 2020/03/27 07:34:08 ajacoutot Exp $
COMMENT= free H.265/HEVC encoder
VER= 3.3
DISTNAME= x265_${VER}
PKGNAME= x265-${VER}
REVISION= 0
CATEGORIES= multimedia
MASTER_SITES= https://bitbucket.org/multicoreware/x265/downloads/

34
multimedia/x265/patches/patch-source_encoder_encoder_cpp Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-source_encoder_encoder_cpp,v 1.1 2020/03/27 07:34:08 ajacoutot Exp $
Fix: segmentation fault for hist-scenecut option.
Index: source/encoder/encoder.cpp
--- source/encoder/encoder.cpp.orig
+++ source/encoder/encoder.cpp
@@ -218,10 +218,7 @@ void Encoder::create()
if (m_param->bHistBasedSceneCut)
{
- for (int i = 0; i < x265_cli_csps[m_param->internalCsp].planes; i++)
- {
- m_planeSizes[i] = (m_param->sourceWidth >> x265_cli_csps[p->internalCsp].width[i]) * (m_param->sourceHeight >> x265_cli_csps[m_param->internalCsp].height[i]);
- }
+ m_planeSizes[0] = (m_param->sourceWidth >> x265_cli_csps[p->internalCsp].width[0]) * (m_param->sourceHeight >> x265_cli_csps[m_param->internalCsp].height[0]);
uint32_t pixelbytes = m_param->internalBitDepth > 8 ? 2 : 1;
m_edgePic = X265_MALLOC(pixel, m_planeSizes[0] * pixelbytes);
m_edgeHistThreshold = m_param->edgeTransitionThreshold;
@@ -1605,6 +1602,14 @@ int Encoder::encode(const x265_picture* pic_in, x265_p
if (m_param->bHistBasedSceneCut && pic_in)
{
x265_picture *pic = (x265_picture *) pic_in;
+
+ if (pic->poc == 0)
+ {
+ /* for entire encode compute the chroma plane sizes only once */
+ for (int i = 1; i < x265_cli_csps[m_param->internalCsp].planes; i++)
+ m_planeSizes[i] = (pic->width >> x265_cli_csps[m_param->internalCsp].width[i]) * (pic->height >> x265_cli_csps[m_param->internalCsp].height[i]);
+ }
+
if (computeHistograms(pic))
{
double maxUVSad = 0.0, edgeSad = 0.0;