X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2FAS_DCP_JP2K.cpp;h=58bc0c93f49d342dfb0a8d7c46bff1be8edd5eba;hb=9e32c7029082710ed909ce78d33d6a9b41996dda;hp=d6754f5872dc60d4e0715b4e722f605e4630d895;hpb=8fad4cc485b8791abb93ec97fe6bff7b7aa3834b;p=asdcplib.git diff --git a/src/AS_DCP_JP2K.cpp b/src/AS_DCP_JP2K.cpp index d6754f5..58bc0c9 100755 --- a/src/AS_DCP_JP2K.cpp +++ b/src/AS_DCP_JP2K.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2004-2008, John Hurst +Copyright (c) 2004-2010, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -50,6 +50,7 @@ ASDCP::JP2K::operator << (std::ostream& strm, const PictureDescriptor& PDesc) { strm << " AspectRatio: " << PDesc.AspectRatio.Numerator << "/" << PDesc.AspectRatio.Denominator << std::endl; strm << " EditRate: " << PDesc.EditRate.Numerator << "/" << PDesc.EditRate.Denominator << std::endl; + strm << " SampleRate: " << PDesc.SampleRate.Numerator << "/" << PDesc.SampleRate.Denominator << std::endl; strm << " StoredWidth: " << (unsigned) PDesc.StoredWidth << std::endl; strm << " StoredHeight: " << (unsigned) PDesc.StoredHeight << std::endl; strm << " Rsize: " << (unsigned) PDesc.Rsize << std::endl; @@ -118,6 +119,7 @@ ASDCP::JP2K::PictureDescriptorDump(const PictureDescriptor& PDesc, FILE* stream) fprintf(stream, "\ AspectRatio: %d/%d\n\ EditRate: %d/%d\n\ + SampleRate: %d/%d\n\ StoredWidth: %u\n\ StoredHeight: %u\n\ Rsize: %u\n\ @@ -132,6 +134,7 @@ ASDCP::JP2K::PictureDescriptorDump(const PictureDescriptor& PDesc, FILE* stream) ContainerDuration: %u\n", PDesc.AspectRatio.Numerator, PDesc.AspectRatio.Denominator, PDesc.EditRate.Numerator, PDesc.EditRate.Denominator, + PDesc.SampleRate.Numerator, PDesc.SampleRate.Denominator, PDesc.StoredWidth, PDesc.StoredHeight, PDesc.Rsize, @@ -201,11 +204,13 @@ ASDCP::JP2K::PictureDescriptorDump(const PictureDescriptor& PDesc, FILE* stream) // // hidden, internal implementation of JPEG 2000 reader + class lh__Reader : public ASDCP::h__Reader { RGBAEssenceDescriptor* m_EssenceDescriptor; JPEG2000PictureSubDescriptor* m_EssenceSubDescriptor; ASDCP::Rational m_EditRate; + ASDCP::Rational m_SampleRate; EssenceType_t m_Format; ASDCP_NO_COPY_CONSTRUCT(lh__Reader); @@ -213,7 +218,8 @@ class lh__Reader : public ASDCP::h__Reader public: PictureDescriptor m_PDesc; // codestream parameter list - lh__Reader() : m_EssenceDescriptor(0), m_EssenceSubDescriptor(0), m_Format(ESS_UNKNOWN) {} + lh__Reader(const Dictionary& d) : + ASDCP::h__Reader(d), m_EssenceDescriptor(0), m_EssenceSubDescriptor(0), m_Format(ESS_UNKNOWN) {} Result_t OpenRead(const char*, EssenceType_t); Result_t ReadFrame(ui32_t, JP2K::FrameBuffer&, AESDecContext*, HMACContext*); Result_t MD_to_JP2K_PDesc(JP2K::PictureDescriptor& PDesc); @@ -227,6 +233,7 @@ lh__Reader::MD_to_JP2K_PDesc(JP2K::PictureDescriptor& PDesc) MXF::RGBAEssenceDescriptor* PDescObj = (MXF::RGBAEssenceDescriptor*)m_EssenceDescriptor; PDesc.EditRate = m_EditRate; + PDesc.SampleRate = m_SampleRate; assert(PDescObj->ContainerDuration <= 0xFFFFFFFFL); PDesc.ContainerDuration = (ui32_t) PDescObj->ContainerDuration; PDesc.StoredWidth = PDescObj->StoredWidth; @@ -256,18 +263,18 @@ lh__Reader::MD_to_JP2K_PDesc(JP2K::PictureDescriptor& PDesc) DefaultLogSink().Error("Unexpected PictureComponentSizing size: %u, should be 17\n", tmp_size); // CodingStyleDefault - memset(&m_PDesc.CodingStyleDefault, 0, sizeof(CodingStyleDefault_t)); - memcpy(&m_PDesc.CodingStyleDefault, + memset(&PDesc.CodingStyleDefault, 0, sizeof(CodingStyleDefault_t)); + memcpy(&PDesc.CodingStyleDefault, m_EssenceSubDescriptor->CodingStyleDefault.RoData(), m_EssenceSubDescriptor->CodingStyleDefault.Length()); // QuantizationDefault - memset(&m_PDesc.QuantizationDefault, 0, sizeof(QuantizationDefault_t)); - memcpy(&m_PDesc.QuantizationDefault, + memset(&PDesc.QuantizationDefault, 0, sizeof(QuantizationDefault_t)); + memcpy(&PDesc.QuantizationDefault, m_EssenceSubDescriptor->QuantizationDefault.RoData(), m_EssenceSubDescriptor->QuantizationDefault.Length()); - m_PDesc.QuantizationDefault.SPqcdLength = m_EssenceSubDescriptor->QuantizationDefault.Length() - 1; + PDesc.QuantizationDefault.SPqcdLength = m_EssenceSubDescriptor->QuantizationDefault.Length() - 1; } return RESULT_OK; @@ -299,17 +306,18 @@ lh__Reader::OpenRead(const char* filename, EssenceType_t type) } m_EditRate = ((Track*)ObjectList.front())->EditRate; + m_SampleRate = m_EssenceDescriptor->SampleRate; if ( type == ASDCP::ESS_JPEG_2000 ) { - if ( m_EditRate != m_EssenceDescriptor->SampleRate ) + if ( m_EditRate != m_SampleRate ) { - DefaultLogSink().Error("EditRate and SampleRate do not match (%.03f, %.03f).\n", - m_EditRate.Quotient(), m_EssenceDescriptor->SampleRate.Quotient()); + DefaultLogSink().Warn("EditRate and SampleRate do not match (%.03f, %.03f).\n", + m_EditRate.Quotient(), m_SampleRate.Quotient()); - if ( m_EditRate == EditRate_24 && m_EssenceDescriptor->SampleRate == EditRate_48 ) + if ( m_EditRate == EditRate_24 && m_SampleRate == EditRate_48 ) { - DefaultLogSink().Error("File may contain JPEG Interop stereoscopic images.\n"); + DefaultLogSink().Debug("File may contain JPEG Interop stereoscopic images.\n"); return RESULT_SFORMAT; } @@ -318,9 +326,34 @@ lh__Reader::OpenRead(const char* filename, EssenceType_t type) } else if ( type == ASDCP::ESS_JPEG_2000_S ) { - if ( ! ( m_EditRate == EditRate_24 && m_EssenceDescriptor->SampleRate == EditRate_48 ) ) + if ( m_EditRate == EditRate_24 ) + { + if ( m_SampleRate != EditRate_48 ) + { + DefaultLogSink().Error("EditRate and SampleRate not correct for 24/48 stereoscopic essence.\n"); + return RESULT_FORMAT; + } + } + else if ( m_EditRate == EditRate_25 ) + { + if ( m_SampleRate != EditRate_50 ) + { + DefaultLogSink().Error("EditRate and SampleRate not correct for 25/50 stereoscopic essence.\n"); + return RESULT_FORMAT; + } + } + else if ( m_EditRate == EditRate_30 ) { - DefaultLogSink().Error("EditRate and SampleRate not correct for 24/48 stereoscopic essence.\n"); + if ( m_SampleRate != EditRate_60 ) + { + DefaultLogSink().Error("EditRate and SampleRate not correct for 30/60 stereoscopic essence.\n"); + return RESULT_FORMAT; + } + } + else + { + DefaultLogSink().Error("EditRate not correct for stereoscopic essence: %d/%d.\n", + m_EditRate.Numerator, m_EditRate.Denominator); return RESULT_FORMAT; } } @@ -351,13 +384,19 @@ lh__Reader::ReadFrame(ui32_t FrameNum, JP2K::FrameBuffer& FrameBuf, if ( ! m_File.IsOpen() ) return RESULT_INIT; - return ReadEKLVFrame(FrameNum, FrameBuf, Dict::ul(MDD_JPEG2000Essence), Ctx, HMAC); + assert(m_Dict); + return ReadEKLVFrame(FrameNum, FrameBuf, m_Dict->ul(MDD_JPEG2000Essence), Ctx, HMAC); } // class ASDCP::JP2K::MXFReader::h__Reader : public lh__Reader { + ASDCP_NO_COPY_CONSTRUCT(h__Reader); + h__Reader(); + +public: + h__Reader(const Dictionary& d) : lh__Reader(d) {} }; @@ -385,7 +424,7 @@ ASDCP::JP2K::FrameBuffer::Dump(FILE* stream, ui32_t dump_len) const ASDCP::JP2K::MXFReader::MXFReader() { - m_Reader = new h__Reader; + m_Reader = new h__Reader(DefaultCompositeDict()); } @@ -462,12 +501,13 @@ ASDCP::JP2K::MXFReader::DumpIndex(FILE* stream) const //------------------------------------------------------------------------------------------ + class ASDCP::JP2K::MXFSReader::h__SReader : public lh__Reader { ui32_t m_StereoFrameReady; public: - h__SReader() : m_StereoFrameReady(0xffffffff) {} + h__SReader(const Dictionary& d) : lh__Reader(d), m_StereoFrameReady(0xffffffff) {} // Result_t ReadFrame(ui32_t FrameNum, StereoscopicPhase_t phase, FrameBuffer& FrameBuf, @@ -533,7 +573,8 @@ public: { ui32_t SequenceNum = FrameNum * 2; SequenceNum += ( phase == SP_RIGHT ) ? 2 : 1; - result = ReadEKLVPacket(FrameNum, SequenceNum, FrameBuf, Dict::ul(MDD_JPEG2000Essence), Ctx, HMAC); + assert(m_Dict); + result = ReadEKLVPacket(FrameNum, SequenceNum, FrameBuf, m_Dict->ul(MDD_JPEG2000Essence), Ctx, HMAC); } return result; @@ -544,7 +585,7 @@ public: ASDCP::JP2K::MXFSReader::MXFSReader() { - m_Reader = new h__SReader; + m_Reader = new h__SReader(DefaultCompositeDict()); } @@ -640,15 +681,16 @@ ASDCP::JP2K::MXFSReader::DumpIndex(FILE* stream) const // class lh__Writer : public ASDCP::h__Writer { + ASDCP_NO_COPY_CONSTRUCT(lh__Writer); + lh__Writer(); + JPEG2000PictureSubDescriptor* m_EssenceSubDescriptor; public: PictureDescriptor m_PDesc; byte_t m_EssenceUL[SMPTE_UL_LENGTH]; - ASDCP_NO_COPY_CONSTRUCT(lh__Writer); - - lh__Writer() : m_EssenceSubDescriptor(0) { + lh__Writer(const Dictionary& d) : ASDCP::h__Writer(d), m_EssenceSubDescriptor(0) { memset(m_EssenceUL, 0, SMPTE_UL_LENGTH); } @@ -691,14 +733,15 @@ lh__Writer::JP2K_PDesc_to_MD(JP2K::PictureDescriptor& PDesc) // PixelLayout byte_t[PixelLayoutSize] = s_PixelLayoutXYZ // } + assert(m_Dict); if ( PDesc.StoredWidth < 2049 ) { - PDescObj->PictureEssenceCoding.Set(Dict::ul(MDD_JP2KEssenceCompression_2K)); + PDescObj->PictureEssenceCoding.Set(m_Dict->ul(MDD_JP2KEssenceCompression_2K)); m_EssenceSubDescriptor->Rsize = 3; } else { - PDescObj->PictureEssenceCoding.Set(Dict::ul(MDD_JP2KEssenceCompression_4K)); + PDescObj->PictureEssenceCoding.Set(m_Dict->ul(MDD_JP2KEssenceCompression_4K)); m_EssenceSubDescriptor->Rsize = 4; } @@ -752,12 +795,12 @@ lh__Writer::OpenWrite(const char* filename, EssenceType_t type, ui32_t HeaderSiz if ( ASDCP_SUCCESS(result) ) { m_HeaderSize = HeaderSize; - RGBAEssenceDescriptor* tmp_rgba = new RGBAEssenceDescriptor; + RGBAEssenceDescriptor* tmp_rgba = new RGBAEssenceDescriptor(m_Dict); tmp_rgba->ComponentMaxRef = 4095; tmp_rgba->ComponentMinRef = 0; m_EssenceDescriptor = tmp_rgba; - m_EssenceSubDescriptor = new JPEG2000PictureSubDescriptor; + m_EssenceSubDescriptor = new JPEG2000PictureSubDescriptor(m_Dict); m_EssenceSubDescriptorList.push_back((InterchangeObject*)m_EssenceSubDescriptor); GenRandomValue(m_EssenceSubDescriptor->InstanceUID); @@ -765,7 +808,7 @@ lh__Writer::OpenWrite(const char* filename, EssenceType_t type, ui32_t HeaderSiz if ( type == ASDCP::ESS_JPEG_2000_S && m_Info.LabelSetType == LS_MXF_SMPTE ) { - InterchangeObject* StereoSubDesc = new StereoscopicPictureSubDescriptor; + InterchangeObject* StereoSubDesc = new StereoscopicPictureSubDescriptor(m_Dict); m_EssenceSubDescriptorList.push_back(StereoSubDesc); GenRandomValue(StereoSubDesc->InstanceUID); m_EssenceDescriptor->SubDescriptors.push_back(StereoSubDesc->InstanceUID); @@ -781,6 +824,7 @@ lh__Writer::OpenWrite(const char* filename, EssenceType_t type, ui32_t HeaderSiz ASDCP::Result_t lh__Writer::SetSourceStream(const PictureDescriptor& PDesc, const std::string& label, ASDCP::Rational LocalEditRate) { + assert(m_Dict); if ( ! m_State.Test_INIT() ) return RESULT_STATE; @@ -790,18 +834,18 @@ lh__Writer::SetSourceStream(const PictureDescriptor& PDesc, const std::string& l m_PDesc = PDesc; Result_t result = JP2K_PDesc_to_MD(m_PDesc); - if ( ASDCP_SUCCESS(result) ) - result = WriteMXFHeader(label, UL(Dict::ul(MDD_JPEG_2000Wrapping)), - PICT_DEF_LABEL, UL(Dict::ul(MDD_PictureDataDef)), - LocalEditRate, 24 /* TCFrameRate */); - if ( ASDCP_SUCCESS(result) ) { - memcpy(m_EssenceUL, Dict::ul(MDD_JPEG2000Essence), SMPTE_UL_LENGTH); + memcpy(m_EssenceUL, m_Dict->ul(MDD_JPEG2000Essence), SMPTE_UL_LENGTH); m_EssenceUL[SMPTE_UL_LENGTH-1] = 1; // first (and only) essence container result = m_State.Goto_READY(); } + if ( ASDCP_SUCCESS(result) ) + result = WriteMXFHeader(label, UL(m_Dict->ul(MDD_JPEG_2000Wrapping)), + PICT_DEF_LABEL, UL(m_EssenceUL), UL(m_Dict->ul(MDD_PictureDataDef)), + LocalEditRate, 24 /* TCFrameRate */); + return result; } @@ -853,6 +897,11 @@ lh__Writer::Finalize() // class ASDCP::JP2K::MXFWriter::h__Writer : public lh__Writer { + ASDCP_NO_COPY_CONSTRUCT(h__Writer); + h__Writer(); + +public: + h__Writer(const Dictionary& d) : lh__Writer(d) {} }; @@ -875,7 +924,11 @@ ASDCP::Result_t ASDCP::JP2K::MXFWriter::OpenWrite(const char* filename, const WriterInfo& Info, const PictureDescriptor& PDesc, ui32_t HeaderSize) { - m_Writer = new h__Writer; + if ( Info.LabelSetType == LS_MXF_SMPTE ) + m_Writer = new h__Writer(DefaultSMPTEDict()); + else + m_Writer = new h__Writer(DefaultInteropDict()); + m_Writer->m_Info = Info; Result_t result = m_Writer->OpenWrite(filename, ASDCP::ESS_JPEG_2000, HeaderSize); @@ -920,10 +973,12 @@ ASDCP::JP2K::MXFWriter::Finalize() // class ASDCP::JP2K::MXFSWriter::h__SWriter : public lh__Writer { + ASDCP_NO_COPY_CONSTRUCT(h__SWriter); + h__SWriter(); StereoscopicPhase_t m_NextPhase; public: - h__SWriter() : m_NextPhase(SP_LEFT) {} + h__SWriter(const Dictionary& d) : lh__Writer(d), m_NextPhase(SP_LEFT) {} // Result_t WriteFrame(const FrameBuffer& FrameBuf, StereoscopicPhase_t phase, @@ -971,11 +1026,16 @@ ASDCP::Result_t ASDCP::JP2K::MXFSWriter::OpenWrite(const char* filename, const WriterInfo& Info, const PictureDescriptor& PDesc, ui32_t HeaderSize) { - m_Writer = new h__SWriter; - - if ( PDesc.EditRate != ASDCP::EditRate_24 ) + if ( Info.LabelSetType == LS_MXF_SMPTE ) + m_Writer = new h__SWriter(DefaultSMPTEDict()); + else + m_Writer = new h__SWriter(DefaultInteropDict()); + + if ( PDesc.EditRate != ASDCP::EditRate_24 + && PDesc.EditRate != ASDCP::EditRate_25 + && PDesc.EditRate != ASDCP::EditRate_30 ) { - DefaultLogSink().Error("Stereoscopic wrapping requires 24 fps input streams.\n"); + DefaultLogSink().Error("Stereoscopic wrapping requires 24, 25 or 30 fps input streams.\n"); return RESULT_FORMAT; } @@ -989,9 +1049,17 @@ ASDCP::JP2K::MXFSWriter::OpenWrite(const char* filename, const WriterInfo& Info, if ( ASDCP_SUCCESS(result) ) { PictureDescriptor TmpPDesc = PDesc; - TmpPDesc.EditRate = ASDCP::EditRate_48; - result = m_Writer->SetSourceStream(TmpPDesc, JP2K_S_PACKAGE_LABEL, ASDCP::EditRate_24); + if ( PDesc.EditRate == ASDCP::EditRate_24 ) + TmpPDesc.EditRate = ASDCP::EditRate_48; + + else if ( PDesc.EditRate == ASDCP::EditRate_25 ) + TmpPDesc.EditRate = ASDCP::EditRate_50; + + else if ( PDesc.EditRate == ASDCP::EditRate_30 ) + TmpPDesc.EditRate = ASDCP::EditRate_60; + + result = m_Writer->SetSourceStream(TmpPDesc, JP2K_S_PACKAGE_LABEL, PDesc.EditRate); } if ( ASDCP_FAILURE(result) )