Tidy up diffing of frames a bit.
[libdcp.git] / src / picture_asset.cc
index 969a5523f0872c0e83a25a90a243f2eca17360eb..a1d8321dc05274836b745b25dbb21022d201a0e4 100644 (file)
@@ -25,6 +25,7 @@
 #include <stdexcept>
 #include <iostream>
 #include <sstream>
+#include <fstream>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
 #include <openjpeg.h>
 #include "picture_asset.h"
 #include "util.h"
 #include "exceptions.h"
+#include "picture_frame.h"
 
 using namespace std;
 using namespace boost;
 using namespace libdcp;
 
-PictureAsset::PictureAsset (
+PictureAsset::PictureAsset (string directory, string mxf_name, sigc::signal1<void, float>* progress, int fps, int entry_point, int length)
+       : MXFAsset (directory, mxf_name, progress, fps, entry_point, length)
+       , _width (0)
+       , _height (0)
+{
+
+}
+
+void
+PictureAsset::write_to_cpl (ostream& s) const
+{
+       s << "        <MainPicture>\n"
+         << "          <Id>urn:uuid:" << _uuid << "</Id>\n"
+         << "          <AnnotationText>" << _file_name << "</AnnotationText>\n"
+         << "          <EditRate>" << _fps << " 1</EditRate>\n"
+         << "          <IntrinsicDuration>" << _length << "</IntrinsicDuration>\n"
+         << "          <EntryPoint>0</EntryPoint>\n"
+         << "          <Duration>" << _length << "</Duration>\n"
+         << "          <FrameRate>" << _fps << " 1</FrameRate>\n"
+         << "          <ScreenAspectRatio>" << _width << " " << _height << "</ScreenAspectRatio>\n"
+         << "        </MainPicture>\n";
+}
+
+list<string>
+PictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt) const
+{
+       list<string> notes = MXFAsset::equals (other, opt);
+                    
+       if (opt.flags & MXF_INSPECT) {
+               ASDCP::JP2K::MXFReader reader_A;
+               if (ASDCP_FAILURE (reader_A.OpenRead (path().string().c_str()))) {
+                       throw MXFFileError ("could not open MXF file for reading", path().string());
+               }
+
+               ASDCP::JP2K::MXFReader reader_B;
+               if (ASDCP_FAILURE (reader_B.OpenRead (other->path().string().c_str()))) {
+                       throw MXFFileError ("could not open MXF file for reading", path().string());
+               }
+
+               ASDCP::JP2K::PictureDescriptor desc_A;
+               if (ASDCP_FAILURE (reader_A.FillPictureDescriptor (desc_A))) {
+                       throw DCPReadError ("could not read video MXF information");
+               }
+               ASDCP::JP2K::PictureDescriptor desc_B;
+               if (ASDCP_FAILURE (reader_B.FillPictureDescriptor (desc_B))) {
+                       throw DCPReadError ("could not read video MXF information");
+               }
+
+               if (
+                       desc_A.EditRate != desc_B.EditRate ||
+                       desc_A.ContainerDuration != desc_B.ContainerDuration ||
+                       desc_A.SampleRate != desc_B.SampleRate ||
+                       desc_A.StoredWidth != desc_B.StoredWidth ||
+                       desc_A.StoredHeight != desc_B.StoredHeight ||
+                       desc_A.AspectRatio != desc_B.AspectRatio ||
+                       desc_A.Rsize != desc_B.Rsize ||
+                       desc_A.Xsize != desc_B.Xsize ||
+                       desc_A.Ysize != desc_B.Ysize ||
+                       desc_A.XOsize != desc_B.XOsize ||
+                       desc_A.YOsize != desc_B.YOsize ||
+                       desc_A.XTsize != desc_B.XTsize ||
+                       desc_A.YTsize != desc_B.YTsize ||
+                       desc_A.XTOsize != desc_B.XTOsize ||
+                       desc_A.YTOsize != desc_B.YTOsize ||
+                       desc_A.Csize != desc_B.Csize
+//                     desc_A.CodingStyleDefault != desc_B.CodingStyleDefault ||
+//                     desc_A.QuantizationDefault != desc_B.QuantizationDefault
+                       ) {
+               
+                       notes.push_back ("video MXF picture descriptors differ");
+               }
+
+//             for (unsigned int j = 0; j < ASDCP::JP2K::MaxComponents; ++j) {
+//                     if (desc_A.ImageComponents[j] != desc_B.ImageComponents[j]) {
+//                             notes.pack_start ("video MXF picture descriptors differ");
+//                     }
+//             }
+       }
+
+       return notes;
+}
+
+
+MonoPictureAsset::MonoPictureAsset (
        sigc::slot<string, int> get_path,
        string directory,
        string mxf_name,
@@ -47,14 +132,14 @@ PictureAsset::PictureAsset (
        int length,
        int width,
        int height)
-       : Asset (directory, mxf_name, progress, fps, length)
-       , _width (width)
-       , _height (height)
+       : PictureAsset (directory, mxf_name, progress, fps, 0, length)
 {
+       _width = width;
+       _height = height;
        construct (get_path);
 }
 
-PictureAsset::PictureAsset (
+MonoPictureAsset::MonoPictureAsset (
        vector<string> const & files,
        string directory,
        string mxf_name,
@@ -63,29 +148,32 @@ PictureAsset::PictureAsset (
        int length,
        int width,
        int height)
-       : Asset (directory, mxf_name, progress, fps, length)
-       , _width (width)
-       , _height (height)
+       : PictureAsset (directory, mxf_name, progress, fps, 0, length)
 {
-       construct (sigc::bind (sigc::mem_fun (*this, &PictureAsset::path_from_list), files));
+       _width = width;
+       _height = height;
+       construct (sigc::bind (sigc::mem_fun (*this, &MonoPictureAsset::path_from_list), files));
 }
 
-PictureAsset::PictureAsset (string directory, string mxf_name, int fps, int length, int width, int height)
-       : Asset (directory, mxf_name, 0, fps, length)
-       , _width (width)
-       , _height (height)
+MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name, int fps, int entry_point, int length)
+       : PictureAsset (directory, mxf_name, 0, fps, entry_point, length)
 {
+       ASDCP::JP2K::MXFReader reader;
+       if (ASDCP_FAILURE (reader.OpenRead (path().string().c_str()))) {
+               throw MXFFileError ("could not open MXF file for reading", path().string());
+       }
+       
+       ASDCP::JP2K::PictureDescriptor desc;
+       if (ASDCP_FAILURE (reader.FillPictureDescriptor (desc))) {
+               throw DCPReadError ("could not read video MXF information");
+       }
 
-}
-
-string
-PictureAsset::path_from_list (int f, vector<string> const & files) const
-{
-       return files[f];
+       _width = desc.StoredWidth;
+       _height = desc.StoredHeight;
 }
 
 void
-PictureAsset::construct (sigc::slot<string, int> get_path)
+MonoPictureAsset::construct (sigc::slot<string, int> get_path)
 {
        ASDCP::JP2K::CodestreamParser j2k_parser;
        ASDCP::JP2K::FrameBuffer frame_buffer (4 * Kumu::Megabyte);
@@ -101,14 +189,14 @@ PictureAsset::construct (sigc::slot<string, int> get_path)
        fill_writer_info (&writer_info);
        
        ASDCP::JP2K::MXFWriter mxf_writer;
-       if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().string().c_str(), writer_info, picture_desc))) {
-               throw FileError ("could not open MXF file for writing", mxf_path().string());
+       if (ASDCP_FAILURE (mxf_writer.OpenWrite (path().string().c_str(), writer_info, picture_desc))) {
+               throw MXFFileError ("could not open MXF file for writing", path().string());
        }
 
        for (int i = 0; i < _length; ++i) {
 
                string const path = get_path (i);
-               
+
                if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (path.c_str(), frame_buffer))) {
                        throw FileError ("could not open JPEG2000 file for reading", path);
                }
@@ -117,8 +205,10 @@ PictureAsset::construct (sigc::slot<string, int> get_path)
                if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, 0, 0))) {
                        throw MiscError ("error in writing video MXF");
                }
-               
-               (*_progress) (0.5 * float (i) / _length);
+
+               if (_progress) {
+                       (*_progress) (0.5 * float (i) / _length);
+               }
        }
        
        if (ASDCP_FAILURE (mxf_writer.Finalize())) {
@@ -126,154 +216,174 @@ PictureAsset::construct (sigc::slot<string, int> get_path)
        }
 }
 
-void
-PictureAsset::write_to_cpl (ostream& s) const
+string
+MonoPictureAsset::path_from_list (int f, vector<string> const & files) const
 {
-       s << "        <MainPicture>\n"
-         << "          <Id>urn:uuid:" << _uuid << "</Id>\n"
-         << "          <AnnotationText>" << _mxf_name << "</AnnotationText>\n"
-         << "          <EditRate>" << _fps << " 1</EditRate>\n"
-         << "          <IntrinsicDuration>" << _length << "</IntrinsicDuration>\n"
-         << "          <EntryPoint>0</EntryPoint>\n"
-         << "          <Duration>" << _length << "</Duration>\n"
-         << "          <FrameRate>" << _fps << " 1</FrameRate>\n"
-         << "          <ScreenAspectRatio>" << _width << " " << _height << "</ScreenAspectRatio>\n"
-         << "        </MainPicture>\n";
+       return files[f];
+}
+
+shared_ptr<const MonoPictureFrame>
+MonoPictureAsset::get_frame (int n) const
+{
+       return shared_ptr<const MonoPictureFrame> (new MonoPictureFrame (path().string(), n + _entry_point));
 }
 
+
 list<string>
-PictureAsset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
+MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt) const
 {
-       list<string> notes = Asset::equals (other, flags);
-                    
-       if (flags & MXF_INSPECT) {
-               ASDCP::JP2K::MXFReader reader_A;
-               if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().string().c_str()))) {
-                       throw FileError ("could not open MXF file for reading", mxf_path().string());
-               }
+       list<string> notes = PictureAsset::equals (other, opt);
 
-               ASDCP::JP2K::MXFReader reader_B;
-               if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().string().c_str()))) {
-                       throw FileError ("could not open MXF file for reading", mxf_path().string());
-               }
+       shared_ptr<const MonoPictureAsset> other_picture = dynamic_pointer_cast<const MonoPictureAsset> (other);
+       assert (other_picture);
 
-               ASDCP::JP2K::PictureDescriptor desc_A;
-               if (ASDCP_FAILURE (reader_A.FillPictureDescriptor (desc_A))) {
-                       throw DCPReadError ("could not read video MXF information");
-               }
-               ASDCP::JP2K::PictureDescriptor desc_B;
-               if (ASDCP_FAILURE (reader_B.FillPictureDescriptor (desc_B))) {
-                       throw DCPReadError ("could not read video MXF information");
-               }
+       for (int i = 0; i < _length; ++i) {
+               shared_ptr<const MonoPictureFrame> frame_A = get_frame (i);
+               shared_ptr<const MonoPictureFrame> frame_B = other_picture->get_frame (i);
 
-               if (
-                       desc_A.EditRate != desc_B.EditRate ||
-                       desc_A.ContainerDuration != desc_B.ContainerDuration ||
-                       desc_A.SampleRate != desc_B.SampleRate ||
-                       desc_A.StoredWidth != desc_B.StoredWidth ||
-                       desc_A.StoredHeight != desc_B.StoredHeight ||
-                       desc_A.AspectRatio != desc_B.AspectRatio ||
-                       desc_A.Rsize != desc_B.Rsize ||
-                       desc_A.Xsize != desc_B.Xsize ||
-                       desc_A.Ysize != desc_B.Ysize ||
-                       desc_A.XOsize != desc_B.XOsize ||
-                       desc_A.YOsize != desc_B.YOsize ||
-                       desc_A.XTsize != desc_B.XTsize ||
-                       desc_A.YTsize != desc_B.YTsize ||
-                       desc_A.XTOsize != desc_B.XTOsize ||
-                       desc_A.YTOsize != desc_B.YTOsize ||
-                       desc_A.Csize != desc_B.Csize
-//                     desc_A.CodingStyleDefault != desc_B.CodingStyleDefault ||
-//                     desc_A.QuantizationDefault != desc_B.QuantizationDefault
-                       ) {
-               
-                       notes.push_back ("video MXF picture descriptors differ");
-               }
+               list<string> n = frame_buffer_equals (
+                       i, opt,
+                       frame_A->j2k_frame()->RoData(), frame_A->j2k_frame()->Size(),
+                       frame_B->j2k_frame()->RoData(), frame_B->j2k_frame()->Size()
+                       );
 
-//             for (unsigned int j = 0; j < ASDCP::JP2K::MaxComponents; ++j) {
-//                     if (desc_A.ImageComponents[j] != desc_B.ImageComponents[j]) {
-//                             notes.pack_start ("video MXF picture descriptors differ");
-//                     }
-//             }
-                               
+               notes.merge (n);
+       }
 
-               ASDCP::JP2K::FrameBuffer buffer_A (4 * Kumu::Megabyte);
-               ASDCP::JP2K::FrameBuffer buffer_B (4 * Kumu::Megabyte);
+       return notes;
+}
 
-               for (int i = 0; i < _length; ++i) {
-                       if (ASDCP_FAILURE (reader_A.ReadFrame (i, buffer_A))) {
-                               throw DCPReadError ("could not read video frame");
-                       }
+list<string>
+StereoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt) const
+{
+       list<string> notes = PictureAsset::equals (other, opt);
+       
+       shared_ptr<const StereoPictureAsset> other_picture = dynamic_pointer_cast<const StereoPictureAsset> (other);
+       assert (other_picture);
+       
+       for (int i = 0; i < _length; ++i) {
+               shared_ptr<const StereoPictureFrame> frame_A = get_frame (i);
+               shared_ptr<const StereoPictureFrame> frame_B = other_picture->get_frame (i);
 
-                       if (ASDCP_FAILURE (reader_B.ReadFrame (i, buffer_B))) {
-                               throw DCPReadError ("could not read video frame");
-                       }
+               list<string> n = frame_buffer_equals (
+                       i, opt,
+                       frame_A->j2k_frame()->Left.RoData(), frame_A->j2k_frame()->Left.Size(),
+                       frame_B->j2k_frame()->Left.RoData(), frame_B->j2k_frame()->Left.Size()
+                       );
 
-                       bool j2k_same = true;
+               notes.merge (n);
 
-                       if (buffer_A.Size() != buffer_B.Size()) {
-                               notes.push_back ("sizes of video data for frame " + lexical_cast<string>(i) + " differ");
-                               j2k_same = false;
-                               continue;
-                       }
+               n = frame_buffer_equals (
+                       i, opt,
+                       frame_A->j2k_frame()->Right.RoData(), frame_A->j2k_frame()->Right.Size(),
+                       frame_B->j2k_frame()->Right.RoData(), frame_B->j2k_frame()->Right.Size()
+                       );
 
-                       if (memcmp (buffer_A.RoData(), buffer_B.RoData(), buffer_A.Size()) != 0) {
-                               notes.push_back ("J2K data for frame " + lexical_cast<string>(i) + " differ");
-                               j2k_same = false;
-                               continue;
-                       }
+               notes.merge (n);
+       }
+
+       return notes;
+}
 
-                       if (!j2k_same) {
-                               /* Decompress the images to bitmaps */
-                               opj_image_t* image_A = decompress_j2k (const_cast<uint8_t*> (buffer_A.RoData()), buffer_A.Size ());
-                               opj_image_t* image_B = decompress_j2k (const_cast<uint8_t*> (buffer_B.RoData()), buffer_B.Size ());
-
-                               /* Compare them */
-                               
-                               if (image_A->numcomps != image_B->numcomps) {
-                                       notes.push_back ("image component counts for frame " + lexical_cast<string>(i) + " differ");
-                               }
-
-                               for (int c = 0; c < image_A->numcomps; ++c) {
-                                       if (image_A->comps[c].w != image_B->comps[c].w || image_A->comps[c].h != image_B->comps[c].h) {
-                                               notes.push_back ("image sizes for frame " + lexical_cast<string>(i) + " differ");
-                                       }
-                                       
-                                       cout << "comp " << c << " of " << image_A->numcomps << "\n";
-                                       cout << "bpp " << image_A->comps[c].bpp << "\n";
-                                       
-                                       for (int x = 0; x < image_A->comps[c].w; ++x) {
-                                               for (int y = 0; y < image_A->comps[c].h; ++y) {
-                                                               
-                                               }
-                                       }
-                               }
-                               
-
-                               opj_image_destroy (image_A);
-                               opj_image_destroy (image_B);
+list<string>
+PictureAsset::frame_buffer_equals (
+       int frame, EqualityOptions opt, uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
+       ) const
+{
+       list<string> notes;
+       
+       bool j2k_same = true;
+       if (size_A != size_B) {
+               notes.push_back ("sizes of video data for frame " + lexical_cast<string>(frame) + " differ");
+               j2k_same = false;
+       } else if (memcmp (data_A, data_B, size_A) != 0) {
+               notes.push_back ("J2K data for frame " + lexical_cast<string>(frame) + " differ");
+               j2k_same = false;
+       }
+       
+       if (!j2k_same) {
+               
+               if (opt.verbose) {
+                       cout << "J2K images for " << frame << " differ; checking by pixel\n";
+               }
+               
+               /* Decompress the images to bitmaps */
+               opj_image_t* image_A = decompress_j2k (const_cast<uint8_t*> (data_A), size_A, 0);
+               opj_image_t* image_B = decompress_j2k (const_cast<uint8_t*> (data_B), size_B, 0);
+               
+               /* Compare them */
+               
+               if (image_A->numcomps != image_B->numcomps) {
+                       notes.push_back ("image component counts for frame " + lexical_cast<string>(frame) + " differ");
+               }
+               
+               vector<int> abs_diffs (image_A->comps[0].w * image_A->comps[0].h * image_A->numcomps);
+               int d = 0;
+               int max_diff = 0;
+               
+               for (int c = 0; c < image_A->numcomps; ++c) {
+                       
+                       if (image_A->comps[c].w != image_B->comps[c].w || image_A->comps[c].h != image_B->comps[c].h) {
+                               notes.push_back ("image sizes for frame " + lexical_cast<string>(frame) + " differ");
+                       }
+                       
+                       int const pixels = image_A->comps[c].w * image_A->comps[c].h;
+                       for (int j = 0; j < pixels; ++j) {
+                               int const t = abs (image_A->comps[c].data[j] - image_B->comps[c].data[j]);
+                               abs_diffs[d++] = t;
+                               max_diff = max (max_diff, t);
                        }
                }
+               
+               uint64_t total = 0;
+               for (vector<int>::iterator j = abs_diffs.begin(); j != abs_diffs.end(); ++j) {
+                       total += *j;
+               }
+               
+               double const mean = double (total) / abs_diffs.size ();
+               
+               uint64_t total_squared_deviation = 0;
+               for (vector<int>::iterator j = abs_diffs.begin(); j != abs_diffs.end(); ++j) {
+                       total_squared_deviation += pow (*j - mean, 2);
+               }
+               
+               double const std_dev = sqrt (double (total_squared_deviation) / abs_diffs.size());
+               
+               if (mean > opt.max_mean_pixel_error || std_dev > opt.max_std_dev_pixel_error) {
+                       notes.push_back ("mean or standard deviation out of range for " + lexical_cast<string>(frame));
+               }
+               
+               if (opt.verbose) {
+                       cout << "\tmax pixel error " << max_diff << ", mean pixel error " << mean << ", standard deviation " << std_dev << "\n";
+               }
+               
+               opj_image_destroy (image_A);
+               opj_image_destroy (image_B);
        }
 
        return notes;
 }
 
-opj_image_t *
-PictureAsset::decompress_j2k (uint8_t* data, int64_t size) const
+
+StereoPictureAsset::StereoPictureAsset (string directory, string mxf_name, int fps, int entry_point, int length)
+       : PictureAsset (directory, mxf_name, 0, fps, entry_point, length)
 {
-       opj_dinfo_t* decoder = opj_create_decompress (CODEC_J2K);
-       opj_dparameters_t parameters;
-       opj_set_default_decoder_parameters (&parameters);
-       opj_setup_decoder (decoder, &parameters);
-       opj_cio_t* cio = opj_cio_open ((opj_common_ptr) decoder, data, size);
-       opj_image_t* image = opj_decode (decoder, cio);
-       if (!image) {
-               opj_destroy_decompress (decoder);
-               opj_cio_close (cio);
-               throw DCPReadError ("could not decode JPEG2000 codestream");
+       ASDCP::JP2K::MXFSReader reader;
+       if (ASDCP_FAILURE (reader.OpenRead (path().string().c_str()))) {
+               throw MXFFileError ("could not open MXF file for reading", path().string());
+       }
+       
+       ASDCP::JP2K::PictureDescriptor desc;
+       if (ASDCP_FAILURE (reader.FillPictureDescriptor (desc))) {
+               throw DCPReadError ("could not read video MXF information");
        }
 
-       opj_cio_close (cio);
-       return image;
+       _width = desc.StoredWidth;
+       _height = desc.StoredHeight;
+}
+
+shared_ptr<const StereoPictureFrame>
+StereoPictureAsset::get_frame (int n) const
+{
+       return shared_ptr<const StereoPictureFrame> (new StereoPictureFrame (path().string(), n + _entry_point));
 }