From: jhurst <jhurst@cinecert.com>
Date: Wed, 23 Jan 2008 00:22:00 +0000 (+0000)
Subject: fine tuning error messages
X-Git-Tag: rel_2_10_32~538
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=42a54acf649dfa5a320cc00ffaf49735d55739cc;p=asdcplib.git

fine tuning error messages
---

diff --git a/src/AS_DCP_JP2K.cpp b/src/AS_DCP_JP2K.cpp
index 3c5354a..d26d679 100755
--- a/src/AS_DCP_JP2K.cpp
+++ b/src/AS_DCP_JP2K.cpp
@@ -225,7 +225,7 @@ lh__Reader::OpenRead(const char* filename, EssenceType_t type)
 
       if ( ObjectList.empty() )
 	{
-	  DefaultLogSink().Error("MXF Metadata contains no Track Sets\n");
+	  DefaultLogSink().Error("MXF Metadata contains no Track Sets.\n");
 	  return RESULT_FORMAT;
 	}
 
@@ -235,16 +235,23 @@ lh__Reader::OpenRead(const char* filename, EssenceType_t type)
 	{
 	  if ( m_EditRate != m_EssenceDescriptor->SampleRate )
 	    {
-	      DefaultLogSink().Error("EditRate and SampleRate do not match (%.03f, %.03f)\n",
+	      DefaultLogSink().Error("EditRate and SampleRate do not match (%.03f, %.03f).\n",
 				     m_EditRate.Quotient(), m_EssenceDescriptor->SampleRate.Quotient());
-	      return RESULT_SFORMAT;
+	      
+	      if ( m_EditRate == EditRate_24 && m_EssenceDescriptor->SampleRate == EditRate_48 )
+		{
+		  DefaultLogSink().Error("File may contain JPEG Interop stereoscopic images.\n");
+		  return RESULT_SFORMAT;
+		}
+
+	      return RESULT_FORMAT;
 	    }
 	}
       else if ( type == ASDCP::ESS_JPEG_2000_S )
 	{
 	  if ( ! ( m_EditRate == EditRate_24 && m_EssenceDescriptor->SampleRate == EditRate_48 ) )
 	    {
-	      DefaultLogSink().Error("EditRate and SampleRate not correct for 24/48 stereoscopic essence\n");
+	      DefaultLogSink().Error("EditRate and SampleRate not correct for 24/48 stereoscopic essence.\n");
 	      return RESULT_FORMAT;
 	    }
 	}