Skip to content

Commit 7d6324b

Browse files
sgaud-quicsgaud-quic
authored
media: venus: fix NV12 buffer sizing and incorrect capability alignment (#407)
media: venus: fix NV12 buffer sizing and incorrect capability alignment
2 parents 7ea01f6 + 5d2fbea commit 7d6324b

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

‎drivers/media/platform/qcom/venus/helpers.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -954,8 +954,8 @@ static u32 get_framesize_raw_nv12(u32 width, u32 height)
954954
uv_sclines = ALIGN(((height + 1) >> 1), 16);
955955

956956
y_plane = y_stride * y_sclines;
957-
uv_plane = uv_stride * uv_sclines + SZ_4K;
958-
size = y_plane + uv_plane + SZ_8K;
957+
uv_plane = uv_stride * uv_sclines;
958+
size = y_plane + uv_plane;
959959

960960
return ALIGN(size, SZ_4K);
961961
}

‎drivers/media/platform/qcom/venus/hfi_platform_v4.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ static const struct hfi_plat_caps caps[] = {
136136
.codec = HFI_VIDEO_CODEC_H264,
137137
.domain = VIDC_SESSION_TYPE_ENC,
138138
.cap_bufs_mode_dynamic = true,
139-
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 96, 4096, 16},
140-
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 96, 4096, 16},
139+
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 96, 4096, 1},
140+
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 96, 4096, 1},
141141
.caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 1, 36864, 1},
142142
.caps[3] = {HFI_CAPABILITY_BITRATE, 1, 120000000, 1},
143143
.caps[4] = {HFI_CAPABILITY_SCALE_X, 8192, 65536, 1},
@@ -173,8 +173,8 @@ static const struct hfi_plat_caps caps[] = {
173173
.codec = HFI_VIDEO_CODEC_HEVC,
174174
.domain = VIDC_SESSION_TYPE_ENC,
175175
.cap_bufs_mode_dynamic = true,
176-
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 96, 4096, 16},
177-
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 96, 4096, 16},
176+
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 96, 4096, 1},
177+
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 96, 4096, 1},
178178
.caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 1, 36864, 1},
179179
.caps[3] = {HFI_CAPABILITY_BITRATE, 1, 120000000, 1},
180180
.caps[4] = {HFI_CAPABILITY_SCALE_X, 8192, 65536, 1},
@@ -195,8 +195,8 @@ static const struct hfi_plat_caps caps[] = {
195195
.caps[19] = {HFI_CAPABILITY_RATE_CONTROL_MODES, 0x1000001, 0x1000005, 1},
196196
.caps[20] = {HFI_CAPABILITY_COLOR_SPACE_CONVERSION, 0, 2, 1},
197197
.caps[21] = {HFI_CAPABILITY_ROTATION, 1, 4, 90},
198-
.caps[22] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 16},
199-
.caps[23] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 16},
198+
.caps[22] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 1},
199+
.caps[23] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 1},
200200
.num_caps = 24,
201201
.pl[0] = {HFI_HEVC_PROFILE_MAIN, HFI_HEVC_LEVEL_6 | HFI_HEVC_TIER_HIGH0},
202202
.pl[1] = {HFI_HEVC_PROFILE_MAIN10, HFI_HEVC_LEVEL_6 | HFI_HEVC_TIER_HIGH0},
@@ -210,8 +210,8 @@ static const struct hfi_plat_caps caps[] = {
210210
.codec = HFI_VIDEO_CODEC_VP8,
211211
.domain = VIDC_SESSION_TYPE_ENC,
212212
.cap_bufs_mode_dynamic = true,
213-
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 96, 4096, 16},
214-
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 96, 4096, 16},
213+
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 96, 4096, 1},
214+
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 96, 4096, 1},
215215
.caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 1, 36864, 1},
216216
.caps[3] = {HFI_CAPABILITY_BITRATE, 1, 120000000, 1},
217217
.caps[4] = {HFI_CAPABILITY_SCALE_X, 8192, 65536, 1},
@@ -229,8 +229,8 @@ static const struct hfi_plat_caps caps[] = {
229229
.caps[16] = {HFI_CAPABILITY_P_FRAME_QP, 0, 127, 1},
230230
.caps[17] = {HFI_CAPABILITY_MAX_WORKMODES, 1, 2, 1},
231231
.caps[18] = {HFI_CAPABILITY_RATE_CONTROL_MODES, 0x1000001, 0x1000005, 1},
232-
.caps[19] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 16},
233-
.caps[20] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 16},
232+
.caps[19] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 1},
233+
.caps[20] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 1},
234234
.caps[21] = {HFI_CAPABILITY_COLOR_SPACE_CONVERSION, 0, 2, 1},
235235
.caps[22] = {HFI_CAPABILITY_ROTATION, 1, 4, 90},
236236
.num_caps = 23,

‎drivers/media/platform/qcom/venus/hfi_platform_v6.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ static const struct hfi_plat_caps caps[] = {
173173
.codec = HFI_VIDEO_CODEC_HEVC,
174174
.domain = VIDC_SESSION_TYPE_ENC,
175175
.cap_bufs_mode_dynamic = true,
176-
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 128, 8192, 16},
177-
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 128, 8192, 16},
176+
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 128, 8192, 1},
177+
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 128, 8192, 1},
178178
.caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 64, 138240, 1},
179179
.caps[3] = {HFI_CAPABILITY_BITRATE, 1, 160000000, 1},
180180
.caps[4] = {HFI_CAPABILITY_SCALE_X, 8192, 65536, 1},
@@ -195,8 +195,8 @@ static const struct hfi_plat_caps caps[] = {
195195
.caps[19] = {HFI_CAPABILITY_RATE_CONTROL_MODES, 0x1000001, 0x1000005, 1},
196196
.caps[20] = {HFI_CAPABILITY_COLOR_SPACE_CONVERSION, 0, 2, 1},
197197
.caps[21] = {HFI_CAPABILITY_ROTATION, 1, 4, 90},
198-
.caps[22] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 16},
199-
.caps[23] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 16},
198+
.caps[22] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 1},
199+
.caps[23] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 1},
200200
.num_caps = 24,
201201
.pl[0] = {HFI_HEVC_PROFILE_MAIN, HFI_HEVC_LEVEL_6 | HFI_HEVC_TIER_HIGH0},
202202
.pl[1] = {HFI_HEVC_PROFILE_MAIN10, HFI_HEVC_LEVEL_6 | HFI_HEVC_TIER_HIGH0},
@@ -210,8 +210,8 @@ static const struct hfi_plat_caps caps[] = {
210210
.codec = HFI_VIDEO_CODEC_VP8,
211211
.domain = VIDC_SESSION_TYPE_ENC,
212212
.cap_bufs_mode_dynamic = true,
213-
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 128, 4096, 16},
214-
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 128, 4096, 16},
213+
.caps[0] = {HFI_CAPABILITY_FRAME_WIDTH, 128, 4096, 1},
214+
.caps[1] = {HFI_CAPABILITY_FRAME_HEIGHT, 128, 4096, 1},
215215
.caps[2] = {HFI_CAPABILITY_MBS_PER_FRAME, 64, 36864, 1},
216216
.caps[3] = {HFI_CAPABILITY_BITRATE, 1, 74000000, 1},
217217
.caps[4] = {HFI_CAPABILITY_SCALE_X, 8192, 65536, 1},
@@ -229,8 +229,8 @@ static const struct hfi_plat_caps caps[] = {
229229
.caps[16] = {HFI_CAPABILITY_P_FRAME_QP, 0, 127, 1},
230230
.caps[17] = {HFI_CAPABILITY_MAX_WORKMODES, 1, 2, 1},
231231
.caps[18] = {HFI_CAPABILITY_RATE_CONTROL_MODES, 0x1000001, 0x1000005, 1},
232-
.caps[19] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 16},
233-
.caps[20] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 16},
232+
.caps[19] = {HFI_CAPABILITY_BLUR_WIDTH, 96, 4096, 1},
233+
.caps[20] = {HFI_CAPABILITY_BLUR_HEIGHT, 96, 4096, 1},
234234
.caps[21] = {HFI_CAPABILITY_COLOR_SPACE_CONVERSION, 0, 2, 1},
235235
.caps[22] = {HFI_CAPABILITY_ROTATION, 1, 4, 90},
236236
.num_caps = 23,

0 commit comments

Comments
 (0)