Am 12.06.19 um 10:01 schrieb Michael Niedermayer:
> On Wed, Jun 12, 2019 at 09:44:26AM +0200, Nomis101 🐝 wrote:
>> This patch will add support of the smpte2084 transfer function to
>> videotoolboxenc. kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ is
>> available on macOS 10.13 and up.
>> This is on the bug tracker at https://trac.ffmpeg.org/ticket/7953
>>
>> diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
>> index 3665581283..e786ebe3a7 100644
>> --- a/libavcodec/videotoolboxenc.c
>> +++ b/libavcodec/videotoolboxenc.c
>> @@ -909,6 +909,12 @@ static int get_cv_transfer_function(AVCodecContext
>> *avctx,
>> case AVCOL_TRC_SMPTE240M:
>> *transfer_fnc = kCVImageBufferTransferFunction_SMPTE_240M_1995;
>> break;
>> +
>> +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
>> + case AVCOL_TRC_SMPTE2084:
>> + *transfer_fnc = kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ;
>> + break;
>> +#endif
>>
>> case AVCOL_TRC_GAMMA22:
>> gamma = 2.2;
>
> git does not like this patch
>
> Applying: avcodec: Add smpte2084 transfer function to videotoolboxenc
> Using index info to reconstruct a base tree...
> error: patch failed: libavcodec/videotoolboxenc.c:909
> error: libavcodec/videotoolboxenc.c: patch does not apply
> error: Did you hand edit your patch?
> It does not apply to blobs recorded in its index.
>
>
> [..]
>
>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
>
Sorry, I removed some whitespace afterwards. My bad. I attached a new untouched
patch created only by git format-patch. Hope this applies.
From a973fa96e4f8f54351e14019acf6b1f7b5b3ff00 Mon Sep 17 00:00:00 2001
From: Nomis101 <nomis...@web.de>
Date: Wed, 12 Jun 2019 10:32:47 +0200
Subject: [PATCH] [PATCH] avcodec: Add smpte2084 transfer function to
videotoolboxenc
---
libavcodec/videotoolboxenc.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index 3665581283..f2cb24a012 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -910,6 +910,12 @@ static int get_cv_transfer_function(AVCodecContext *avctx,
*transfer_fnc = kCVImageBufferTransferFunction_SMPTE_240M_1995;
break;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
+ case AVCOL_TRC_SMPTE2084:
+ *transfer_fnc = kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ;
+ break;
+#endif
+
case AVCOL_TRC_GAMMA22:
gamma = 2.2;
*transfer_fnc = kCVImageBufferTransferFunction_UseGamma;
--
2.20.1 (Apple Git-117)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
