Use a valid frame size for simple_picture().

11 files changed, 15 insertions, 15 deletions

diff --git a/test/data/flat_red.j2c b/test/data/flat_red.j2c
new file mode 100644
index 00000000..fc3f25c9
--- /dev/null
+++ b/test/data/flat_red.j2c
diff --git a/test/data/flat_red.png b/test/data/flat_red.png
new file mode 100644
index 00000000..e70fa7db
--- /dev/null
+++ b/test/data/flat_red.png
diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml
index cf2fdaa7..5879f033 100644
--- a/test/ref/DCP/dcp_test1/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml
@@ -26,7 +26,7 @@
           <Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>1585</Length>
+          <Length>1589</Length>
         </Chunk>
       </ChunkList>
     </Asset>
@@ -37,7 +37,7 @@
           <Path>video.mxf</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>26080</Length>
+          <Length>40144</Length>
         </Chunk>
       </ChunkList>
     </Asset>
diff --git a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index 042b7be2..ec32f39f 100644
--- a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
+++ b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
@@ -23,9 +23,9 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>1uPB643nrQfpY+Y0AypGko+PiPE=</Hash>
+          <Hash>XGhFVrqZqapOJx5Fh2SLjj48Yjg=</Hash>
           <FrameRate>24 1</FrameRate>
-          <ScreenAspectRatio>32 32</ScreenAspectRatio>
+          <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
         </MainPicture>
         <MainSound>
           <Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id>
diff --git a/test/ref/DCP/dcp_test1/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml b/test/ref/DCP/dcp_test1/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml
index c93f3d43..870fb677 100644
--- a/test/ref/DCP/dcp_test1/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml
+++ b/test/ref/DCP/dcp_test1/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml
@@ -9,15 +9,15 @@
     <Asset>
       <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
       <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
-      <Hash>ubRkmdOx95G/R77P6U8MSb/2XYE=</Hash>
-      <Size>1585</Size>
+      <Hash>786I2gazclNFDZSUFBO6NfqbBbo=</Hash>
+      <Size>1589</Size>
       <Type>text/xml</Type>
     </Asset>
     <Asset>
       <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
       <AnnotationText>1fab8bb0-cfaf-4225-ad6d-01768bc10470</AnnotationText>
-      <Hash>1uPB643nrQfpY+Y0AypGko+PiPE=</Hash>
-      <Size>26080</Size>
+      <Hash>XGhFVrqZqapOJx5Fh2SLjj48Yjg=</Hash>
+      <Size>40144</Size>
       <Type>application/mxf</Type>
     </Asset>
     <Asset>
diff --git a/test/ref/DCP/dcp_test1/video.mxf b/test/ref/DCP/dcp_test1/video.mxf
index dde49093..0a8fb0ca 100644
--- a/test/ref/DCP/dcp_test1/video.mxf
+++ b/test/ref/DCP/dcp_test1/video.mxf
diff --git a/test/ref/DCP/dcp_test7/ASSETMAP b/test/ref/DCP/dcp_test7/ASSETMAP
index b410f5ed..2558a5a4 100644
--- a/test/ref/DCP/dcp_test7/ASSETMAP
+++ b/test/ref/DCP/dcp_test7/ASSETMAP
@@ -37,7 +37,7 @@
           <Path>video.mxf</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>26080</Length>
+          <Length>40144</Length>
         </Chunk>
       </ChunkList>
     </Asset>
diff --git a/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index aa966ea6..faa322a3 100644
--- a/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
+++ b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
@@ -23,9 +23,9 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>1uPB643nrQfpY+Y0AypGko+PiPE=</Hash>
+          <Hash>XGhFVrqZqapOJx5Fh2SLjj48Yjg=</Hash>
           <FrameRate>24 1</FrameRate>
-          <ScreenAspectRatio>1.33</ScreenAspectRatio>
+          <ScreenAspectRatio>1.85</ScreenAspectRatio>
         </MainPicture>
         <MainSound>
           <Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id>
diff --git a/test/ref/DCP/dcp_test7/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml b/test/ref/DCP/dcp_test7/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml
index 7c980d47..f5ed5055 100644
--- a/test/ref/DCP/dcp_test7/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml
+++ b/test/ref/DCP/dcp_test7/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml
@@ -9,15 +9,15 @@
     <Asset>
       <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
       <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
-      <Hash>jI0HRE3Ncpe2bQnfFWOSvcgCkqk=</Hash>
+      <Hash>gcNHRpu5EEZrXIYyIMEqjA792h0=</Hash>
       <Size>1587</Size>
       <Type>text/xml;asdcpKind=CPL</Type>
     </Asset>
     <Asset>
       <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
       <AnnotationText>1fab8bb0-cfaf-4225-ad6d-01768bc10470</AnnotationText>
-      <Hash>1uPB643nrQfpY+Y0AypGko+PiPE=</Hash>
-      <Size>26080</Size>
+      <Hash>XGhFVrqZqapOJx5Fh2SLjj48Yjg=</Hash>
+      <Size>40144</Size>
       <Type>application/x-smpte-mxf;asdcpKind=Picture</Type>
     </Asset>
     <Asset>
diff --git a/test/ref/DCP/dcp_test7/video.mxf b/test/ref/DCP/dcp_test7/video.mxf
index dde49093..0a8fb0ca 100644
--- a/test/ref/DCP/dcp_test7/video.mxf
+++ b/test/ref/DCP/dcp_test7/video.mxf
diff --git a/test/test.cc b/test/test.cc
index c8f41d05..6617f513 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -260,7 +260,7 @@ simple_picture (boost::filesystem::path path, string suffix)
 	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
 	mp->set_metadata (mxf_meta);
 	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write (path / dcp::String::compose("video%1.mxf", suffix), false);
-	dcp::File j2c ("test/data/32x32_red_square.j2c");
+	dcp::File j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		picture_writer->write (j2c.data (), j2c.size ());
 	}