Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deal with an unknown/invalid aspect ratio. And make gcc happy.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-12-28 21:27:57 +00:00
parent bb57d33d65
commit 1a97138ffe
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/input/r_mpeg.cpp
View File

@ -117,6 +117,11 @@ mpeg_es_reader_c::mpeg_es_reader_c(track_info_c *nti)
height = seq_hdr.height; height = seq_hdr.height;
frame_rate = seq_hdr.frameRate; frame_rate = seq_hdr.frameRate;
aspect_ratio = seq_hdr.aspectRatio; aspect_ratio = seq_hdr.aspectRatio;
if (aspect_ratio <= 0)
dwidth = width;
else
dwidth = (int)(height * aspect_ratio);
dheight = height;
raw_seq_hdr = parser.GetRealSequenceHeader(); raw_seq_hdr = parser.GetRealSequenceHeader();
if (raw_seq_hdr != NULL) { if (raw_seq_hdr != NULL) {
ti->private_data = (unsigned char *) ti->private_data = (unsigned char *)
@ -144,9 +149,8 @@ mpeg_es_reader_c::create_packetizer(int64_t) {
return; return;
add_packetizer(new mpeg_12_video_packetizer_c(this, version, frame_rate, add_packetizer(new mpeg_12_video_packetizer_c(this, version, frame_rate,
width, height, width, height, dwidth, dheight,
(int)(height * aspect_ratio), ti));
height, ti));
mxinfo(FMT_TID "Using the MPEG-1/2 video output module.\n", mxinfo(FMT_TID "Using the MPEG-1/2 video output module.\n",
ti->fname.c_str(), (int64_t)0); ti->fname.c_str(), (int64_t)0);
@ -400,6 +404,7 @@ mpeg_ps_reader_c::parse_packet(int id,
if (length == 0) if (length == 0)
return false; return false;
c = 0;
// Skip stuFFing bytes // Skip stuFFing bytes
while (length > 0) { while (length > 0) {
c = mm_io->read_uint8(); c = mm_io->read_uint8();
@ -509,6 +514,11 @@ mpeg_ps_reader_c::found_new_stream(int id) {
track->v_height = seq_hdr.height; track->v_height = seq_hdr.height;
track->v_frame_rate = seq_hdr.frameRate; track->v_frame_rate = seq_hdr.frameRate;
track->v_aspect_ratio = seq_hdr.aspectRatio; track->v_aspect_ratio = seq_hdr.aspectRatio;
if (track->v_aspect_ratio <= 0)
track->v_dwidth = track->v_width;
else
track->v_dwidth = (int)(track->v_height * track->v_aspect_ratio);
track->v_dheight = track->v_height;
raw_seq_hdr = m2v_parser->GetRealSequenceHeader(); raw_seq_hdr = m2v_parser->GetRealSequenceHeader();
if (raw_seq_hdr != NULL) { if (raw_seq_hdr != NULL) {
track->raw_seq_hdr = (unsigned char *) track->raw_seq_hdr = (unsigned char *)
@ -685,9 +695,7 @@ mpeg_ps_reader_c::create_packetizer(int64_t id) {
new mpeg_12_video_packetizer_c(this, track->v_version, new mpeg_12_video_packetizer_c(this, track->v_version,
track->v_frame_rate, track->v_frame_rate,
track->v_width, track->v_height, track->v_width, track->v_height,
(int)(track->v_height * track->v_dwidth, track->v_dheight, ti);
track->v_aspect_ratio),
track->v_height, ti);
track->ptzr = add_packetizer(ptzr); track->ptzr = add_packetizer(ptzr);
ti->private_data = NULL; ti->private_data = NULL;
ti->private_size = 0; ti->private_size = 0;