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

The aspect ratio setting will only cause upscaling of the current video dimensions which are then put into KaxVideoDisplayWidth and KaxVideoDisplayHeight.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-08-10 20:13:40 +00:00
parent a04544edaa
commit d69983987a
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2003-08-10 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: The aspect ratio setting will only cause upscaling of
the current video dimensions which are then put into
KaxVideoDisplayWidth and KaxVideoDisplayHeight.
* mkvextract: Changed how the global elements are handled by
taking the parent's size into account. This re-enables processing
of files produced with the latest VirtualDubMod.

34
src/pr_generic.cpp
View File

@ -336,7 +336,7 @@ void generic_packetizer_c::set_language(char *language) {
}
void generic_packetizer_c::set_headers() {
int idx;
int idx, disp_width, disp_height;
KaxTag *tag;
if (track_entry == NULL) {
@ -408,26 +408,32 @@ void generic_packetizer_c::set_headers() {
KaxTrackVideo &video =
GetChild<KaxTrackVideo>(*track_entry);
if (hvideo_pixel_height != -1) {
*(static_cast<EbmlUInteger *>
(&GetChild<KaxVideoPixelHeight>(video))) = hvideo_pixel_height;
KaxVideoDisplayHeight &dheight =
GetChild<KaxVideoDisplayHeight>(video);
*(static_cast<EbmlUInteger *>(&dheight)) = hvideo_pixel_height;
dheight.SetDefaultSize(4);
if ((hvideo_pixel_height != -1) && (hvideo_pixel_width != -1)) {
if (ti->aspect_ratio >
((float)hvideo_pixel_width / (float)hvideo_pixel_height)) {
disp_width = (int)(hvideo_pixel_height * ti->aspect_ratio);
disp_height = hvideo_pixel_height;
} else {
disp_width = hvideo_pixel_width;
disp_height = (int)(hvideo_pixel_width * ti->aspect_ratio);
}
if (hvideo_pixel_width != -1) {
*(static_cast<EbmlUInteger *>
(&GetChild<KaxVideoPixelWidth>(video))) = hvideo_pixel_width;
*(static_cast<EbmlUInteger *>
(&GetChild<KaxVideoPixelHeight>(video))) = hvideo_pixel_height;
KaxVideoDisplayWidth &dwidth =
GetChild<KaxVideoDisplayWidth>(video);
if (ti->aspect_ratio != 1.0)
*(static_cast<EbmlUInteger *>(&dwidth)) =
(uint64_t)(hvideo_pixel_height * ti->aspect_ratio);
else
*(static_cast<EbmlUInteger *>(&dwidth)) = hvideo_pixel_width;
*(static_cast<EbmlUInteger *>(&dwidth)) = disp_width;
dwidth.SetDefaultSize(4);
KaxVideoDisplayHeight &dheight =
GetChild<KaxVideoDisplayHeight>(video);
*(static_cast<EbmlUInteger *>(&dheight)) = disp_height;
dheight.SetDefaultSize(4);
}
} else if (htrack_type == track_audio) {