From: Carl Hetherington Date: Wed, 24 Aug 2016 09:46:18 +0000 (+0100) Subject: Manual updates. X-Git-Tag: v2.9.16~18 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=a26b6e9e392a1ac342a19e0d33d92865819c6ded Manual updates. --- diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml index faee0a896..1bd1516b0 100644 --- a/doc/manual/dcpomatic.xml +++ b/doc/manual/dcpomatic.xml @@ -101,6 +101,12 @@ many parallel encoding threads (more than 4) on the 32-bit version. + +If you are still using Windows XP, download the specific XP version as +it should be more stable on your machine than the ‘normal’ +Windows version. + + @@ -139,7 +145,6 @@ depend on it. Debian unstable (‘sid’) Ubuntu 12.04 (‘Precise Pangolin’) Ubuntu 14.04 (‘Trusty Tahr’) - Ubuntu 15.10 (‘Wily Werewolf’) Ubuntu 16.04 (‘Xenial Xerus’) @@ -623,7 +628,7 @@ DCP-o-matic will decode and then re-encode the JPEG2000 data. -
+
Making overlay files @@ -730,7 +735,7 @@ images which should be treated as the frames of a video. Subtitle — a file containing subtitle which will be superimposed on the image of the DCP. These can be -.srt, .ssa or .xml +.srt, .ssa, .ass or .xml files. DCP — an existing DCP. @@ -828,12 +833,25 @@ The Video tab controls properties of the image, as shown in + +
+Refer to existing DCP + + +This option is only applicable if the selected content is an existing +DCP. It allows you to get the video content from the existing DCP by +referencing it (rather than copying). See . + + +
+
Image type -The first option on this tab is the ‘type’ of the video. +The next option on this tab is the ‘type’ of the video. This specifies how DCP-o-matic should interpret the video's image. 2D is the default; this just takes the video image as a standard 2D frame. The 3D @@ -1051,7 +1069,6 @@ The Audio tab controls properties of the image, as shown in -
The audio map @@ -1156,7 +1173,20 @@ shows the mapping of a 5.1 source into a 5.1 DCP.
-Other controls + Other controls + + +The Refer to existing DCP checkbox isonly +applicable if the selected content is an existing DCP. It allows you +to get the audio content from the existing DCP by referencing it +(rather than copying). See . + + + +Show graphs of audio levels will analyse the +audio of the selected content and plot it on a graph. See for more details. + ‘Audio Gain’ is used to alter the volume of the @@ -1317,6 +1347,11 @@ frame) than those typically used for DCP, so it is often useful to scale such subtitles down using these controls. + +The Line spacing control adjusts the line spacing +of the subtitles. This only works for non-embedded (text) subtitles. + + The Stream control changes the subtitle stream that is used when the content has more than one. @@ -1385,11 +1420,17 @@ should be displayed using this control. -Trim from start specifies the amount that should be trimmed from the start of the content. +Trim from start specifies the amount that should +be trimmed from the start of the content. You can set this amount to +trim up to the current preview position by clicking Trim up +to current position. -Trim from end specifies the amount that should be trimmed from the end of the content. +Trim from end specifies the amount that should be +trimmed from the end of the content. You can set this amount to trim +after the current preview position by clicking Trim after to +current position. @@ -1804,7 +1845,7 @@ you must specify a reel length in Gb. Then no file in the DCP will be larger th -
+
Show audio @@ -2004,7 +2045,7 @@ linkend="fig-kdm"/>. KDM dialog - + @@ -2144,7 +2185,7 @@ DCP-o-matic. Its window is shown in . The KDM creator - + @@ -2431,13 +2472,19 @@ be used when targeting a KDM at DCP-o-matic. If you want to import an encrypted DCP you will need to give the decryption certificate to the distributor of the DCP so that they can generate a DKDM for you. You can save this certificate to disk by -clicking Export DCP decryption certificate.... As -with the signing chain, DCP-o-matic will create a certificate chain +clicking Export DCP decryption certificate.... +As with the signing chain, DCP-o-matic will create a certificate chain and private key for you. You can also choose to load your own certificates and key or re-make the chain and key with new, random values. + +Clicking Export DCP decryption chain... will +export the whole certificate chain, rather than just the leaf +certificate. + +
@@ -2580,6 +2627,14 @@ JPEG2000 data only on encoding servers and not on the host. We suggest you leave this un-ticked unless you have a good reason to do otherwise. + +With the filename format fields you can adjust the filenames that are +used for metadata (CPL and PKL files) and assets (MXF and subtitle +files). Below each field there is a list of the ‘magic’ +values that you can use in the format and an example of a filename +that you might see with your current settings. + + The four checkboxes labelled Log control what sort of messages DCP-o-matic writes to its log file when creating a diff --git a/doc/manual/screenshots/add-file.png b/doc/manual/screenshots/add-file.png index 53170e0e2..467c35303 100644 Binary files a/doc/manual/screenshots/add-file.png and b/doc/manual/screenshots/add-file.png differ diff --git a/doc/manual/screenshots/audio-tab.png b/doc/manual/screenshots/audio-tab.png index 329127bf5..798d91e7c 100644 Binary files a/doc/manual/screenshots/audio-tab.png and b/doc/manual/screenshots/audio-tab.png differ diff --git a/doc/manual/screenshots/dcp-tab.png b/doc/manual/screenshots/dcp-tab.png index 21b0c6e39..9851e6760 100644 Binary files a/doc/manual/screenshots/dcp-tab.png and b/doc/manual/screenshots/dcp-tab.png differ diff --git a/doc/manual/screenshots/examine-content.png b/doc/manual/screenshots/examine-content.png index fecc4b6bc..a03de7d8c 100644 Binary files a/doc/manual/screenshots/examine-content.png and b/doc/manual/screenshots/examine-content.png differ diff --git a/doc/manual/screenshots/prefs-advanced.png b/doc/manual/screenshots/prefs-advanced.png index 54eb670db..cbedb1ea7 100644 Binary files a/doc/manual/screenshots/prefs-advanced.png and b/doc/manual/screenshots/prefs-advanced.png differ diff --git a/doc/manual/screenshots/prefs-defaults.png b/doc/manual/screenshots/prefs-defaults.png index 53b9589be..969d44833 100644 Binary files a/doc/manual/screenshots/prefs-defaults.png and b/doc/manual/screenshots/prefs-defaults.png differ diff --git a/doc/manual/screenshots/prefs-kdm-email.png b/doc/manual/screenshots/prefs-kdm-email.png index 15281cff5..ed9ba60a5 100644 Binary files a/doc/manual/screenshots/prefs-kdm-email.png and b/doc/manual/screenshots/prefs-kdm-email.png differ diff --git a/doc/manual/screenshots/prefs-keys.png b/doc/manual/screenshots/prefs-keys.png index 6c5524294..9be07e71f 100644 Binary files a/doc/manual/screenshots/prefs-keys.png and b/doc/manual/screenshots/prefs-keys.png differ diff --git a/doc/manual/screenshots/prefs-servers.png b/doc/manual/screenshots/prefs-servers.png index ae0ab66ab..95621b4a5 100644 Binary files a/doc/manual/screenshots/prefs-servers.png and b/doc/manual/screenshots/prefs-servers.png differ diff --git a/doc/manual/screenshots/subtitles-tab.png b/doc/manual/screenshots/subtitles-tab.png index 0dbeb9bb0..00643c3d8 100644 Binary files a/doc/manual/screenshots/subtitles-tab.png and b/doc/manual/screenshots/subtitles-tab.png differ diff --git a/doc/manual/screenshots/timing-tab.png b/doc/manual/screenshots/timing-tab.png index 94d60ca43..2b5b314f3 100644 Binary files a/doc/manual/screenshots/timing-tab.png and b/doc/manual/screenshots/timing-tab.png differ diff --git a/doc/manual/screenshots/video-tab.png b/doc/manual/screenshots/video-tab.png index 99bb4790a..fb6030708 100644 Binary files a/doc/manual/screenshots/video-tab.png and b/doc/manual/screenshots/video-tab.png differ