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

Take the actual first packet as the one for the first timecode in a file. Only consider packets that have actually been rendered for the max timecode. Should fix the duration.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-01-19 12:27:29 +00:00
parent 61103d5f17
commit db94e93032
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/merge/cluster_helper.cpp
View File

@ -133,8 +133,6 @@ cluster_helper_c::add_packet(packet_t *packet) {
(video_packetizer == NULL))) {
split = false;
c = clusters[clusters.size() - 1];
if (first_timecode_in_file == -1)
first_timecode_in_file = packet->assigned_timecode;
// Maybe we want to start a new file now.
if (!split_by_time) {
@ -193,11 +191,6 @@ cluster_helper_c::add_packet(packet_t *packet) {
}
}
if ((packet->unmodified_assigned_timecode + packet->unmodified_duration) >
max_timecode_and_duration)
max_timecode_and_duration = packet->unmodified_assigned_timecode +
packet->unmodified_duration;
packet->packet_num = packet_num;
packet_num++;
@ -488,6 +481,12 @@ cluster_helper_c::render_cluster(ch_contents_t *clstr) {
free_ref(pack->timecode, pack->source);
}
if (first_timecode_in_file == -1)
first_timecode_in_file = pack->assigned_timecode;
if ((pack->assigned_timecode + pack->duration) > max_timecode_and_duration)
max_timecode_and_duration = pack->assigned_timecode + pack->duration;
if ((pack->bref != -1) || (pack->fref != -1) ||
!track_entry.LacingEnabled())
render_group->more_data = false;
@ -741,6 +740,9 @@ cluster_helper_c::free_ref(int64_t ref_timecode,
int64_t
cluster_helper_c::get_duration() {
mxverb(3, "cluster_helper_c::get_duration(): %lld - %lld = %lld\n",
max_timecode_and_duration, first_timecode_in_file,
max_timecode_and_duration - first_timecode_in_file);
return max_timecode_and_duration - first_timecode_in_file;
}