Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59b94de3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: add hevc hybrid driver support"

parents 177b3030 7b4fa25d

drivers/media/platform/msm/vidc/msm_vdec.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -363,6 +363,14 @@ struct msm_vidc_format vdec_formats[] = { 
		.get_frame_size = get_frame_size_compressed,

		.get_frame_size = get_frame_size_compressed,

		.type = OUTPUT_PORT,

		.type = OUTPUT_PORT,

	},

	},

	{

		.name = "HEVC_HYBRID",

		.description = "HEVC compressed format",

		.fourcc = V4L2_PIX_FMT_HEVC_HYBRID,

		.num_planes = 1,

		.get_frame_size = get_frame_size_compressed,

		.type = OUTPUT_PORT,

	},

	{

	{

		.name = "VP8",

		.name = "VP8",

		.description = "VP8 compressed format",

		.description = "VP8 compressed format",

drivers/media/platform/msm/vidc/msm_vidc_common.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -1337,7 +1337,9 @@ static enum hal_video_codec get_hal_codec_type(int fourcc) 
	case V4L2_PIX_FMT_HEVC:

	case V4L2_PIX_FMT_HEVC:

		codec = HAL_VIDEO_CODEC_HEVC;

		codec = HAL_VIDEO_CODEC_HEVC;

		break;

		break;



	case V4L2_PIX_FMT_HEVC_HYBRID:

		codec = HAL_VIDEO_CODEC_HEVC_HYBRID;

		break;

	default:

	default:

		dprintk(VIDC_ERR, "Wrong codec: %d\n", fourcc);

		dprintk(VIDC_ERR, "Wrong codec: %d\n", fourcc);

		codec = HAL_UNUSED_CODEC;

		codec = HAL_UNUSED_CODEC;

drivers/media/platform/msm/vidc/vidc_hfi_api.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -204,6 +204,7 @@ enum hal_video_codec { 
	HAL_VIDEO_CODEC_VP7      = 0x00000800,

	HAL_VIDEO_CODEC_VP7      = 0x00000800,

	HAL_VIDEO_CODEC_VP8      = 0x00001000,

	HAL_VIDEO_CODEC_VP8      = 0x00001000,

	HAL_VIDEO_CODEC_HEVC     = 0x00002000,

	HAL_VIDEO_CODEC_HEVC     = 0x00002000,

	HAL_VIDEO_CODEC_HEVC_HYBRID     = 0x00004000,

	HAL_UNUSED_CODEC = 0x10000000,

	HAL_UNUSED_CODEC = 0x10000000,

};

};

drivers/media/platform/msm/vidc/vidc_hfi_helper.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -80,6 +80,7 @@ 
#define HFI_VIDEO_CODEC_SPARK				0x00000200

#define HFI_VIDEO_CODEC_SPARK				0x00000200

#define HFI_VIDEO_CODEC_VP8				0x00001000

#define HFI_VIDEO_CODEC_VP8				0x00001000

#define HFI_VIDEO_CODEC_HEVC				0x00002000

#define HFI_VIDEO_CODEC_HEVC				0x00002000

#define HFI_VIDEO_CODEC_HEVC_HYBRID			0x00004000





#define HFI_H264_PROFILE_BASELINE			0x00000001

#define HFI_H264_PROFILE_BASELINE			0x00000001

#define HFI_H264_PROFILE_MAIN				0x00000002

#define HFI_H264_PROFILE_MAIN				0x00000002