Skip to content

Commit e7aacda

Browse files
bai-isaacintel-mediadev
authored andcommitted
[Encode] Merge SLBB update feature branch to comp/media
* [Encode] Merge SLBB update feature branch to comp/media Merge SLBB update feature branch to comp/media. Init for SLBB Update pipeline.
1 parent 59309dc commit e7aacda

File tree

7 files changed

+25
-4
lines changed

7 files changed

+25
-4
lines changed

media_common/agnostic/common/codec/shared/codec_def_common_encode.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ enum
454454
CODECHAL_ENCODE_PERFTAG_CALL_VP9_HPU_SECOND_PASS,
455455
CODECHAL_ENCODE_PERFTAG_CALL_RSVD,
456456
CODECHAL_ENCODE_PERFTAG_CALL_SALIENCY_KERNEL,
457+
CODECHAL_ENCODE_PERFTAG_CALL_SLBB_UPDATE,
457458
};
458459

459460
typedef enum _CODECHAL_ENCODE_FUNCTION_ID

media_softlet/agnostic/common/codec/hal/enc/av1/pipeline/encode_av1_pipeline.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class Av1Pipeline : public EncodePipeline
5858
Av1BackAnnotation,
5959
Av1Superres,
6060
EncodeCheckHucLoad,
61+
HucSLBBUpdate,
6162
};
6263

6364
protected:

media_softlet/agnostic/common/codec/hal/enc/avc/pipeline/encode_avc_vdenc_pipeline.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ class AvcVdencPipeline : public EncodePipeline
5858
{
5959
HucBrcInit = CONSTRUCTPACKETID(PACKET_COMPONENT_ENCODE, PACKET_SUBCOMPONENT_AVC, 0),
6060
HucBrcUpdate,
61-
VdencPacket
61+
VdencPacket,
62+
HucSLBBUpdate
6263
};
6364

6465
protected:

media_softlet/agnostic/common/codec/hal/enc/hevc/pipeline/encode_hevc_pipeline.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ class HevcPipeline : public EncodePipeline
6262
HucLaUpdate,
6363
hevcVdencPacket422,
6464
EncodeCheckHucLoad,
65-
hevcSaliencyPacket
65+
hevcSaliencyPacket,
66+
HucSLBBUpdate
6667
#if ((_DEBUG || _RELEASE_INTERNAL) && _MEDIA_RESERVED)
6768
,
6869
hevcVdencMvdumpPacket

media_softlet/agnostic/common/codec/hal/enc/shared/encode_utils.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "mos_utilities.h"
2727

2828
#define _SW_BRC _MEDIA_RESERVED && (_DEBUG || _RELEASE_INTERNAL)
29+
#define _SW_HUC _MEDIA_RESERVED && (_DEBUG || _RELEASE_INTERNAL)
2930
#define _KERNEL_RESERVED _MEDIA_RESERVED && ENABLE_KERNELS
3031

3132
enum HuCFunction
@@ -38,7 +39,8 @@ enum HuCFunction
3839
LA_RESET,
3940
LA_UPDATE,
4041
PAK_INTEGRATE,
41-
HPU_VP9
42+
HPU_VP9,
43+
SLBB_UPDATE
4244
};
4345

4446
//------------------------------------------------------------------------------

media_softlet/agnostic/common/codec/hal/enc/shared/pipeline/encode_user_setting.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,18 @@ MOS_STATUS EncodePipeline::InitUserSetting(MediaUserSettingSharedPtr userSetting
169169
MediaUserSetting::Group::Sequence,
170170
"",
171171
false);
172+
DeclareUserSettingKeyForDebug(
173+
userSettingPtr,
174+
"SLBB SW Simulation",
175+
MediaUserSetting::Group::Sequence,
176+
int32_t(0),
177+
false);
178+
DeclareUserSettingKeyForDebug(
179+
userSettingPtr,
180+
"SLBB SW Simulation Modules Path",
181+
MediaUserSetting::Group::Sequence,
182+
"",
183+
false);
172184
DeclareUserSettingKey(
173185
userSettingPtr,
174186
"TCBRC Quality Boost Mode",

media_softlet/agnostic/common/codec/hal/shared/huc_kernel_source.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,10 @@ class HucKernelSource
8787
av1BrcUpdateKernelId = 19,
8888
vvcS2lKernelId = 20,
8989
avcPxpBrcInitKernelId = 21,
90-
avcPxpBrcUpdateKernelId = 22
90+
avcPxpBrcUpdateKernelId = 22,
91+
av1SlbbUpdateKernelId = 23, // AV1 SLBB update kernel
92+
avcSlbbUpdateKernelId = 24, // AVC SLBB update kernel
93+
hevcSlbbUpdateKernelId = 25 // HEVC SLBB update kernel
9194
};
9295

9396
//!

0 commit comments

Comments
 (0)