X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=doc%2Fmanual%2Fdcpomatic.xml;h=b437ac36d89ddf34957b203071db9f432ba39ee3;hp=e3ce82a522644d3403fa702bacdb4948685f7c56;hb=c264984ff9aed2b67f53c368adba82a41ed8c567;hpb=7de09ede7bc6e34bea6ab3e7982efb51ca399b7d
diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml
index e3ce82a52..b437ac36d 100644
--- a/doc/manual/dcpomatic.xml
+++ b/doc/manual/dcpomatic.xml
@@ -34,8 +34,8 @@ Hello, and welcome to DCP-o-matic!
DCP-o-matic is a program to generate Digital
-Cinema Packages (DCPs) from DVDs, Blu-Rays, video files such as MP4
-and AVI, or still images. The resulting DCPs will play on modern digital
+Cinema Packages (DCPs) from almost any video, audio and/or
+subtitle source files. The resulting DCPs will play on modern digital
cinema projectors.
@@ -110,40 +110,53 @@ like to install it.
+
-Ubuntu Linux
+Debian or Ubuntu Linux
-You can install DCP-o-matic on Ubuntu 12.04 (‘Precise
-Pangolin’), 14.04 (‘Trusty Tahr’) or 15.04
-(‘Vivid Vervet’) using .deb
packages:
-download the appropriate package from http://dcpomatic.com/ and
-double-click it. Ubuntu will install the necessary bits and pieces
-and set DCP-o-matic up for you.
+ You can install DCP-o-matic on:
+
+ Debian 7 (‘wheezy’)
+ Debian 8 (‘jessie’)
+ Debian unstable (‘sid’)
+ Ubuntu 12.04 (‘Precise Pangolin’)
+ Ubuntu 14.04 (‘Trusty Tahr’)
+ Ubuntu 15.04 (‘Vivid Vervet’)
+ Ubuntu 15.10 (‘Wily Werewolf’)
+
+
+
+using .deb
packages: download the appropriate package
+from http://dcpomatic.com/
+and double-click it. Debian or Ubuntu will install the necessary bits and
+pieces and set DCP-o-matic up for you.
+
+
-Debian Linux
-
-Packages are available for Debian 7 (squeeze), 8 (jessie) and unstable (sid) from http://dcpomatic.com/.
-
+ Fedora Linux
+
+ There are .rpm
packages for Fedora 22 and 23 on
+ http://dcpomatic.com/
+
+
-Centos Linux
-
-Packages are available for Centos 6.5 and 7 from http://dcpomatic.com/.
-
+ Centos Linux
+ There are .rpm
packages for Centos 6.5 and 7 on
+ http://dcpomatic.com/
+
+
@@ -174,6 +187,7 @@ The following dependencies are required:
FFmpeg
libsndfile
+libsamplerate
OpenSSL
libopenjpeg
ImageMagick
@@ -185,8 +199,10 @@ The following dependencies are required:
xmlsec
curl
libzip
-libdcp
-libcxml
+libdcp
+libsub
+libcxml
+libicu
@@ -478,6 +494,70 @@ to encode a single frame which it can then repeat.
+
+
+Manipulating existing DCPs
+
+
+Frequently DCP-o-matic is used to take content in formats such as MP4
+and convert it to JPEG2000 for a DCP. Alternatively, it can be used
+to take existing DCPs and modify them in various ways.
+
+
+
+Importing a DCP into DCP-o-matic
+
+
+If you want to do something to an existing DCP the first step is to
+import it. Click Add folder... and select your
+DCP's folder. It will be added to the DCP-o-matic project. If the
+DCP is unencrypted you can preview it in the normal way, though
+playback will be very slow as decoding of DCPs is almost as
+computationally intensive as encoding them.
+
+
+
+
+
+Decrypting encrypted DCPs
+
+
+DCPs can be encrypted (see for
+details). If you import an encrypted DCP you will need a key, in the
+form of a Key Delivery Message (KDM), to decrypt it.
+
+
+
+KDMs must be prepared by the organisation which created the DCP. They
+contain the keys to decrypt the DCP wrapped up in such a way that only
+the intended recipient can read them. You will need to provide the
+organisation with a certificate which identifies your copy of
+DCP-o-matic and allows them to create a KDM for you.
+
+
+
+To get DCP-o-matic's decryption certificate, open the Preferences
+dialogue (see ) and go to the
+Keys tab. Click the Export DCP
+decryption certificate... button at the bottom of this tab
+and save the certificate. Send this certificate to the DCP creators
+and they can create a KDM to allow DCP-o-matic to decrypt their DCP.
+
+
+
+Once you have your KDM, right-click the DCP's name in DCP-o-matic and
+choose Add KDM.... Specify your KDM and (all
+being well) the DCP will be decrypted and become available for preview.
+
+
+
+
+
+
+
+
+
+
Content settings
@@ -485,8 +565,8 @@ to encode a single frame which it can then repeat.
The previous chapters showed DCP generation using the default
settings. DCP-o-matic offers a range of features to adjust the
-content that goes into your DCP, and this chapter describes those features in
-detail.
+content that goes into your DCP, and this chapter describes those
+features in detail.