projects
/
asdcplib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
536d96a
)
fine tuning error messages
author
jhurst
<jhurst@cinecert.com>
Wed, 23 Jan 2008 00:22:00 +0000
(
00:22
+0000)
committer
jhurst
<>
Wed, 23 Jan 2008 00:22:00 +0000
(
00:22
+0000)
src/AS_DCP_JP2K.cpp
patch
|
blob
|
history
diff --git
a/src/AS_DCP_JP2K.cpp
b/src/AS_DCP_JP2K.cpp
index 3c5354a336ddfdb508e03b4121231f0a8f27469c..d26d6798c57e82bf20b6c527722bb01c73a4ac8f 100755
(executable)
--- 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() )
{
if ( ObjectList.empty() )
{
- DefaultLogSink().Error("MXF Metadata contains no Track Sets\n");
+ DefaultLogSink().Error("MXF Metadata contains no Track Sets
.
\n");
return RESULT_FORMAT;
}
return RESULT_FORMAT;
}
@@
-235,16
+235,23
@@
lh__Reader::OpenRead(const char* filename, EssenceType_t type)
{
if ( m_EditRate != m_EssenceDescriptor->SampleRate )
{
{
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());
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 ) )
{
}
}
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;
}
}
return RESULT_FORMAT;
}
}