Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-24 10:51:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Opus: drop /EXPERIMENTAL codec ID suffix

Browse Source
This commit is contained in:
Moritz Bunkus 2013-07-05 13:59:09 +02:00
parent 086ec83973
commit 6de77e9423
9 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-07-05 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: new feature: Implemented final Opus muxing.
2013-07-04 Moritz Bunkus <moritz@bunkus.org>
* mmg: bug fix: The "jobs" folder will be created in the same

10
src/input/r_matroska.cpp
View File

@ -203,6 +203,7 @@ kax_reader_c::kax_reader_c(const track_info_c &ti,
, m_writing_app_ver(-1)
, m_attachment_id(0)
, m_file_status(FILE_STATUS_MOREDATA)
, m_opus_experimental_warning_shown{}
{
init_l1_position_storage(m_deferred_l1_positions);
init_l1_position_storage(m_handled_l1_positions);
@ -1505,6 +1506,15 @@ kax_reader_c::create_opus_audio_packetizer(kax_track_t *t,
track_info_c &nti) {
set_track_packetizer(t, new opus_packetizer_c(this, nti));
show_packetizer_info(t->tnum, t->ptzr_ptr);
if (!m_opus_experimental_warning_shown && (t->codec_id == std::string{MKV_A_OPUS} + "/EXPERIMENTAL")) {
mxwarn(boost::format(Y("'%1%': You're re-muxing an Opus track that was muxed in experimental mode. "
"The resulting track will be written in final mode, but one detail cannot be recovered from a track muxed in experimental mode: the end trimming. "
"This means that a decoder might output a few samples more than originally intended. "
"You should re-mux from the original Opus file if possible.\n"))
% m_ti.m_fname);
m_opus_experimental_warning_shown = true;
}
}
void

2
src/input/r_matroska.h
View File

@ -193,6 +193,8 @@ private:
file_status_e m_file_status;
bool m_opus_experimental_warning_shown;
public:
kax_reader_c(const track_info_c &ti, const mm_io_cptr &in);
virtual ~kax_reader_c();

4
src/output/p_opus.cpp
View File

@ -29,8 +29,6 @@ opus_packetizer_c::opus_packetizer_c(generic_reader_c *reader,
{
mxdebug_if(m_debug, boost::format("ID header: %1%\n") % m_id_header);
show_experimental_status_version(MKV_A_OPUS);
set_track_type(track_audio);
set_codec_private(m_ti.m_private_data);
}
@ -40,7 +38,7 @@ opus_packetizer_c::~opus_packetizer_c() {
void
opus_packetizer_c::set_headers() {
set_codec_id((boost::format("%1%/EXPERIMENTAL") % MKV_A_OPUS).str());
set_codec_id((boost::format("%1%") % MKV_A_OPUS).str());
set_track_seek_pre_roll(timecode_c::samples(m_id_header.pre_skip, 48000));
set_codec_delay(timecode_c::ms(80));

7
tests/results.txt
View File

@ -245,6 +245,7 @@ T_396X_pcm_mono_16bit:49b80add61d8a11514d747c9616f7e80:passed:20130624-200214:0.
T_397mpeg_ts_broken_pes_track_detection:809a21a4d761fd0979e2118b7eb7b402:passed:20130624-220549:1.12831027
T_398flv1_no_pixel_dimensions:44cdf14a8ffdfe91e5a0a7639b1b5834:passed:20130624-225648:0.103188723
T_399h264_append_and_default_duration:54f0d87ba4189fcd53b951e963c5b5b5:passed:20130627-195946:5.558958754
T_400opus_experimental:9afea2407e8784195afdc16baefc69d5:passed:20130703-213929:0.055921025
T_401opus_experimental_remux:b4e1ac27cf3babdfe90f4027b7d2df0a:passed:20130703-213932:0.06857043
T_402opus_output_order:042de2e3fcd70b10575a73d5bcde391c:passed:20130705-115856:0.252820697
T_400opus_experimental:ce4f0bd0c52a9d410ce34b5751416c63:passed:20130703-213929:0.055921025
T_401opus_experimental_remux:a910a17383083f2fa75001efd175c352:passed:20130703-213932:0.06857043
T_402opus_output_order:e7d89f40e06bd81db8fa20b2ea6218b8:passed:20130705-115856:0.252820697
T_403opus_remux_final:da99246c61326c47a530f95948b088be:passed:20130705-135811:0.068533558

4
tests/test-400opus_experimental.rb
View File

@ -1,4 +1,4 @@
#!/usr/bin/ruby -w
describe "mkvmerge / mux Opus from Ogg in experimental mode"
test_merge "data/opus/v-opus.ogg", :exit_code => :warning
describe "mkvmerge / mux Opus from Ogg"
test_merge "data/opus/v-opus.ogg"

2
tests/test-401opus_experimental_remux.rb
View File

@ -1,4 +1,4 @@
#!/usr/bin/ruby -w
describe "mkvmerge / mux Opus from MKA in experimental mode"
test_merge "data/opus/v-opus.mka", :exit_code => :warning
test_merge "data/opus/v-opus-experimental.mka", :exit_code => :warning

2
tests/test-402opus_output_order.rb
View File

@ -2,4 +2,4 @@
# T_402opus_output_order
describe "mkvmerge / Opus output order"
test_merge "data/opus/v-opus.ogg -A data/avi/v.avi", :exit_code => :warning
test_merge "data/opus/v-opus.ogg -A data/avi/v.avi"

4
tests/test-403opus_remux_final.rb Executable file
View File

@ -0,0 +1,4 @@
#!/usr/bin/ruby -w
describe "mkvmerge / mux Opus from MKA in final mode"
test_merge "data/opus/v-opus.mka"