From 71edb3d50f32dfa1ff2401c2ff0f84d277f630fa Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 16 Oct 2004 21:49:17 +0000 Subject: [PATCH] Merged 2367 --- src/output/p_vorbis.cpp | 2 ++ tests/results.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/output/p_vorbis.cpp b/src/output/p_vorbis.cpp index 181ccb841..ab8c15b19 100644 --- a/src/output/p_vorbis.cpp +++ b/src/output/p_vorbis.cpp @@ -177,6 +177,7 @@ vorbis_packetizer_c::process(memory_c &mem, add_packet(mem, samples * 1000000000 / vi.rate, samples_here * 1000000000 / vi.rate); } + last_samples_sum = samples; } // Update the number of samples we have processed so that we can @@ -190,6 +191,7 @@ vorbis_packetizer_c::process(memory_c &mem, expected_timecode = last_timecode + last_samples_sum * 1000000000 / vi.rate + timecode_offset; + timecode += initial_displacement; if (initial_displacement < 0) expected_timecode += initial_displacement; diff --git a/tests/results.txt b/tests/results.txt index 79133cb59..653cc95c2 100644 --- a/tests/results.txt +++ b/tests/results.txt @@ -22,7 +22,7 @@ T_021aspect_ratio:f6e8aa4cfd776d99ff824f21d4e3c640-990a5f94678b5c8886dc8c3a5c6a2 T_022display_dimensions:108880396ffe5244465a3d25e8a57f93:passed:20040825-234339 T_023no_x:0b7f257f1c801da7b2ef1976291e5d44-49870185a891e8b3f6f265dca6f0e707-c43a34f68db19f5a318bd90c6f6446ab:passed:20040825-234343 T_024sync_mp3:a6c35d309947a52196d2a5428f87224a-6a638028d795bd48db95446f3521c302:passed:20040825-234344 -T_025sync_vorbis:e9d13a6b769cf6c2e4987bf6bd160698-51fcfab150642a66484d3c6bedff697a:failed:20040825-234344 +T_025sync_vorbis:e9d13a6b769cf6c2e4987bf6bd160698-51fcfab150642a66484d3c6bedff697a:passed:20040825-234344 T_026sync_pcm:f337f057c059d771128206c0da3d4807-9b559191edb65655e49186c302c4b815:passed:20040825-234346 T_027default_track:5e3cdf80eff356e84a94c877f6514b02:passed:20040825-234348 T_028compression:f6c15855e42e5a0e80d22a2060ae13e8:passed:20040825-234348