mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 19:21:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

applemedia: Also fix inconsistent pixel format definition for NV12

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5191>
This commit is contained in:
L. E. Segovia 2023-08-16 13:43:56 +00:00 committed by GStreamer Marge Bot
parent e52e1db5ab
commit 07b18a6de5
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subprojects/gst-plugins-bad/sys/applemedia/avsamplevideosink.m
View file

@ -288,11 +288,8 @@ _cv_pixel_format_type_from_video_format (GstVideoFormat format)
return kCVPixelFormatType_24RGB; return kCVPixelFormatType_24RGB;
case GST_VIDEO_FORMAT_BGR: case GST_VIDEO_FORMAT_BGR:
return kCVPixelFormatType_24BGR; return kCVPixelFormatType_24BGR;
#if 0
/* FIXME doesn't seem to work */
case GST_VIDEO_FORMAT_NV12: case GST_VIDEO_FORMAT_NV12:
return kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange; return kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
#endif
case GST_VIDEO_FORMAT_I420: case GST_VIDEO_FORMAT_I420:
return kCVPixelFormatType_420YpCbCr8Planar; return kCVPixelFormatType_420YpCbCr8Planar;
case GST_VIDEO_FORMAT_YUY2: case GST_VIDEO_FORMAT_YUY2:
@ -330,10 +327,8 @@ _pixel_format_description_to_video_format (CFDictionaryRef attrs)
return GST_VIDEO_FORMAT_RGB; return GST_VIDEO_FORMAT_RGB;
case kCVPixelFormatType_24BGR: case kCVPixelFormatType_24BGR:
return GST_VIDEO_FORMAT_BGR; return GST_VIDEO_FORMAT_BGR;
#if 0
case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange: case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange:
return GST_VIDEO_FORMAT_NV12; return GST_VIDEO_FORMAT_NV12;
#endif
case kCVPixelFormatType_420YpCbCr8Planar: case kCVPixelFormatType_420YpCbCr8Planar:
return GST_VIDEO_FORMAT_I420; return GST_VIDEO_FORMAT_I420;
case kCVPixelFormatType_422YpCbCr8_yuvs: case kCVPixelFormatType_422YpCbCr8_yuvs:

2
subprojects/gst-plugins-bad/sys/applemedia/helpers.c
View file

@ -61,7 +61,7 @@ gst_video_format_to_cvpixelformat (GstVideoFormat fmt)
case GST_VIDEO_FORMAT_I420: case GST_VIDEO_FORMAT_I420:
return kCVPixelFormatType_420YpCbCr8Planar; return kCVPixelFormatType_420YpCbCr8Planar;
case GST_VIDEO_FORMAT_NV12: case GST_VIDEO_FORMAT_NV12:
return kCVPixelFormatType_420YpCbCr8BiPlanarFullRange; return kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
case GST_VIDEO_FORMAT_UYVY: case GST_VIDEO_FORMAT_UYVY:
return kCVPixelFormatType_422YpCbCr8; return kCVPixelFormatType_422YpCbCr8;
case GST_VIDEO_FORMAT_YUY2: case GST_VIDEO_FORMAT_YUY2: