mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 17:50:36 +00:00
vtenc: Disable ARGB/RGBA64 caps on M1 Pro/Max with macOS <13
Fixes #1358. Passing ARGB64/RGBA64 to vtenc caused the encoding to fail when running on M1 Pro/Max variants with macOS 12.x, so let's remove these formats from caps when such scenario is detected. This issue appears to have been fixed OS-side in macOS 13.0. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3962>
This commit is contained in:
parent
b2bdadd05b
commit
62e385ad35
1 changed files with 29 additions and 5 deletions
|
@ -70,6 +70,7 @@
|
||||||
#include "corevideobuffer.h"
|
#include "corevideobuffer.h"
|
||||||
#include "vtutil.h"
|
#include "vtutil.h"
|
||||||
#include <gst/pbutils/codec-utils.h>
|
#include <gst/pbutils/codec-utils.h>
|
||||||
|
#include <sys/sysctl.h>
|
||||||
|
|
||||||
#define VTENC_DEFAULT_BITRATE 0
|
#define VTENC_DEFAULT_BITRATE 0
|
||||||
#define VTENC_DEFAULT_FRAME_REORDERING TRUE
|
#define VTENC_DEFAULT_FRAME_REORDERING TRUE
|
||||||
|
@ -201,8 +202,7 @@ static GstStaticCaps sink_caps =
|
||||||
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ NV12, I420 }"));
|
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ NV12, I420 }"));
|
||||||
#else
|
#else
|
||||||
static GstStaticCaps sink_caps =
|
static GstStaticCaps sink_caps =
|
||||||
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE
|
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ AYUV64, UYVY, NV12, I420 }"));
|
||||||
("{ AYUV64, UYVY, NV12, I420, ARGB64_BE }"));
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -231,9 +231,33 @@ gst_vtenc_base_init (GstVTEncClass * klass)
|
||||||
|
|
||||||
{
|
{
|
||||||
GstCaps *caps = gst_static_caps_get (&sink_caps);
|
GstCaps *caps = gst_static_caps_get (&sink_caps);
|
||||||
|
#ifndef HAVE_IOS
|
||||||
|
gboolean enable_argb = TRUE;
|
||||||
|
int retval;
|
||||||
|
char cpu_name[15];
|
||||||
|
size_t cpu_len = 15;
|
||||||
|
|
||||||
|
if (__builtin_available (macOS 13.0, *)) {
|
||||||
|
/* Can't negate a __builtin_available check */
|
||||||
|
} else {
|
||||||
|
/* Disable ARGB64/RGBA64 if we're on M1 Pro/Max and macOS < 13.0
|
||||||
|
* due to a bug within VideoToolbox which causes encoding to fail. */
|
||||||
|
retval = sysctlbyname ("machdep.cpu.brand_string", &cpu_name, &cpu_len,
|
||||||
|
NULL, 0);
|
||||||
|
|
||||||
|
if (retval == 0 &&
|
||||||
|
(strstr (cpu_name, "M1 Pro") != NULL ||
|
||||||
|
strstr (cpu_name, "M1 Max") != NULL))
|
||||||
|
enable_argb = FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (enable_argb) {
|
||||||
|
caps = gst_vtutil_caps_append_video_format (caps, "ARGB64_BE");
|
||||||
/* RGBA64_LE is kCVPixelFormatType_64RGBALE, only available on macOS 11.3+ */
|
/* RGBA64_LE is kCVPixelFormatType_64RGBALE, only available on macOS 11.3+ */
|
||||||
if (GST_VTUTIL_HAVE_64ARGBALE)
|
if (GST_VTUTIL_HAVE_64ARGBALE)
|
||||||
caps = gst_vtutil_caps_append_video_format (caps, "RGBA64_LE");
|
caps = gst_vtutil_caps_append_video_format (caps, "RGBA64_LE");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
gst_element_class_add_pad_template (element_class,
|
gst_element_class_add_pad_template (element_class,
|
||||||
gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, caps));
|
gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, caps));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue