diff mbox series

[FFmpeg-devel] avutil/hwcontext_videotoolbox: Fix version check

Message ID tencent_386EBEE5491311084F93F9136A75C4090E05@qq.com
State New
Headers show
Series [FFmpeg-devel] avutil/hwcontext_videotoolbox: Fix version check | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 fail Make fate failed
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Zhao Zhili July 8, 2024, 6:30 a.m. UTC
From: Zhao Zhili <zhilizhao@tencent.com>

---
 libavutil/hwcontext_videotoolbox.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Marvin Scholz July 9, 2024, 8:43 a.m. UTC | #1
On 8 Jul 2024, at 8:30, Zhao Zhili wrote:

> From: Zhao Zhili <zhilizhao@tencent.com>
>
> ---
>  libavutil/hwcontext_videotoolbox.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c
> index 953155ce32..dd89edfa08 100644
> --- a/libavutil/hwcontext_videotoolbox.c
> +++ b/libavutil/hwcontext_videotoolbox.c
> @@ -588,7 +588,7 @@ static int vt_pixbuf_set_colorspace(void *log_ctx,
>      } else
>          CVBufferRemoveAttachment(pixbuf, kCVImageBufferGammaLevelKey);
>
> -    if (__builtin_available(macOS 10.8, iOS 10, *)) {
> +    if (__builtin_available(macOS 12.0, iOS 15.0, *)) {
>          CFDictionaryRef attachments = CVBufferCopyAttachments(pixbuf, kCVAttachmentMode_ShouldPropagate);
>          if (attachments) {
>              colorspace = CVImageBufferCreateColorSpaceFromAttachments(attachments);
> -- 
> 2.42.0

LGTM. Sorry for breaking this.

>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
James Almer July 10, 2024, 5:26 p.m. UTC | #2
On 7/9/2024 5:43 AM, epirat07@gmail.com wrote:
> 
> 
> On 8 Jul 2024, at 8:30, Zhao Zhili wrote:
> 
>> From: Zhao Zhili <zhilizhao@tencent.com>
>>
>> ---
>>   libavutil/hwcontext_videotoolbox.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c
>> index 953155ce32..dd89edfa08 100644
>> --- a/libavutil/hwcontext_videotoolbox.c
>> +++ b/libavutil/hwcontext_videotoolbox.c
>> @@ -588,7 +588,7 @@ static int vt_pixbuf_set_colorspace(void *log_ctx,
>>       } else
>>           CVBufferRemoveAttachment(pixbuf, kCVImageBufferGammaLevelKey);
>>
>> -    if (__builtin_available(macOS 10.8, iOS 10, *)) {
>> +    if (__builtin_available(macOS 12.0, iOS 15.0, *)) {
>>           CFDictionaryRef attachments = CVBufferCopyAttachments(pixbuf, kCVAttachmentMode_ShouldPropagate);
>>           if (attachments) {
>>               colorspace = CVImageBufferCreateColorSpaceFromAttachments(attachments);
>> -- 
>> 2.42.0
> 
> LGTM. Sorry for breaking this.

http://fate.ffmpeg.org/log.cgi?time=20240710170512&slot=aarch64-osx-clang-1200.0.32.29&log=compile

Looks like it's not enough.
Marvin Scholz July 10, 2024, 6:08 p.m. UTC | #3
On 10 Jul 2024, at 19:26, James Almer wrote:

> On 7/9/2024 5:43 AM, epirat07@gmail.com wrote:
>>
>>
>> On 8 Jul 2024, at 8:30, Zhao Zhili wrote:
>>
>>> From: Zhao Zhili <zhilizhao@tencent.com>
>>>
>>> ---
>>>   libavutil/hwcontext_videotoolbox.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c
>>> index 953155ce32..dd89edfa08 100644
>>> --- a/libavutil/hwcontext_videotoolbox.c
>>> +++ b/libavutil/hwcontext_videotoolbox.c
>>> @@ -588,7 +588,7 @@ static int vt_pixbuf_set_colorspace(void *log_ctx,
>>>       } else
>>>           CVBufferRemoveAttachment(pixbuf, kCVImageBufferGammaLevelKey);
>>>
>>> -    if (__builtin_available(macOS 10.8, iOS 10, *)) {
>>> +    if (__builtin_available(macOS 12.0, iOS 15.0, *)) {
>>>           CFDictionaryRef attachments = CVBufferCopyAttachments(pixbuf, kCVAttachmentMode_ShouldPropagate);
>>>           if (attachments) {
>>>               colorspace = CVImageBufferCreateColorSpaceFromAttachments(attachments);
>>> -- 
>>> 2.42.0
>>
>> LGTM. Sorry for breaking this.
>
> http://fate.ffmpeg.org/log.cgi?time=20240710170512&slot=aarch64-osx-clang-1200.0.32.29&log=compile
>
> Looks like it's not enough.

See my patch from yesterday, should fix it.

> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c
index 953155ce32..dd89edfa08 100644
--- a/libavutil/hwcontext_videotoolbox.c
+++ b/libavutil/hwcontext_videotoolbox.c
@@ -588,7 +588,7 @@  static int vt_pixbuf_set_colorspace(void *log_ctx,
     } else
         CVBufferRemoveAttachment(pixbuf, kCVImageBufferGammaLevelKey);
 
-    if (__builtin_available(macOS 10.8, iOS 10, *)) {
+    if (__builtin_available(macOS 12.0, iOS 15.0, *)) {
         CFDictionaryRef attachments = CVBufferCopyAttachments(pixbuf, kCVAttachmentMode_ShouldPropagate);
         if (attachments) {
             colorspace = CVImageBufferCreateColorSpaceFromAttachments(attachments);