Date: Mon, 21 Sep 2020 17:15:50 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549462 - head/multimedia/x265/files Message-ID: <202009211715.08LHFowk060401@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mi Date: Mon Sep 21 17:15:50 2020 New Revision: 549462 URL: https://svnweb.freebsd.org/changeset/ports/549462 Log: Actually commit the SVT-HEVC patch carelessly ommitted previously. PR: 247035, 248479 Reported by: VVD Sponsored by: United Marsupials Added: head/multimedia/x265/files/patch-source_encoder_api.cpp (contents, props changed) Added: head/multimedia/x265/files/patch-source_encoder_api.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/x265/files/patch-source_encoder_api.cpp Mon Sep 21 17:15:50 2020 (r549462) @@ -0,0 +1,44 @@ +In svt-hevc 1.5.0, they payload-array (1024 bytes) is part of the structure, +rather than a pointer to be allocated separately. + +This patch should allow compiling x265 against both older (1.4.x) and 1.5.x +versions of the dependency. + +See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=248479 + + -mi + +--- source/encoder/api.cpp 2020-05-29 13:39:35.000000000 -0400 ++++ source/encoder/api.cpp 2020-08-06 22:51:30.227635000 -0400 +@@ -451,5 +451,7 @@ + if (pic_in->rpu.payloadSize) + { ++#if ! SVT_CHECK_VERSION(1, 5, 0) + inputData->dolbyVisionRpu.payload = X265_MALLOC(uint8_t, 1024); ++#endif + memcpy(inputData->dolbyVisionRpu.payload, pic_in->rpu.payload, pic_in->rpu.payloadSize); + inputData->dolbyVisionRpu.payloadSize = pic_in->rpu.payloadSize; +@@ -458,5 +460,7 @@ + else + { ++#if ! SVT_CHECK_VERSION(1, 5, 0) + inputData->dolbyVisionRpu.payload = NULL; ++#endif + inputData->dolbyVisionRpu.payloadSize = 0; + } +@@ -696,5 +700,7 @@ + svt_print_summary(enc); + EB_H265_ENC_INPUT *inputData = (EB_H265_ENC_INPUT*)encoder->m_svtAppData->inputPictureBuffer->pBuffer; ++#if ! SVT_CHECK_VERSION(1, 5, 0) + if (inputData->dolbyVisionRpu.payload) X265_FREE(inputData->dolbyVisionRpu.payload); ++#endif + + X265_FREE(inputData); +@@ -2052,5 +2058,7 @@ + + EB_H265_ENC_INPUT *inputData = (EB_H265_ENC_INPUT*)inputPtr->pBuffer; ++#if ! SVT_CHECK_VERSION(1, 5, 0) + inputData->dolbyVisionRpu.payload = NULL; ++#endif + inputData->dolbyVisionRpu.payloadSize = 0; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009211715.08LHFowk060401>