diff options
| author | sfan5 <sfan5@live.de> | 2024-03-10 20:30:04 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2024-03-16 13:27:34 +0100 |
| commit | 93a5059e8ccf1e089d95e586f74952b4eb9c9e16 (patch) | |
| tree | 556cf16c368f14572f18b941d216be41097672b7 | |
| parent | 474e213f528c5c9c72faabb83f75e441a212d591 (diff) | |
| download | mpv-93a5059e8ccf1e089d95e586f74952b4eb9c9e16.tar.bz2 mpv-93a5059e8ccf1e089d95e586f74952b4eb9c9e16.tar.xz | |
vo_drm: use native matching pixel format for XRGB2101010
| -rw-r--r-- | video/out/vo_drm.c | 40 |
1 files changed, 6 insertions, 34 deletions
diff --git a/video/out/vo_drm.c b/video/out/vo_drm.c index aae73f7be1..b1f671f859 100644 --- a/video/out/vo_drm.c +++ b/video/out/vo_drm.c @@ -38,11 +38,8 @@ #include "vo.h" #define IMGFMT_XRGB8888 IMGFMT_BGR0 -#if BYTE_ORDER == BIG_ENDIAN -#define IMGFMT_XRGB2101010 pixfmt2imgfmt(AV_PIX_FMT_GBRP10BE) -#else -#define IMGFMT_XRGB2101010 pixfmt2imgfmt(AV_PIX_FMT_GBRP10LE) -#endif +#define IMGFMT_XRGB2101010 \ + pixfmt2imgfmt(MP_SELECT_LE_BE(AV_PIX_FMT_X2RGB10LE, AV_PIX_FMT_X2RGB10BE)) #define BYTES_PER_PIXEL 4 #define BITS_PER_PIXEL 32 @@ -239,35 +236,10 @@ static void draw_image(struct vo *vo, mp_image_t *mpi, struct framebuffer *buf) osd_draw_on_image(vo->osd, p->osd, 0, 0, p->cur_frame); } - if (p->drm_format == DRM_FORMAT_XRGB2101010) { - // Pack GBRP10 image into XRGB2101010 for DRM - const int w = p->cur_frame->w; - const int h = p->cur_frame->h; - - const int g_padding = p->cur_frame->stride[0]/sizeof(uint16_t) - w; - const int b_padding = p->cur_frame->stride[1]/sizeof(uint16_t) - w; - const int r_padding = p->cur_frame->stride[2]/sizeof(uint16_t) - w; - const int fbuf_padding = buf->stride/sizeof(uint32_t) - w; - - uint16_t *g_ptr = (uint16_t*)p->cur_frame->planes[0]; - uint16_t *b_ptr = (uint16_t*)p->cur_frame->planes[1]; - uint16_t *r_ptr = (uint16_t*)p->cur_frame->planes[2]; - uint32_t *fbuf_ptr = (uint32_t*)buf->map; - for (unsigned y = 0; y < h; ++y) { - for (unsigned x = 0; x < w; ++x) { - *fbuf_ptr++ = (*r_ptr++ << 20) | (*g_ptr++ << 10) | (*b_ptr++); - } - g_ptr += g_padding; - b_ptr += b_padding; - r_ptr += r_padding; - fbuf_ptr += fbuf_padding; - } - } else { // p->drm_format == DRM_FORMAT_XRGB8888 - memcpy_pic(buf->map, p->cur_frame->planes[0], - p->cur_frame->w * BYTES_PER_PIXEL, p->cur_frame->h, - buf->stride, - p->cur_frame->stride[0]); - } + memcpy_pic(buf->map, p->cur_frame->planes[0], + p->cur_frame->w * BYTES_PER_PIXEL, p->cur_frame->h, + buf->stride, + p->cur_frame->stride[0]); } if (mpi != p->last_input) { |