raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

media: hevc_dec: Drop the new image formats until we have Mesa 24

Browse Source 
Supporting GL rendering of the new HEVC decoder pixel formats requires
Mesa 24.2.5 or later. There are a couple of minor issues holding up
switching to Mesa 24.

Drop the new pixel formats from enum_fmt so that FFMpeg will use
the older ones that earlier versions of Mesa do support.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
This commit is contained in:
Dave Stevenson
2025-02-24 15:15:02 +00:00
committed by Dom Cobley
parent 4a631ab34c
commit 07b48b7f78
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/platform/raspberrypi/hevc_dec/hevc_d_video.c
View File

@@ -284,8 +284,8 @@ static u32 pixelformat_from_sps(const struct v4l2_ctrl_hevc_sps * const sps,
const int index) const int index)
{ {
static const u32 all_formats[] = { static const u32 all_formats[] = {
V4L2_PIX_FMT_NV12MT_COL128, //V4L2_PIX_FMT_NV12MT_COL128,
V4L2_PIX_FMT_NV12MT_10_COL128, //V4L2_PIX_FMT_NV12MT_10_COL128,
V4L2_PIX_FMT_NV12_COL128, V4L2_PIX_FMT_NV12_COL128,
V4L2_PIX_FMT_NV12_10_COL128, V4L2_PIX_FMT_NV12_10_COL128,
}; };
@@ -298,11 +298,12 @@ static u32 pixelformat_from_sps(const struct v4l2_ctrl_hevc_sps * const sps,
pf = all_formats[index]; pf = all_formats[index];
} else { } else {
if (index == 0) { if (index == 0) {
if (sps->bit_depth_luma_minus8 == 0) /* if (sps->bit_depth_luma_minus8 == 0)
pf = V4L2_PIX_FMT_NV12MT_COL128; pf = V4L2_PIX_FMT_NV12MT_COL128;
else if (sps->bit_depth_luma_minus8 == 2) else if (sps->bit_depth_luma_minus8 == 2)
pf = V4L2_PIX_FMT_NV12MT_10_COL128; pf = V4L2_PIX_FMT_NV12MT_10_COL128;
} else if (index == 1) { } else if (index == 1) {
*/
if (sps->bit_depth_luma_minus8 == 0) if (sps->bit_depth_luma_minus8 == 0)
pf = V4L2_PIX_FMT_NV12_COL128; pf = V4L2_PIX_FMT_NV12_COL128;
else if (sps->bit_depth_luma_minus8 == 2) else if (sps->bit_depth_luma_minus8 == 2)