From: Carl Hetherington Date: Tue, 16 Aug 2016 14:11:06 +0000 (+0100) Subject: Tweak DCP structure diagram to include a subtitle MXF. X-Git-Tag: v2.9.13~20 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=c8b5c0c997ed896676041a98585ece8af8445913 Tweak DCP structure diagram to include a subtitle MXF. --- diff --git a/doc/manual/diagrams/file-structure.svg b/doc/manual/diagrams/file-structure.svg index c19a6f023..9fec7b12f 100644 --- a/doc/manual/diagrams/file-structure.svg +++ b/doc/manual/diagrams/file-structure.svg @@ -14,7 +14,7 @@ height="1052.3622047" id="svg2" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.91 r13725" sodipodi:docname="file-structure.svg"> @@ -2515,6 +2515,141 @@ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" transform="matrix(-0.4,0,0,-0.4,-4,0)" /> + + + + + + + + + + + + + + + + + + + @@ -3002,12 +3137,12 @@ id="text3413" y="51.003765" x="257.82571" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Inconsolata;-inkscape-font-specification:Inconsolata" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:125%;font-family:Inconsolata;-inkscape-font-specification:Inconsolata;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve">metadata + sodipodi:role="line">metadata.xml video + id="g6116" + transform="translate(215.06526,205.00109)"> + transform="matrix(0.57237779,0,0,0.57237779,-68.034766,192.93901)" + id="g3373-2"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="layer6-5" + inkscape:label="Shadow"> - - - - - - - - - - - - - - - - - - - 17318961-7a15-434c-b4a3-3126784bae8d_pkl.xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + transform="matrix(0.02105461,0,0,0.02086758,42.85172,41.1536)" + id="g6707-8"> + + inkscape:connector-curvature="0" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient8611);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" + d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z" + id="path6711-7" + sodipodi:nodetypes="cccc" /> - - - - - - - - - - - - - - - - - - + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" + id="path6713-7" + d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient8613);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" /> - 7ae68dd6-8347-43f4-91ca-331341378efb_cpl.xml - - - ASSETMAP.xml - - - - - - - + style="display:inline" + inkscape:label="Base" + id="layer1-5-2"> + + - - + transform="translate(0.646447,-0.03798933)" + id="g2270-4"> - - - - - - - - - - - - + id="g1440-1" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.74709785;stroke-miterlimit:4" + transform="matrix(0.229703,0,0,0.229703,4.967081,4.244972)"> + + + + + inkscape:connector-curvature="0" + style="stroke:none" + d="m 23.428,113.07 c 0,1.973 -1.6,3.572 -3.573,3.572 -1.974,0 -3.573,-1.6 -3.573,-3.572 0,-1.974 1.6,-3.573 3.573,-3.573 1.973,0 3.573,1.6 3.573,3.573 z" + id="path1448-8" /> + + + + + inkscape:connector-curvature="0" + style="stroke:none" + d="m 23.428,63.07 c 0,1.973 -1.6,3.573 -3.573,3.573 -1.974,0 -3.573,-1.6 -3.573,-3.573 0,-1.974 1.6,-3.573 3.573,-3.573 1.973,0 3.573,1.6 3.573,3.573 z" + id="path1456-4" /> + inkscape:connector-curvature="0" + style="fill:url(#radialGradient8621);fill-rule:nonzero;stroke:none" + d="m 9.9950109,29.952326 c 0,0.453204 -0.3675248,0.820499 -0.8207288,0.820499 -0.4534338,0 -0.8207289,-0.367524 -0.8207289,-0.820499 0,-0.453434 0.3675248,-0.820729 0.8207289,-0.820729 0.453204,0 0.8207288,0.367525 0.8207288,0.820729 z" + id="path15570-9" /> - - - - - - - - - - - - - - - - - - + inkscape:connector-curvature="0" + style="fill:url(#radialGradient8623);fill-rule:nonzero;stroke:none" + d="m 9.9950109,18.467176 c 0,0.453204 -0.3675248,0.820729 -0.8207288,0.820729 -0.4534338,0 -0.8207289,-0.367525 -0.8207289,-0.820729 0,-0.453434 0.3675248,-0.820729 0.8207289,-0.820729 0.453204,0 0.8207288,0.367525 0.8207288,0.820729 z" + id="path15577-1" /> + + - - - dcp_test_audio.mxf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="layer5-0" + inkscape:label="Text" + style="display:inline"> - - - - - - - - - - - - - - - - + transform="matrix(0.909091,0,0,1,2.363628,0)" + id="g2253-8"> + + + + + + + + + + + + + + - - dcp_test_video.mxf + id="tspan4531" + sodipodi:role="line">pkl_17318961-7a15-434c-b4a3-3126784bae8d.xml + + + - - - - - - - + id="layer6-5-1" + inkscape:label="Shadow"> - - - - - - - - - - - - - - - - - - + style="display:inline" + transform="matrix(0.02105461,0,0,0.02086758,42.85172,41.1536)" + id="g6707-8-5"> + + inkscape:connector-curvature="0" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient8627);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" + d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z" + id="path6711-7-3" + sodipodi:nodetypes="cccc" /> - - - - - - - - - - - - - - - - - - + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" + id="path6713-7-6" + d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient8629);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" /> - - - VOLINDEX.xml - - - - - - - + style="display:inline" + inkscape:label="Base" + id="layer1-5-2-4"> + + - - + transform="translate(0.646447,-0.03798933)" + id="g2270-4-9"> - - - - - - - - - - - - + id="g1440-1-3" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.74709785;stroke-miterlimit:4" + transform="matrix(0.229703,0,0,0.229703,4.967081,4.244972)"> + + + + + inkscape:connector-curvature="0" + style="stroke:none" + d="m 23.428,113.07 c 0,1.973 -1.6,3.572 -3.573,3.572 -1.974,0 -3.573,-1.6 -3.573,-3.572 0,-1.974 1.6,-3.573 3.573,-3.573 1.973,0 3.573,1.6 3.573,3.573 z" + id="path1448-8-5" /> + + + + + inkscape:connector-curvature="0" + style="stroke:none" + d="m 23.428,63.07 c 0,1.973 -1.6,3.573 -3.573,3.573 -1.974,0 -3.573,-1.6 -3.573,-3.573 0,-1.974 1.6,-3.573 3.573,-3.573 1.973,0 3.573,1.6 3.573,3.573 z" + id="path1456-4-4" /> + inkscape:connector-curvature="0" + style="fill:url(#radialGradient8637);fill-rule:nonzero;stroke:none" + d="m 9.9950109,29.952326 c 0,0.453204 -0.3675248,0.820499 -0.8207288,0.820499 -0.4534338,0 -0.8207289,-0.367524 -0.8207289,-0.820499 0,-0.453434 0.3675248,-0.820729 0.8207289,-0.820729 0.453204,0 0.8207288,0.367525 0.8207288,0.820729 z" + id="path15570-9-2" /> + inkscape:connector-curvature="0" + style="fill:url(#radialGradient8639);fill-rule:nonzero;stroke:none" + d="m 9.9950109,18.467176 c 0,0.453204 -0.3675248,0.820729 -0.8207288,0.820729 -0.4534338,0 -0.8207289,-0.367525 -0.8207289,-0.820729 0,-0.453434 0.3675248,-0.820729 0.8207289,-0.820729 0.453204,0 0.8207288,0.367525 0.8207288,0.820729 z" + id="path15577-1-8" /> + + + + - - - - - - - - - - - - - - - - + transform="matrix(0.909091,0,0,1,2.363628,0)" + id="g2253-8-8"> + + + + + + + + + + + + + + + + + + cpl_7ae68dd6-8347-43f4-91ca-331341378efb.xml + + + ASSETMAP.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dcp_test_audio.mxf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dcp_test_video.mxf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VOLINDEX.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5669,8 +5800,8 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="ccc" /> @@ -5735,44 +5866,333 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> DCP-o-matic'sworkingfiles DCP + y="523.03107">DCP + + dcp_test_subtitle.mxf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +