Skip to content

Commit e61ffcb

Browse files
6by9popcornmix
authored andcommitted
media: hevc_dec: Drop the new image formats until we have Mesa 24
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>
1 parent 178d524 commit e61ffcb

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/media/platform/raspberrypi/hevc_dec/hevc_d_video.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ static u32 pixelformat_from_sps(const struct v4l2_ctrl_hevc_sps * const sps,
284284
const int index)
285285
{
286286
static const u32 all_formats[] = {
287-
V4L2_PIX_FMT_NV12MT_COL128,
288-
V4L2_PIX_FMT_NV12MT_10_COL128,
287+
//V4L2_PIX_FMT_NV12MT_COL128,
288+
//V4L2_PIX_FMT_NV12MT_10_COL128,
289289
V4L2_PIX_FMT_NV12_COL128,
290290
V4L2_PIX_FMT_NV12_10_COL128,
291291
};
@@ -298,11 +298,12 @@ static u32 pixelformat_from_sps(const struct v4l2_ctrl_hevc_sps * const sps,
298298
pf = all_formats[index];
299299
} else {
300300
if (index == 0) {
301-
if (sps->bit_depth_luma_minus8 == 0)
301+
/* if (sps->bit_depth_luma_minus8 == 0)
302302
pf = V4L2_PIX_FMT_NV12MT_COL128;
303303
else if (sps->bit_depth_luma_minus8 == 2)
304304
pf = V4L2_PIX_FMT_NV12MT_10_COL128;
305305
} else if (index == 1) {
306+
*/
306307
if (sps->bit_depth_luma_minus8 == 0)
307308
pf = V4L2_PIX_FMT_NV12_COL128;
308309
else if (sps->bit_depth_luma_minus8 == 2)

0 commit comments

Comments
 (0)