Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/subprojects/gst-plugins-bad/sys/kms/gstkmsallocator.c b/subprojects/gst-plugins-bad/sys/kms/gstkmsallocator.c
- index 15a5c8d103..240136d1df 100644
- --- a/subprojects/gst-plugins-bad/sys/kms/gstkmsallocator.c
- +++ b/subprojects/gst-plugins-bad/sys/kms/gstkmsallocator.c
- @@ -367,7 +367,7 @@ gst_kms_allocator_add_fb (GstKMSAllocator * alloc, GstKMSMemory * kmsmem,
- for (i = 0; i < num_planes; i++) {
- pitches[i] = GST_VIDEO_INFO_PLANE_STRIDE (vinfo, i);
- - offsets[i] = in_offsets[i];
- + offsets[i] = i == 0 ? 0 : 8265728;
- }
- GST_DEBUG_OBJECT (alloc, "bo handles: %d, %d, %d, %d", bo_handles[0],
- diff --git a/subprojects/gst-plugins-bad/sys/v4l2codecs/gstv4l2format.c b/subprojects/gst-plugins-bad/sys/v4l2codecs/gstv4l2format.c
- index 717c791c01..71b5a0087e 100644
- --- a/subprojects/gst-plugins-bad/sys/v4l2codecs/gstv4l2format.c
- +++ b/subprojects/gst-plugins-bad/sys/v4l2codecs/gstv4l2format.c
- @@ -30,6 +30,11 @@ GST_DEBUG_CATEGORY_EXTERN (gstv4l2codecs_debug);
- #define V4L2_PIX_FMT_NC12 v4l2_fourcc('N', 'C', '1', '2') /* Y/CbCr 4:2:0 (128b cols) */
- #endif
- +#define V4L2_PIX_FMT_APPLE_COMP_NV12 v4l2_fourcc('A', 'V', '1', '2') /* Apple compressed NV12 */
- +#define DRM_FORMAT_MOD_VENDOR_APPLE 0x0c
- +#define DRM_FORMAT_MOD_APPLE_INTERCHANGE_COMPRESSED \
- + fourcc_mod_code(APPLE, 3)
- +
- typedef struct
- {
- guint32 v4l2_pix_fmt;
- @@ -42,20 +47,7 @@ typedef struct
- /* *INDENT-OFF* */
- /* Keep the same order as GST_V4L2_DEFAULT_VIDEO_FORMATS */
- static const GstV4l2FormatDesc gst_v4l2_descriptions[] = {
- - {V4L2_PIX_FMT_NV20, GST_VIDEO_FORMAT_NV16_10LE40, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- - {V4L2_PIX_FMT_NV16, GST_VIDEO_FORMAT_NV16, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- - {V4L2_PIX_FMT_MT2110R, GST_VIDEO_FORMAT_MT2110R, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- - {V4L2_PIX_FMT_MT2110T, GST_VIDEO_FORMAT_MT2110T, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- - {V4L2_PIX_FMT_NV15_4L4, GST_VIDEO_FORMAT_NV12_10LE40_4L4, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- - {V4L2_PIX_FMT_NV15, GST_VIDEO_FORMAT_NV12_10LE40, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- - {V4L2_PIX_FMT_P010, GST_VIDEO_FORMAT_P010_10LE, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- - {V4L2_PIX_FMT_YUYV, GST_VIDEO_FORMAT_YUY2, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- - {V4L2_PIX_FMT_MM21, GST_VIDEO_FORMAT_NV12_16L32S, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- - {V4L2_PIX_FMT_SUNXI_TILED_NV12, GST_VIDEO_FORMAT_NV12_32L32, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- - {V4L2_PIX_FMT_NV12_4L4, GST_VIDEO_FORMAT_NV12_4L4, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- - {V4L2_PIX_FMT_NC12, GST_VIDEO_FORMAT_UNKNOWN, DRM_FORMAT_NV12, DRM_FORMAT_MOD_BROADCOM_SAND128, 2},
- - {V4L2_PIX_FMT_NV12, GST_VIDEO_FORMAT_NV12, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- - {V4L2_PIX_FMT_YUV420M, GST_VIDEO_FORMAT_I420, DRM_FORMAT_INVALID, DRM_FORMAT_MOD_INVALID, 0},
- + {V4L2_PIX_FMT_APPLE_COMP_NV12, GST_VIDEO_FORMAT_UNKNOWN, DRM_FORMAT_NV12, DRM_FORMAT_MOD_APPLE_INTERCHANGE_COMPRESSED, 1},
- };
- /* *INDENT-ON* */
- #define GST_V4L2_FORMAT_DESC_COUNT (G_N_ELEMENTS (gst_v4l2_descriptions))
- diff --git a/subprojects/gst-plugins-base/gst-libs/gst/video/video-info-dma.c b/subprojects/gst-plugins-base/gst-libs/gst/video/video-info-dma.c
- index 3a35a70957..5f761e97fc 100644
- --- a/subprojects/gst-plugins-base/gst-libs/gst/video/video-info-dma.c
- +++ b/subprojects/gst-plugins-base/gst-libs/gst/video/video-info-dma.c
- @@ -529,6 +529,9 @@ gst_video_dma_drm_fourcc_to_string (guint32 fourcc, guint64 modifier)
- return s;
- }
- +#define DRM_FORMAT_MOD_APPLE_INTERCHANGE_COMPRESSED \
- + fourcc_mod_code(APPLE, 3)
- +
- /* *INDENT-OFF* */
- static const struct FormatMap
- {
- @@ -542,7 +545,7 @@ static const struct FormatMap
- {GST_VIDEO_FORMAT_VYUY, DRM_FORMAT_VYUY, DRM_FORMAT_MOD_LINEAR},
- /* No VUYA fourcc define, just mapping it as AYUV. */
- {GST_VIDEO_FORMAT_VUYA, DRM_FORMAT_AYUV, DRM_FORMAT_MOD_LINEAR},
- - {GST_VIDEO_FORMAT_NV12, DRM_FORMAT_NV12, DRM_FORMAT_MOD_LINEAR},
- + {GST_VIDEO_FORMAT_NV12, DRM_FORMAT_NV12, DRM_FORMAT_MOD_APPLE_INTERCHANGE_COMPRESSED},
- {GST_VIDEO_FORMAT_NV12_4L4, DRM_FORMAT_NV12, DRM_FORMAT_MOD_VIVANTE_TILED},
- {GST_VIDEO_FORMAT_NV12_64Z32, DRM_FORMAT_NV12, DRM_FORMAT_MOD_SAMSUNG_64_32_TILE},
- {GST_VIDEO_FORMAT_NV12_16L32S, DRM_FORMAT_NV12, DRM_FORMAT_MOD_MTK_16L_32S_TILE},
Advertisement
Add Comment
Please, Sign In to add comment