summaryrefslogtreecommitdiff
path: root/src/AS_DCP_JP2K.cpp
diff options
context:
space:
mode:
authorjhurst <jhurst@cinecert.com>2008-01-23 00:22:00 +0000
committerjhurst <>2008-01-23 00:22:00 +0000
commit42a54acf649dfa5a320cc00ffaf49735d55739cc (patch)
tree2d7eab1653b660660283893e3aa4ca8210ebadf4 /src/AS_DCP_JP2K.cpp
parent536d96a6d0938c5105e0aeda5f3ee77322c46228 (diff)
fine tuning error messages
Diffstat (limited to 'src/AS_DCP_JP2K.cpp')
-rwxr-xr-xsrc/AS_DCP_JP2K.cpp15
1 files changed, 11 insertions, 4 deletions
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;
}
}