From 75319c36f1ce313cadac1a67d504312229204f0e Mon Sep 17 00:00:00 2001 From: jhurst Date: Mon, 21 Jan 2008 22:24:17 +0000 Subject: no 4K 3D! --- src/AS_DCP_JP2K.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/AS_DCP_JP2K.cpp') diff --git a/src/AS_DCP_JP2K.cpp b/src/AS_DCP_JP2K.cpp index e0852b1..40e6a82 100755 --- a/src/AS_DCP_JP2K.cpp +++ b/src/AS_DCP_JP2K.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2004-2007, John Hurst +Copyright (c) 2004-2008, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -800,14 +800,12 @@ ASDCP::JP2K::MXFWriter::OpenWrite(const char* filename, const WriterInfo& Info, const PictureDescriptor& PDesc, ui32_t HeaderSize) { m_Writer = new h__Writer; - + m_Writer->m_Info = Info; + Result_t result = m_Writer->OpenWrite(filename, ASDCP::ESS_JPEG_2000, HeaderSize); if ( ASDCP_SUCCESS(result) ) - { - m_Writer->m_Info = Info; - result = m_Writer->SetSourceStream(PDesc, JP2K_PACKAGE_LABEL); - } + result = m_Writer->SetSourceStream(PDesc, JP2K_PACKAGE_LABEL); if ( ASDCP_FAILURE(result) ) m_Writer.release(); @@ -905,11 +903,18 @@ ASDCP::JP2K::MXFSWriter::OpenWrite(const char* filename, const WriterInfo& Info, return RESULT_FORMAT; } + if ( PDesc.StoredWidth > 2048 ) + { + DefaultLogSink().Error("Stereoscopic wrapping requires 2K image content.\n"); + return RESULT_FORMAT; + } + + m_Writer->m_Info = Info; + Result_t result = m_Writer->OpenWrite(filename, ASDCP::ESS_JPEG_2000_S, HeaderSize); if ( ASDCP_SUCCESS(result) ) { - m_Writer->m_Info = Info; PictureDescriptor TmpPDesc = PDesc; TmpPDesc.EditRate = ASDCP::EditRate_48; -- cgit v1.2.3