fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pipe: Remove MPEG4 decode support
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Reviewed-by: Leo Liu <leo.liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38780>
This commit is contained in:
David Rosca 2025-12-03 09:44:59 +01:00 • committed by Marge Bot
parent 7550e0aa49
commit c81194d8ae
6 changed files with 2 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/auxiliary/driver_trace/tr_video.c
View file

@ -51,13 +51,6 @@ unwrap_refrence_frames(struct pipe_picture_desc **picture)
*picture = (struct pipe_picture_desc*)copied;
return true;
}
case PIPE_VIDEO_FORMAT_MPEG4: {
struct pipe_mpeg4_picture_desc *copied = mem_dup(*picture, sizeof(struct pipe_mpeg4_picture_desc));
assert(copied);
unwrap_refrence_frames_in_place(copied->ref, ARRAY_SIZE(copied->ref));
*picture = (struct pipe_picture_desc*)copied;
return true;
}
case PIPE_VIDEO_FORMAT_VC1:{
struct pipe_vc1_picture_desc *copied = mem_dup(*picture, sizeof(struct pipe_vc1_picture_desc));
assert(copied);

4
src/gallium/auxiliary/util/u_video.h
View file

@ -50,10 +50,6 @@ u_reduce_video_profile(enum pipe_video_profile profile)
case PIPE_VIDEO_PROFILE_MPEG2_MAIN:
return PIPE_VIDEO_FORMAT_MPEG12;
case PIPE_VIDEO_PROFILE_MPEG4_SIMPLE:
case PIPE_VIDEO_PROFILE_MPEG4_ADVANCED_SIMPLE:
return PIPE_VIDEO_FORMAT_MPEG4;
case PIPE_VIDEO_PROFILE_VC1_SIMPLE:
case PIPE_VIDEO_PROFILE_VC1_MAIN:
case PIPE_VIDEO_PROFILE_VC1_ADVANCED:

2
src/gallium/auxiliary/vl/vl_codec.c
View file

@ -32,7 +32,7 @@ bool vl_codec_supported(struct pipe_screen *screen,
enum pipe_video_profile profile,
bool encode)
{
static_assert(PIPE_VIDEO_PROFILE_MAX == 30, "Update table below when adding new video profiles");
static_assert(PIPE_VIDEO_PROFILE_MAX == 28, "Update table below when adding new video profiles");
if (profile == PIPE_VIDEO_PROFILE_AV1_MAIN ||
profile == PIPE_VIDEO_PROFILE_AV1_PROFILE2) {
if (encode) {

1
src/gallium/drivers/d3d12/d3d12_video_enc.cpp
View file

@ -73,7 +73,6 @@ d3d12_video_encoder_convert_codec_to_d3d12_enc_codec(enum pipe_video_profile pro
return D3D12_VIDEO_ENCODER_CODEC_AV1;
} break;
case PIPE_VIDEO_FORMAT_MPEG12:
case PIPE_VIDEO_FORMAT_MPEG4:
case PIPE_VIDEO_FORMAT_VC1:
case PIPE_VIDEO_FORMAT_JPEG:
case PIPE_VIDEO_FORMAT_VP9:

5
src/gallium/include/pipe/p_video_enums.h
View file

@ -36,8 +36,7 @@ enum pipe_video_format
{
PIPE_VIDEO_FORMAT_UNKNOWN = 0,
PIPE_VIDEO_FORMAT_MPEG12, /**< MPEG1, MPEG2 */
PIPE_VIDEO_FORMAT_MPEG4, /**< DIVX, XVID */
PIPE_VIDEO_FORMAT_VC1, /**< WMV */
PIPE_VIDEO_FORMAT_VC1 = 3, /**< WMV */
PIPE_VIDEO_FORMAT_MPEG4_AVC,/**< H.264 */
PIPE_VIDEO_FORMAT_HEVC, /**< H.265 */
PIPE_VIDEO_FORMAT_JPEG, /**< JPEG */
@ -51,8 +50,6 @@ enum pipe_video_profile
PIPE_VIDEO_PROFILE_MPEG1,
PIPE_VIDEO_PROFILE_MPEG2_SIMPLE,
PIPE_VIDEO_PROFILE_MPEG2_MAIN,
PIPE_VIDEO_PROFILE_MPEG4_SIMPLE,
PIPE_VIDEO_PROFILE_MPEG4_ADVANCED_SIMPLE,
PIPE_VIDEO_PROFILE_VC1_SIMPLE,
PIPE_VIDEO_PROFILE_VC1_MAIN,
PIPE_VIDEO_PROFILE_VC1_ADVANCED,

25
src/gallium/include/pipe/p_video_state.h
View file

@ -317,31 +317,6 @@ struct pipe_mpeg12_macroblock
unsigned short num_skipped_macroblocks;
};
struct pipe_mpeg4_picture_desc
{
struct pipe_picture_desc base;
int32_t trd[2];
int32_t trb[2];
uint16_t vop_time_increment_resolution;
uint8_t vop_coding_type;
uint8_t vop_fcode_forward;
uint8_t vop_fcode_backward;
uint8_t resync_marker_disable;
uint8_t interlaced;
uint8_t quant_type;
uint8_t quarter_sample;
uint8_t short_video_header;
uint8_t rounding_control;
uint8_t alternate_vertical_scan_flag;
uint8_t top_field_first;
const uint8_t *intra_matrix;
const uint8_t *non_intra_matrix;
struct pipe_video_buffer *ref[2];
};
struct pipe_vc1_picture_desc
{
struct pipe_picture_desc base;