Skip to content

Commit 6998d18

Browse files
committed
Revert "media: hevc_dec: Drop the new image formats until we have Mesa 24"
This reverts commit 7821b6a.
1 parent 4507911 commit 6998d18

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

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

Lines changed: 3 additions & 4 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,12 +298,11 @@ 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-
*/
307306
if (sps->bit_depth_luma_minus8 == 0)
308307
pf = V4L2_PIX_FMT_NV12_COL128;
309308
else if (sps->bit_depth_luma_minus8 == 2)

0 commit comments

Comments
 (0)