yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

client: update mpeg video decoder

Browse source 
3198122a19/pl_mpeg.h
This commit is contained in:
Denis Pauk 2024-09-07 16:25:33 +03:00
parent ca5d679b39
commit ff115d7061
1 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/client/cinema/pl_mpeg.h
View file

@ -346,6 +346,7 @@ int plm_get_num_video_streams(plm_t *self);
int plm_get_width(plm_t *self); int plm_get_width(plm_t *self);
int plm_get_height(plm_t *self); int plm_get_height(plm_t *self);
double plm_get_pixel_aspect_ratio(plm_t *self);
// Get the framerate of the video stream in frames per second. // Get the framerate of the video stream in frames per second.
@ -583,7 +584,7 @@ static const int PLM_DEMUX_PACKET_PRIVATE = 0xBD;
static const int PLM_DEMUX_PACKET_AUDIO_1 = 0xC0; static const int PLM_DEMUX_PACKET_AUDIO_1 = 0xC0;
static const int PLM_DEMUX_PACKET_AUDIO_2 = 0xC1; static const int PLM_DEMUX_PACKET_AUDIO_2 = 0xC1;
static const int PLM_DEMUX_PACKET_AUDIO_3 = 0xC2; static const int PLM_DEMUX_PACKET_AUDIO_3 = 0xC2;
static const int PLM_DEMUX_PACKET_AUDIO_4 = 0xC2; static const int PLM_DEMUX_PACKET_AUDIO_4 = 0xC3;
static const int PLM_DEMUX_PACKET_VIDEO_1 = 0xE0; static const int PLM_DEMUX_PACKET_VIDEO_1 = 0xE0;
@ -685,6 +686,7 @@ int plm_video_has_header(plm_video_t *self);
// Get the framerate in frames per second. // Get the framerate in frames per second.
double plm_video_get_framerate(plm_video_t *self); double plm_video_get_framerate(plm_video_t *self);
double plm_video_get_pixel_aspect_ratio(plm_video_t *self);
// Get the display width/height. // Get the display width/height.
@ -1044,6 +1046,12 @@ double plm_get_framerate(plm_t *self) {
: 0; : 0;
} }
double plm_get_pixel_aspect_ratio(plm_t *self) {
return (plm_init_decoders(self) && self->video_decoder)
? plm_video_get_pixel_aspect_ratio(self->video_decoder)
: 0;
}
int plm_get_num_audio_streams(plm_t *self) { int plm_get_num_audio_streams(plm_t *self) {
return plm_demux_get_num_audio_streams(self->demux); return plm_demux_get_num_audio_streams(self->demux);
} }
@ -2227,6 +2235,14 @@ static const int PLM_START_USER_DATA = 0xB2;
#define PLM_START_IS_SLICE(c) \ #define PLM_START_IS_SLICE(c) \
(c >= PLM_START_SLICE_FIRST && c <= PLM_START_SLICE_LAST) (c >= PLM_START_SLICE_FIRST && c <= PLM_START_SLICE_LAST)
static const float PLM_VIDEO_PIXEL_ASPECT_RATIO[] = {
1.0000, /* square pixels */
0.6735, /* 3:4? */
0.7031, /* MPEG-1 / MPEG-2 video encoding divergence? */
0.7615, 0.8055, 0.8437, 0.8935, 0.9157, 0.9815,
1.0255, 1.0695, 1.0950, 1.1575, 1.2051,
};
static const double PLM_VIDEO_PICTURE_RATE[] = { static const double PLM_VIDEO_PICTURE_RATE[] = {
0.000, 23.976, 24.000, 25.000, 29.970, 30.000, 50.000, 59.940, 0.000, 23.976, 24.000, 25.000, 29.970, 30.000, 50.000, 59.940,
60.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000 60.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000
@ -2620,6 +2636,7 @@ typedef struct {
struct plm_video_t { struct plm_video_t {
double framerate; double framerate;
double pixel_aspect_ratio;
double time; double time;
int frames_decoded; int frames_decoded;
int width; int width;
@ -2728,6 +2745,12 @@ double plm_video_get_framerate(plm_video_t *self) {
: 0; : 0;
} }
double plm_video_get_pixel_aspect_ratio(plm_video_t *self) {
return plm_video_has_header(self)
? self->pixel_aspect_ratio
: 0;
}
int plm_video_get_width(plm_video_t *self) { int plm_video_get_width(plm_video_t *self) {
return plm_video_has_header(self) return plm_video_has_header(self)
? self->width ? self->width
@ -2863,9 +2886,22 @@ int plm_video_decode_sequence_header(plm_video_t *self) {
return FALSE; return FALSE;
} }
// Skip pixel aspect ratio // Get pixel aspect ratio
plm_buffer_skip(self->buffer, 4); int pixel_aspect_ratio_code;
pixel_aspect_ratio_code = plm_buffer_read(self->buffer, 4);
pixel_aspect_ratio_code -= 1;
if (pixel_aspect_ratio_code < 0) {
pixel_aspect_ratio_code = 0;
}
int par_last = (sizeof(PLM_VIDEO_PIXEL_ASPECT_RATIO) /
sizeof(PLM_VIDEO_PIXEL_ASPECT_RATIO[0]) - 1);
if (pixel_aspect_ratio_code > par_last) {
pixel_aspect_ratio_code = par_last;
}
self->pixel_aspect_ratio =
PLM_VIDEO_PIXEL_ASPECT_RATIO[pixel_aspect_ratio_code];
// Get frame rate
self->framerate = PLM_VIDEO_PICTURE_RATE[plm_buffer_read(self->buffer, 4)]; self->framerate = PLM_VIDEO_PICTURE_RATE[plm_buffer_read(self->buffer, 4)];
// Skip bit_rate, marker, buffer_size and constrained bit // Skip bit_rate, marker, buffer_size and constrained bit
@ -3176,7 +3212,7 @@ int plm_video_decode_motion_vector(plm_video_t *self, int r_size, int motion) {
if (motion > (fscale << 4) - 1) { if (motion > (fscale << 4) - 1) {
motion -= fscale << 5; motion -= fscale << 5;
} }
else if (motion < ((-fscale) << 4)) { else if (motion < (int)((unsigned)(-fscale) << 4)) {
motion += fscale << 5; motion += fscale << 5;
} }
@ -3364,7 +3400,7 @@ void plm_video_decode_block(plm_video_t *self, int block) {
n++; n++;
// Dequantize, oddify, clip // Dequantize, oddify, clip
level <<= 1; level = (unsigned)level << 1;
if (!self->macroblock_intra) { if (!self->macroblock_intra) {
level += (level < 0 ? -1 : 1); level += (level < 0 ? -1 : 1);
} }