From 7fc0f6e56c25f01b3bc42f8b5f8d3cf5935bb875 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 4 Dec 2015 16:22:21 +0000 Subject: [PATCH] Manual adjustments. --- doc/manual/Makefile | 25 +-- doc/manual/dcpomatic-pdf.xsl | 2 +- doc/manual/dcpomatic.xml | 104 +++++++++- doc/manual/diagrams/dcp-copy.svg | 249 +++++++++++++++++++++++ doc/manual/diagrams/dcp-refer.svg | 316 ++++++++++++++++++++++++++++++ 5 files changed, 666 insertions(+), 30 deletions(-) create mode 100644 doc/manual/diagrams/dcp-copy.svg create mode 100644 doc/manual/diagrams/dcp-refer.svg diff --git a/doc/manual/Makefile b/doc/manual/Makefile index ef4dacff2..83dfb17c5 100644 --- a/doc/manual/Makefile +++ b/doc/manual/Makefile @@ -3,7 +3,7 @@ all: html pdf DIAGRAMS := file-structure.svg 3d-left-right.svg 3d-top-bottom.svg timecode.svg pipeline1.svg pipeline2.svg \ - pipeline3.svg pipeline4.svg burn-in.svg discrete.svg + pipeline3.svg pipeline4.svg burn-in.svg discrete.svg dcp-copy.svg dcp-refer.svg SCREENSHOTS := file-new.png video-new-film.png still-new-film.png video-select-content-file.png \ still-select-content-file.png examine-thumbs.png examine-content.png timing-tab.png \ @@ -15,18 +15,12 @@ SCREENSHOTS := file-new.png video-new-film.png still-new-film.png video-select-c XML := dcpomatic.xml -GRAPHICS := - # -# For the HTML, default to copying the screenshots direct +# For the HTML: copy screenshots into html/screenshots, scaling some. # html/screenshots/%.png: screenshots/%.png mkdir -p html/screenshots cp $< $@ - -# -# Some need resizing... -# html/screenshots/editor.png: screenshots/editor.png mkdir -p html/screenshots convert -resize 50% $< $@ @@ -58,14 +52,6 @@ html/screenshots/making-dcp.png: screenshots/making-dcp.png mkdir -p html/screenshots convert -resize 75% $< $@ -# For HTML: convert graphics from SVG to PNG -graphics/%.png: graphics/%.svg - inkscape -z -f $< --export-png $@ --export-area-drawing - -# For LaTeX/PDF: convert graphics from SVG to PDF -graphics/%.pdf: graphics/%.svg - inkscape -z -f $< --export-pdf $@ --export-area-drawing - # For HTML: convert diagrams from SVG to PNG diagrams/%.png: diagrams/%.svg inkscape -z -f $< --export-png $@ --export-area-drawing @@ -81,7 +67,6 @@ diagrams/%.pdf: diagrams/%.svg html: $(XML) dcpomatic-html.xsl extensions-html.ent dcpomatic.css \ $(addprefix html/screenshots/,$(SCREENSHOTS)) \ $(subst .svg,.png,$(addprefix diagrams/,$(DIAGRAMS))) \ - $(subst .svg,.png,$(addprefix graphics/,$(GRAPHICS))) \ # The DocBook needs to know what file extensions to look for # for screenshots and diagrams; use the correct file to tell it. @@ -92,16 +77,16 @@ html: $(XML) dcpomatic-html.xsl extensions-html.ent dcpomatic.css \ # Copy graphics and CSS in mkdir -p html/diagrams -# mkdir -p html/graphics cp diagrams/*.png html/diagrams -# cp graphics/*.png html/graphics cp dcpomatic.css html # # PDF # -pdf: $(XML) dcpomatic-pdf.xsl extensions-pdf.ent screenshots/*.png $(subst .svg,.pdf,$(addprefix diagrams/,$(DIAGRAMS))) +pdf: $(XML) dcpomatic-pdf.xsl extensions-pdf.ent \ + $(addprefix screenshots/,$(SCREENSHOTS)) \ + $(subst .svg,.pdf,$(addprefix diagrams/,$(DIAGRAMS))) # The DocBook needs to know what file extensions to look for # for screenshots and diagrams; use the correct file to tell it. diff --git a/doc/manual/dcpomatic-pdf.xsl b/doc/manual/dcpomatic-pdf.xsl index 0a57bf23f..a2a950f0a 100644 --- a/doc/manual/dcpomatic-pdf.xsl +++ b/doc/manual/dcpomatic-pdf.xsl @@ -8,7 +8,7 @@ 0 0 - + scale=0.5 diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml index b437ac36d..312e3324b 100644 --- a/doc/manual/dcpomatic.xml +++ b/doc/manual/dcpomatic.xml @@ -10,11 +10,6 @@ ]> - - DCP-o-matic users' manual CarlHetherington @@ -518,6 +513,7 @@ computationally intensive as encoding them. +
Decrypting encrypted DCPs @@ -553,6 +549,96 @@ being well) the DCP will be decrypted and become available for preview.
+
+Making a DCP from a DCP + + +In many ways, using DCPs as content in +DCP-o-matic is the same as using any other content. There are a few +things to note, though. + + + +
+Re-use of existing data + + +Where possible DCP-o-matic will re-use existing JPEG2000-compressed +data from DCP content without modification. This has the advantage +that creation of the new DCP will be quick, as the time-consuming +JPEG2000 encoding is not necessary. + + + +DCP-o-matic can do this if you avoid changes to the following content +settings: + + + +Crop +Scaling +Subtitle burn-in +Fades +Colour conversion + + + +If you do change any of these settings on a piece of DCP content +DCP-o-matic will decode and then re-encode the JPEG2000 data. + + +
+ + +
+Making overlay files + + +With its default settings, DCP-o-matic will take any data from DCP +content and copy it into the DCP that it creates. See . + + +
+Creating a new DCP by copying an existing one + +
+ + +This can be inefficient in some cases. Consider, for example, a film +which has ten different translations for which the subtitles are +different but video and audio are the same. If the video and audio +content takes up, say, 100Gb this means that the set of DCPs for every +translation would be about 1Tb with a lot of duplicated data. + + + +The DCP format has a solution to this problem. One DCP can refer to +the ‘assets’ (picture, sound or subtitle) of another DCP. +For our translation example this means that we could have a +‘base’ DCP (often called the OV or Original Version) +containing video, audio and one set of subtitles and then any number +of overlay DCPs (often called VF or Version Files) which refer to the +base version and replace the original subtitles with their own. shows this principle for one of our +translations. The DCP that we make refers to the original content +DCP's video and audio rather than containing a copy. + + +
+Creating a new DCP by referring to an existing one + +
+ + +To play back the subtitled DCP the projectionist ingests both the base +(OV) DCP and the overlay (VF) DCP, then plays the VF one. + + +
+ +
+ + @@ -1108,7 +1194,7 @@ linkend="fig-burn-in"/> and Burnt-in subtitles - + @@ -1117,7 +1203,7 @@ linkend="fig-burn-in"/> and Separate subtitles - + @@ -1209,7 +1295,7 @@ linkend="fig-timecode"/>. Timecode - + @@ -2464,7 +2550,7 @@ after you have created a DCP for a film called ‘DCP Test’. Creating a new film - + diff --git a/doc/manual/diagrams/dcp-copy.svg b/doc/manual/diagrams/dcp-copy.svg new file mode 100644 index 000000000..ad3ebc29a --- /dev/null +++ b/doc/manual/diagrams/dcp-copy.svg @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Picture + Sound + Subtitle + + + + Content DCP + + + + + + + + Picture + Sound + Subtitle + + + + New DCP + + + Make DCP + + diff --git a/doc/manual/diagrams/dcp-refer.svg b/doc/manual/diagrams/dcp-refer.svg new file mode 100644 index 000000000..0353da743 --- /dev/null +++ b/doc/manual/diagrams/dcp-refer.svg @@ -0,0 +1,316 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + Picture + Sound + Subtitle + + Content DCP + + + Subtitle + + + New DCP + Refer to picture + + Refer to sound + + + + + Make DCP + + -- 2.30.2