[vlc-commits] [Git][videolan/vlc][master] mmal: support ABGR subpictures
Steve Lhomme (@robUx4)
gitlab at videolan.org
Sun Oct 8 09:57:47 UTC 2023
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
2b5929ed by Steve Lhomme at 2023-10-08T09:45:22+00:00
mmal: support ABGR subpictures
We do have VLC_CODEC_ABGR now.
- - - - -
3 changed files:
- modules/hw/mmal/mmal_picture.c
- modules/hw/mmal/mmal_picture.h
- modules/hw/mmal/vout.c
Changes:
=====================================
modules/hw/mmal/mmal_picture.c
=====================================
@@ -34,8 +34,6 @@
#include "mmal_cma.h"
#include "mmal_picture.h"
-const vlc_fourcc_t hw_mmal_vzc_subpicture_chromas[] = { VLC_CODEC_RGBA, VLC_CODEC_BGRA, VLC_CODEC_ARGB, 0 };
-
#define UINT64_SIZE(s) (((s) + sizeof(uint64_t) - 1)/sizeof(uint64_t))
// WB + Inv
@@ -94,7 +92,8 @@ MMAL_FOURCC_T vlc_to_mmal_video_fourcc(const video_frame_format_t * const vf_vlc
return MMAL_ENCODING_BGRA;
case VLC_CODEC_ARGB:
return MMAL_ENCODING_ARGB;
- // VLC_CODEC_ABGR does not exist in VLC
+ case VLC_CODEC_ABGR:
+ return MMAL_ENCODING_ABGR;
case VLC_CODEC_MMAL_OPAQUE:
return MMAL_ENCODING_OPAQUE;
default:
=====================================
modules/hw/mmal/mmal_picture.h
=====================================
@@ -113,10 +113,6 @@ MMAL_BUFFER_HEADER_T * hw_mmal_pic_buf_replicated(const picture_t *const pic, MM
//----------------------------------------------------------------------------
-// At the moment we cope with any mono-planar RGBA thing
-// We could cope with many other things but they currently don't occur
-extern const vlc_fourcc_t hw_mmal_vzc_subpicture_chromas[];
-
bool hw_mmal_vzc_buf_set_format(MMAL_BUFFER_HEADER_T * const buf, MMAL_ES_FORMAT_T * const es_fmt);
MMAL_DISPLAYREGION_T * hw_mmal_vzc_buf_region(MMAL_BUFFER_HEADER_T * const buf);
void hw_mmal_vzc_buf_scale_dest_rect(MMAL_BUFFER_HEADER_T * const buf, const MMAL_RECT_T * const scale_rect);
=====================================
modules/hw/mmal/vout.c
=====================================
@@ -144,6 +144,13 @@ typedef struct vout_display_sys_t {
} vout_display_sys_t;
+// At the moment we cope with any mono-planar RGBA thing
+// We could cope with many other things but they currently don't occur
+const vlc_fourcc_t hw_mmal_vzc_subpicture_chromas[] = {
+ VLC_CODEC_RGBA, VLC_CODEC_BGRA, VLC_CODEC_ARGB, VLC_CODEC_ABGR, 0
+};
+
+
// ISP setup
static bool want_copy(const video_format_t * const fmt)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2b5929edd6001a2b14c308989a51be4c73103265
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2b5929edd6001a2b14c308989a51be4c73103265
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list