diff --git a/doc/man/mkvextract.xml b/doc/man/mkvextract.xml index 31a9e8c1f..160f82e84 100644 --- a/doc/man/mkvextract.xml +++ b/doc/man/mkvextract.xml @@ -63,7 +63,7 @@ &mkvextract; what to extract. Currently supported is the extraction of tracks, tags, attachments, chapters, CUE sheets, timecodes and timestamps and cues. The second argument is the name of the source file. It must be a &matroska; file. All following arguments are options and extraction specifications; both of which depend on the selected mode. @@ -400,15 +400,15 @@ - - Timecode extraction mode + + Timestamp extraction mode - Syntax: mkvextract source-filename options TID1:dest-filename1 TID2:dest-filename2 ... + Syntax: mkvextract source-filename options TID1:dest-filename1 TID2:dest-filename2 ... - The extracted timecodes are written to the console unless the output is redirected (see the section about output redirection for details). @@ -417,7 +417,7 @@ TID:outname - Causes extraction of the timecodes for the track with the ID TID into the file outname + Causes extraction of the timestamps for the track with the ID TID into the file outname if such a track exists in the source file. This option can be given multiple times. The track IDs are the same as the ones output by &mkvmerge;'s option. @@ -426,7 +426,7 @@ Example: - $ mkvextract timecodes_v2 input.mkv 1:tc-track1.txt 2:tc-track2.txt + $ mkvextract timestamps_v2 input.mkv 1:tc-track1.txt 2:tc-track2.txt @@ -462,15 +462,15 @@ Example: - timecode=00:00:13.305000000 duration=- cluster_position=757741 relative_position=11 + timestamp=00:00:13.305000000 duration=- cluster_position=757741 relative_position=11 The possible keys are: - timecode + timestamp - The cue point's timecode with nanosecond precision. The format is HH:MM:SS.nnnnnnnnn. This element is always set. + The cue point's timestamp with nanosecond precision. The format is HH:MM:SS.nnnnnnnnn. This element is always set. @@ -673,7 +673,7 @@ TrueAudio tracks are written to TTA files. Please note that due to &matroska;'s limited - timecode precision the extracted file's header will be different regarding two fields: data_length (the total + timestamp precision the extracted file's header will be different regarding two fields: data_length (the total number of samples in the file) and the CRC. @@ -865,10 +865,10 @@ - Timecodes + Timestamps - Timecodes are first sorted and then output as a timecode v2 format compliant file ready to be fed to &mkvmerge;. The extraction to + Timestamps are first sorted and then output as a timestamp v2 format compliant file ready to be fed to &mkvmerge;. The extraction to other formats (v1, v3 and v4) is not supported. diff --git a/doc/man/mkvmerge.xml b/doc/man/mkvmerge.xml index db0b855ea..5216e3290 100644 --- a/doc/man/mkvmerge.xml +++ b/doc/man/mkvmerge.xml @@ -481,18 +481,18 @@ - - factor + + factor - Forces the timecode scale factor to factor. Valid values are in the range + Forces the timestamp scale factor to factor. Valid values are in the range 1000..10000000 or the special value -1. - Normally &mkvmerge; will use a value of 1000000 which means that timecodes and durations will have a precision of - 1ms. For files that will not contain a video track but at least one audio track &mkvmerge; will automatically chose a timecode scale - factor so that all timecodes and durations have a precision of one audio sample. This causes bigger overhead but allows precise + Normally &mkvmerge; will use a value of 1000000 which means that timestamps and durations will have a precision of + 1ms. For files that will not contain a video track but at least one audio track &mkvmerge; will automatically chose a timestamp scale + factor so that all timestamps and durations have a precision of one audio sample. This causes bigger overhead but allows precise seeking and extraction. @@ -576,31 +576,31 @@ - Splitting after specific timecodes. + Splitting after specific timestamps. - Syntax: timecodes:A,B,C... + Syntax: timestamps:A,B,C... - Example: --split timecodes:00:45:00.000,01:20:00.250,6300s + Example: --split timestamps:00:45:00.000,01:20:00.250,6300s The parameters A, B, C etc must all have the same format as the - ones used for the duration (see above). The list of timecodes is separated by commas. After the input stream has reached the - current split point's timecode a new file is created. Then the next split point given in this list is used. + ones used for the duration (see above). The list of timestamps is separated by commas. After the input stream has reached the + current split point's timestamp a new file is created. Then the next split point given in this list is used. - The 'timecodes:' prefix must not be omitted. + The 'timestamps:' prefix must not be omitted. - Keeping specific parts by specifying timecode ranges while discarding others. + Keeping specific parts by specifying timestamp ranges while discarding others. @@ -617,26 +617,26 @@ - The parts mode tells &mkvmerge; to keep certain ranges of timecodes while discarding others. The ranges to keep + The parts mode tells &mkvmerge; to keep certain ranges of timestamps while discarding others. The ranges to keep have to be listed after the parts: keyword and be separated by commas. A range itself consists of a start and an - end timecode in the same format the other variations of --split accept (e.g. both - 00:01:20 and 80s refer to the same timecode). + end timestamp in the same format the other variations of --split accept (e.g. both + 00:01:20 and 80s refer to the same timestamp). - If a start timecode is left out then it defaults to the previous range's end timecode. If there was no previous range then it + If a start timestamp is left out then it defaults to the previous range's end timestamp. If there was no previous range then it defaults to the start of the file (see example 3). - If an end timecode is left out then it defaults to the end of the source files which basically tells &mkvmerge; to keep the rest (see + If an end timestamp is left out then it defaults to the end of the source files which basically tells &mkvmerge; to keep the rest (see example 3). Normally each range will be written to a new file. This can be changed so that consecutive ranges are written to the same file. For - that the user has to prefix the start timecode with a +. This tells &mkvmerge; not to create a new file and - instead append the range to the same file the previous range was written to. Timecodes will be adjusted so that there will be no + that the user has to prefix the start timestamp with a +. This tells &mkvmerge; not to create a new file and + instead append the range to the same file the previous range was written to. Timestamps will be adjusted so that there will be no gap in the output file even if there was a gap in the two ranges in the input file. @@ -660,7 +660,7 @@ Note that &mkvmerge; only makes decisions about splitting at key frame positions. This applies to both the start and the end of - each range. So even if an end timecode is between two key frames &mkvmerge; will continue outputting the frames up to but + each range. So even if an end timestamp is between two key frames &mkvmerge; will continue outputting the frames up to but excluding the following key frame. @@ -703,7 +703,7 @@ Normally each range will be written to a new file. This can be changed so that consecutive ranges are written to the same file. For that the user has to prefix the start number with a +. This tells &mkvmerge; not to create a new file and - instead append the range to the same file the previous range was written to. Timecodes will be adjusted so that there will be no + instead append the range to the same file the previous range was written to. Timestamps will be adjusted so that there will be no gap in the output file even if there was a gap in the two ranges in the input file. @@ -800,7 +800,7 @@ The parameters A, B, C etc must all be positive integers. Numbering starts at 1. The list of chapter numbers is separated by commas. Splitting will occur right before the first key frame - whose timecode is equal to or bigger than the start timecode for the chapters whose numbers are listed. A chapter starting at 0s + whose timestamp is equal to or bigger than the start timestamp for the chapters whose numbers are listed. A chapter starting at 0s is never considered for splitting and discarded silently. @@ -874,16 +874,16 @@ mode - Determines how timecodes are calculated when appending files. The parameter mode can have two values: + Determines how timestamps are calculated when appending files. The parameter mode can have two values: 'file' which is also the default and 'track'. When mkvmerge appends a track (called 'track2_1' from now on) from a second file (called 'file2') to a track (called 'track1_1') from the first file (called 'file1') - then it has to offset all timecodes for 'track2_1' by an amount. For 'file' mode this amount is - the highest timecode encountered in 'file1' even if that timecode was from a different track than - 'track1_1'. In track mode the offset is the highest timecode of 'track1_1'. + then it has to offset all timestamps for 'track2_1' by an amount. For 'file' mode this amount is + the highest timestamp encountered in 'file1' even if that timestamp was from a different track than + 'track1_1'. In track mode the offset is the highest timestamp of 'track1_1'. @@ -1303,7 +1303,7 @@ $ mkvmerge -o out.mkv '(' file.mkv ')' , TID:d,o/p - Adjust the timecodes of the track with the id TID by d ms. The track IDs are the same as + Adjust the timestamps of the track with the id TID by d ms. The track IDs are the same as the ones given with (see section track IDs). @@ -1466,12 +1466,12 @@ $ mkvmerge -o out.mkv '(' file.mkv ')' - TID:file-name + TID:file-name - Read the timecodes to be used for the specific track ID from file-name. These timecodes forcefully override - the timecodes that &mkvmerge; normally calculates. Read the section about external - timecode files. + Read the timestamps to be used for the specific track ID from file-name. These timestamps forcefully override + the timestamps that &mkvmerge; normally calculates. Read the section about external + timestamp files. @@ -1480,7 +1480,7 @@ $ mkvmerge -o out.mkv '(' file.mkv ')' TID:x - Forces the default duration of a given track to the specified value. Also modifies the track's timecodes to match the default + Forces the default duration of a given track to the specified value. Also modifies the track's timestamps to match the default duration. The argument x must be postfixed with 's', 'ms', 'us', 'ns', 'fps', 'p' or 'i' to specify the default duration in seconds, milliseconds, microseconds, nanoseconds, 'frames per second', 'progressive frames per @@ -1494,7 +1494,7 @@ $ mkvmerge -o out.mkv '(' file.mkv ')' - This option can also be used to change the FPS of video tracks without having to use an external timecode file. + This option can also be used to change the FPS of video tracks without having to use an external timestamp file. @@ -2769,9 +2769,9 @@ sound.ogg - If a file is split into several smaller ones and linking is used then the timecodes will not start at 0 again but will continue where the + If a file is split into several smaller ones and linking is used then the timestamps will not start at 0 again but will continue where the last file has left off. This way the absolute time is kept even if the previous files are not available (e.g. when streaming). If no - linking is used then the timecodes should start at 0 for each file. By default &mkvmerge; does not use file linking. If you want that you + linking is used then the timestamps should start at 0 for each file. By default &mkvmerge; does not use file linking. If you want that you can turn it on with the option. This option is only useful if splitting is activated as well. @@ -2851,7 +2851,7 @@ sound.ogg This formmat consists of pairs of lines that start with 'CHAPTERxx=' and 'CHAPTERxxNAME=' - respectively. The first one contains the start timecode while the second one contains the title. Here's an example: + respectively. The first one contains the start timestamp while the second one contains the title. Here's an example: CHAPTER01=00:00:00.000 @@ -2954,7 +2954,7 @@ CHAPTER03NAME=Baby rocks the house General notes When splitting files &mkvmerge; will correctly adjust the chapters as well. This means that each file only includes the chapter entries - that apply to it, and that the timecodes will be offset to match the new timecodes of each output file. + that apply to it, and that the timestamps will be offset to match the new timestamps of each output file. @@ -3107,7 +3107,7 @@ CHAPTER03NAME=Baby rocks the house Other "segment information" header fields can be set via command line options but not via the XML file. This includes e.g. the and the options. + linkend="mkvmerge.description.timestamp_scale">--timestamp-scale options. @@ -3177,21 +3177,21 @@ CHAPTER03NAME=Baby rocks the house - - External timecode files + + External timestamp files - &mkvmerge; allows the user to chose the timecodes for a specific track himself. This can be used in order to create files with variable + &mkvmerge; allows the user to chose the timestamps for a specific track himself. This can be used in order to create files with variable frame rate video or include gaps in audio. A frame in this case is the unit that &mkvmerge; creates separately per &matroska; block. For video this is exactly one frame, for audio this is one packet of the specific audio type. E.g. for AC-3 this would be a packet containing 1536 samples. - Timecode files that are used when tracks are appended to each other must only be specified for the first part in a chain of tracks. For - example if you append two files, v1.avi and v2.avi, and want to use timecodes then your command line must look something like this: + Timestamp files that are used when tracks are appended to each other must only be specified for the first part in a chain of tracks. For + example if you append two files, v1.avi and v2.avi, and want to use timestamps then your command line must look something like this: - $ mkvmerge ... --timecodes 0:my_timecodes.txt v1.avi +v2.avi + $ mkvmerge ... --timestamps 0:my_timestamps.txt v1.avi +v2.avi There are four formats that are recognized by &mkvmerge;. The first line always contains the version number. Empty lines, lines @@ -3199,7 +3199,7 @@ CHAPTER03NAME=Baby rocks the house - Timecode file format v1 + Timestamp file format v1 This format starts with the version line. The second line declares the default number of frames per second. All following lines contain three numbers separated by commas: the start frame (0 is the first frame), the end frame and the number of frames @@ -3207,37 +3207,37 @@ CHAPTER03NAME=Baby rocks the house can contain gaps for which the default FPS is used. An example: - # timecode format v1 + # timestamp format v1 assume 27.930 800,1000,25 1500,1700,30 - Timecode file format v2 + Timestamp file format v2 - In this format each line contains a timecode for the corresponding frame. This timecode must be given in millisecond precision. It can - be a floating point number, but it doesn't have to be. You have to give at least as many timecode lines as there - are frames in the track. The timecodes in this file must be sorted. Example for 25fps: + In this format each line contains a timestamp for the corresponding frame. This timestamp must be given in millisecond precision. It can + be a floating point number, but it doesn't have to be. You have to give at least as many timestamp lines as there + are frames in the track. The timestamps in this file must be sorted. Example for 25fps: - # timecode format v2 + # timestamp format v2 0 40 80 - Timecode file format v3 + Timestamp file format v3 In this format each line contains a duration in seconds followed by an optional number of frames per second. Both can be floating point numbers. If the number of frames per second is not present the default one is used. For audio you should let the codec calculate the - frame timecodes itself. For that you should be using 0.0 as the number of frames per second. You can also create + frame timestamps itself. For that you should be using 0.0 as the number of frames per second. You can also create gaps in the stream by using the 'gap' keyword followed by the duration of the gap. Example for an audio file: - # timecode format v3 + # timestamp format v3 assume 0.0 25.325 7.530,38.236 @@ -3246,9 +3246,9 @@ gap, 10.050 - Timecode file format v4 + Timestamp file format v4 - This format is identical to the v2 format. The only difference is that the timecodes do not have to be sorted. This format should + This format is identical to the v2 format. The only difference is that the timestamps do not have to be sorted. This format should almost never be used.