diff --git a/src/gallium/drivers/d3d12/d3d12_video_screen.cpp b/src/gallium/drivers/d3d12/d3d12_video_screen.cpp index c9bb5fb65b6..87899f96391 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_screen.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_screen.cpp @@ -2247,7 +2247,6 @@ d3d12_screen_get_video_param_decode(struct pipe_screen *pscreen, return 0; case PIPE_VIDEO_CAP_MAX_WIDTH: case PIPE_VIDEO_CAP_MAX_HEIGHT: - case PIPE_VIDEO_CAP_MAX_LEVEL: case PIPE_VIDEO_CAP_MIN_WIDTH: case PIPE_VIDEO_CAP_MIN_HEIGHT: case PIPE_VIDEO_CAP_SUPPORTED: @@ -2284,8 +2283,6 @@ d3d12_screen_get_video_param_decode(struct pipe_screen *pscreen, return lowestSupportedConfig.resolution.Width; } else if (param == PIPE_VIDEO_CAP_MIN_HEIGHT) { return lowestSupportedConfig.resolution.Height; - } else if (param == PIPE_VIDEO_CAP_MAX_LEVEL) { - return bestSupportedConfig.level; } else if (param == PIPE_VIDEO_CAP_SUPPORTED) { return 1; } @@ -2487,7 +2484,6 @@ d3d12_screen_get_video_param_encode(struct pipe_screen *pscreen, case PIPE_VIDEO_CAP_MAX_HEIGHT: case PIPE_VIDEO_CAP_MIN_WIDTH: case PIPE_VIDEO_CAP_MIN_HEIGHT: - case PIPE_VIDEO_CAP_MAX_LEVEL: case PIPE_VIDEO_CAP_SUPPORTED: case PIPE_VIDEO_CAP_ENC_MAX_SLICES_PER_FRAME: case PIPE_VIDEO_CAP_ENC_SLICES_STRUCTURE: @@ -2572,8 +2568,6 @@ d3d12_screen_get_video_param_encode(struct pipe_screen *pscreen, return minResEncode.Width; } else if (param == PIPE_VIDEO_CAP_MIN_HEIGHT) { return minResEncode.Height; - } else if (param == PIPE_VIDEO_CAP_MAX_LEVEL) { - return maxLvlEncode; } else if (param == PIPE_VIDEO_CAP_SUPPORTED) { return 1; } else if (param == PIPE_VIDEO_CAP_ENC_MAX_SLICES_PER_FRAME) { diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c index d2666fb6a0f..e78d9c1c0f5 100644 --- a/src/gallium/drivers/nouveau/nouveau_video.c +++ b/src/gallium/drivers/nouveau/nouveau_video.c @@ -837,16 +837,6 @@ nouveau_screen_get_video_param(struct pipe_screen *pscreen, return vl_video_buffer_max_size(pscreen); case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return true; - case PIPE_VIDEO_CAP_MAX_LEVEL: - switch (profile) { - case PIPE_VIDEO_PROFILE_MPEG1: - return 0; - case PIPE_VIDEO_PROFILE_MPEG2_SIMPLE: - case PIPE_VIDEO_PROFILE_MPEG2_MAIN: - return 3; - default: - return 0; - } default: debug_printf("unknown video param: %d\n", param); return 0; diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.c b/src/gallium/drivers/nouveau/nouveau_vp3_video.c index 15cabea9da9..5130ed6d638 100644 --- a/src/gallium/drivers/nouveau/nouveau_vp3_video.c +++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.c @@ -489,28 +489,6 @@ nouveau_vp3_screen_get_video_param(struct pipe_screen *pscreen, } case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return false; - case PIPE_VIDEO_CAP_MAX_LEVEL: - switch (profile) { - case PIPE_VIDEO_PROFILE_MPEG1: - return 0; - case PIPE_VIDEO_PROFILE_MPEG2_SIMPLE: - case PIPE_VIDEO_PROFILE_MPEG2_MAIN: - return 3; - case PIPE_VIDEO_PROFILE_VC1_SIMPLE: - return 1; - case PIPE_VIDEO_PROFILE_VC1_MAIN: - return 2; - case PIPE_VIDEO_PROFILE_VC1_ADVANCED: - return 4; - case PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE: - case PIPE_VIDEO_PROFILE_MPEG4_AVC_CONSTRAINED_BASELINE: - case PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN: - case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH: - return 41; - default: - debug_printf("unknown video profile: %d\n", profile); - return 0; - } case PIPE_VIDEO_CAP_MAX_MACROBLOCKS: switch (codec) { case PIPE_VIDEO_FORMAT_MPEG12: diff --git a/src/gallium/drivers/nouveau/nv50/nv84_video.c b/src/gallium/drivers/nouveau/nv50/nv84_video.c index 294c19ed967..a7cb4e0e731 100644 --- a/src/gallium/drivers/nouveau/nv50/nv84_video.c +++ b/src/gallium/drivers/nouveau/nv50/nv84_video.c @@ -826,21 +826,6 @@ nv84_screen_get_video_param(struct pipe_screen *pscreen, return 2048; case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return false; - case PIPE_VIDEO_CAP_MAX_LEVEL: - switch (profile) { - case PIPE_VIDEO_PROFILE_MPEG1: - return 0; - case PIPE_VIDEO_PROFILE_MPEG2_SIMPLE: - case PIPE_VIDEO_PROFILE_MPEG2_MAIN: - return 3; - case PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE: - case PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN: - case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH: - return 41; - default: - debug_printf("unknown video profile: %d\n", profile); - return 0; - } case PIPE_VIDEO_CAP_MAX_MACROBLOCKS: return 8192; /* vc-1 actually has 8190, but this is not supported */ default: diff --git a/src/gallium/drivers/r600/radeon_video.c b/src/gallium/drivers/r600/radeon_video.c index 91c80412cd9..88f56fec81b 100644 --- a/src/gallium/drivers/r600/radeon_video.c +++ b/src/gallium/drivers/r600/radeon_video.c @@ -241,26 +241,6 @@ int rvid_get_video_param(struct pipe_screen *screen, return 1152; case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return true; - case PIPE_VIDEO_CAP_MAX_LEVEL: - switch (profile) { - case PIPE_VIDEO_PROFILE_MPEG1: - return 0; - case PIPE_VIDEO_PROFILE_MPEG2_SIMPLE: - case PIPE_VIDEO_PROFILE_MPEG2_MAIN: - return 3; - case PIPE_VIDEO_PROFILE_VC1_SIMPLE: - return 1; - case PIPE_VIDEO_PROFILE_VC1_MAIN: - return 2; - case PIPE_VIDEO_PROFILE_VC1_ADVANCED: - return 4; - case PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE: - case PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN: - case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH: - return 41; - default: - return 0; - } default: return 0; } diff --git a/src/gallium/drivers/radeonsi/mm/si_mm_screen.c b/src/gallium/drivers/radeonsi/mm/si_mm_screen.c index 4ff649d5a91..86db1681aed 100644 --- a/src/gallium/drivers/radeonsi/mm/si_mm_screen.c +++ b/src/gallium/drivers/radeonsi/mm/si_mm_screen.c @@ -443,36 +443,6 @@ static int si_video_get_param(struct pipe_screen *screen, enum pipe_video_profil } case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return true; - case PIPE_VIDEO_CAP_MAX_LEVEL: - if ((profile == PIPE_VIDEO_PROFILE_MPEG2_SIMPLE || - profile == PIPE_VIDEO_PROFILE_MPEG2_MAIN || - profile == PIPE_VIDEO_PROFILE_VC1_ADVANCED) && - sscreen->info.dec_caps.codec_info[codec - 1].valid) { - return sscreen->info.dec_caps.codec_info[codec - 1].max_level; - } else { - switch (profile) { - case PIPE_VIDEO_PROFILE_MPEG1: - return 0; - case PIPE_VIDEO_PROFILE_MPEG2_SIMPLE: - case PIPE_VIDEO_PROFILE_MPEG2_MAIN: - return 3; - case PIPE_VIDEO_PROFILE_VC1_SIMPLE: - return 1; - case PIPE_VIDEO_PROFILE_VC1_MAIN: - return 2; - case PIPE_VIDEO_PROFILE_VC1_ADVANCED: - return 4; - case PIPE_VIDEO_PROFILE_MPEG4_AVC_CONSTRAINED_BASELINE: - case PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN: - case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH: - return (sscreen->info.family < CHIP_TONGA) ? 41 : 52; - case PIPE_VIDEO_PROFILE_HEVC_MAIN: - case PIPE_VIDEO_PROFILE_HEVC_MAIN_10: - return 186; - default: - return 0; - } - } case PIPE_VIDEO_CAP_SUPPORTS_CONTIGUOUS_PLANES_MAP: return true; case PIPE_VIDEO_CAP_ROI_CROP_DEC: diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c index 89d89027eb2..1884646edd9 100644 --- a/src/gallium/drivers/virgl/virgl_screen.c +++ b/src/gallium/drivers/virgl/virgl_screen.c @@ -144,8 +144,6 @@ virgl_get_video_param(struct pipe_screen *screen, return vcaps ? vcaps->max_height : 0; case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return vcaps ? vcaps->supports_progressive : true; - case PIPE_VIDEO_CAP_MAX_LEVEL: - return vcaps ? vcaps->max_level : 0; case PIPE_VIDEO_CAP_STACKED_FRAMES: return vcaps ? vcaps->stacked_frames : 0; case PIPE_VIDEO_CAP_MAX_MACROBLOCKS: diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h index c21a1e6266a..ce2e9c9dde9 100644 --- a/src/gallium/include/pipe/p_video_enums.h +++ b/src/gallium/include/pipe/p_video_enums.h @@ -84,7 +84,6 @@ enum pipe_video_cap PIPE_VIDEO_CAP_MAX_WIDTH = 2, PIPE_VIDEO_CAP_MAX_HEIGHT = 3, PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE = 6, - PIPE_VIDEO_CAP_MAX_LEVEL = 8, PIPE_VIDEO_CAP_STACKED_FRAMES = 9, PIPE_VIDEO_CAP_MAX_MACROBLOCKS = 10, PIPE_VIDEO_CAP_MAX_TEMPORAL_LAYERS = 11,