X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2FAS_DCP_JP2K.cpp;h=009586a0370e0efef37b8078d0b566c9aa95fd85;hb=7088ba5125e89164ccf1d4d810b819bdd2e3ccff;hp=e0852b1154b906357ec9812c59722f8f1572d714;hpb=4808d5031d03ffe14e7e1fa9dfd4ef2c6c0c48d2;p=asdcplib.git diff --git a/src/AS_DCP_JP2K.cpp b/src/AS_DCP_JP2K.cpp index e0852b1..009586a 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-2009, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -30,9 +30,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AS_DCP_internal.h" +#include +#include using namespace ASDCP::JP2K; - +using Kumu::GenRandomValue; //------------------------------------------------------------------------------------------ @@ -42,6 +44,71 @@ static std::string PICT_DEF_LABEL = "Picture Track"; int s_exp_lookup[16] = { 0, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024,2048, 4096, 8192, 16384, 32768 }; +// +std::ostream& +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; + strm << " Xsize: " << (unsigned) PDesc.Xsize << std::endl; + strm << " Ysize: " << (unsigned) PDesc.Ysize << std::endl; + strm << " XOsize: " << (unsigned) PDesc.XOsize << std::endl; + strm << " YOsize: " << (unsigned) PDesc.YOsize << std::endl; + strm << " XTsize: " << (unsigned) PDesc.XTsize << std::endl; + strm << " YTsize: " << (unsigned) PDesc.YTsize << std::endl; + strm << " XTOsize: " << (unsigned) PDesc.XTOsize << std::endl; + strm << " YTOsize: " << (unsigned) PDesc.YTOsize << std::endl; + strm << " ContainerDuration: " << (unsigned) PDesc.ContainerDuration << std::endl; + + strm << "-- JPEG 2000 Metadata --" << std::endl; + strm << " ImageComponents:" << std::endl; + strm << " bits h-sep v-sep" << std::endl; + + ui32_t i; + for ( i = 0; i < PDesc.Csize; i++ ) + { + strm << " " << std::setw(4) << PDesc.ImageComponents[i].Ssize + 1 /* See ISO 15444-1, Table A11, for the origin of '+1' */ + << " " << std::setw(5) << PDesc.ImageComponents[i].XRsize + << " " << std::setw(5) << PDesc.ImageComponents[i].YRsize + << std::endl; + } + + strm << " Scod: " << (short) PDesc.CodingStyleDefault.Scod << std::endl; + strm << " ProgressionOrder: " << (short) PDesc.CodingStyleDefault.SGcod.ProgressionOrder << std::endl; + strm << " NumberOfLayers: " << (short) KM_i16_BE(Kumu::cp2i(PDesc.CodingStyleDefault.SGcod.NumberOfLayers)) << std::endl; + strm << " MultiCompTransform: " << (short) PDesc.CodingStyleDefault.SGcod.MultiCompTransform << std::endl; + strm << "DecompositionLevels: " << (short) PDesc.CodingStyleDefault.SPcod.DecompositionLevels << std::endl; + strm << " CodeblockWidth: " << (short) PDesc.CodingStyleDefault.SPcod.CodeblockWidth << std::endl; + strm << " CodeblockHeight: " << (short) PDesc.CodingStyleDefault.SPcod.CodeblockHeight << std::endl; + strm << " CodeblockStyle: " << (short) PDesc.CodingStyleDefault.SPcod.CodeblockStyle << std::endl; + strm << " Transformation: " << (short) PDesc.CodingStyleDefault.SPcod.Transformation << std::endl; + + + ui32_t precinct_set_size = 0; + + for ( i = 0; PDesc.CodingStyleDefault.SPcod.PrecinctSize[i] != 0 && i < MaxPrecincts; i++ ) + precinct_set_size++; + + strm << " Precincts: " << (short) precinct_set_size << std::endl; + strm << "precinct dimensions:" << std::endl; + + for ( i = 0; i < precinct_set_size; i++ ) + strm << " " << i + 1 << ": " << s_exp_lookup[PDesc.CodingStyleDefault.SPcod.PrecinctSize[i]&0x0f] << " x " + << s_exp_lookup[(PDesc.CodingStyleDefault.SPcod.PrecinctSize[i]>>4)&0x0f] << std::endl; + + strm << " Sqcd: " << (short) PDesc.QuantizationDefault.Sqcd << std::endl; + + char tmp_buf[MaxDefaults*2]; + strm << " SPqcd: " << Kumu::bin2hex(PDesc.QuantizationDefault.SPqcd, PDesc.QuantizationDefault.SPqcdLength, tmp_buf, MaxDefaults*2) + << std::endl; + + return strm; +} + // void ASDCP::JP2K::PictureDescriptorDump(const PictureDescriptor& PDesc, FILE* stream) @@ -52,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\ @@ -66,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, @@ -84,7 +153,8 @@ ASDCP::JP2K::PictureDescriptorDump(const PictureDescriptor& PDesc, FILE* stream) fprintf(stream, " ImageComponents:\n"); fprintf(stream, " bits h-sep v-sep\n"); - for ( ui32_t i = 0; i < PDesc.Csize; i++ ) + ui32_t i; + for ( i = 0; i < PDesc.Csize; i++ ) { fprintf(stream, " %4d %5d %5d\n", PDesc.ImageComponents[i].Ssize + 1, // See ISO 15444-1, Table A11, for the origin of '+1' @@ -106,7 +176,7 @@ ASDCP::JP2K::PictureDescriptorDump(const PictureDescriptor& PDesc, FILE* stream) fprintf(stream, " Transformation: %hd\n", PDesc.CodingStyleDefault.SPcod.Transformation); - ui32_t precinct_set_size = 0, i; + ui32_t precinct_set_size = 0; for ( i = 0; PDesc.CodingStyleDefault.SPcod.PrecinctSize[i] != 0 && i < MaxPrecincts; i++ ) precinct_set_size++; @@ -129,15 +199,18 @@ 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); @@ -145,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); @@ -159,7 +233,9 @@ lh__Reader::MD_to_JP2K_PDesc(JP2K::PictureDescriptor& PDesc) MXF::RGBAEssenceDescriptor* PDescObj = (MXF::RGBAEssenceDescriptor*)m_EssenceDescriptor; PDesc.EditRate = m_EditRate; - PDesc.ContainerDuration = PDescObj->ContainerDuration; + PDesc.SampleRate = m_SampleRate; + assert(PDescObj->ContainerDuration <= 0xFFFFFFFFL); + PDesc.ContainerDuration = (ui32_t) PDescObj->ContainerDuration; PDesc.StoredWidth = PDescObj->StoredWidth; PDesc.StoredHeight = PDescObj->StoredHeight; PDesc.AspectRatio = PDescObj->AspectRatio; @@ -225,26 +301,34 @@ 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; } 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()); - return RESULT_SFORMAT; + DefaultLogSink().Error("EditRate and SampleRate do not match (%.03f, %.03f).\n", + m_EditRate.Quotient(), m_SampleRate.Quotient()); + + if ( m_EditRate == EditRate_24 && m_SampleRate == EditRate_48 ) + { + DefaultLogSink().Debug("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 ) ) + if ( ! ( m_EditRate == EditRate_24 && m_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; } } @@ -275,13 +359,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) {} }; @@ -309,7 +399,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()); } @@ -386,12 +476,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, @@ -457,7 +548,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; @@ -468,7 +560,7 @@ public: ASDCP::JP2K::MXFSReader::MXFSReader() { - m_Reader = new h__SReader; + m_Reader = new h__SReader(DefaultCompositeDict()); } @@ -564,15 +656,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); } @@ -615,14 +708,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; } @@ -676,12 +770,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); @@ -689,7 +783,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); @@ -705,6 +799,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; @@ -715,13 +810,13 @@ lh__Writer::SetSourceStream(const PictureDescriptor& PDesc, const std::string& l 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)), + result = WriteMXFHeader(label, UL(m_Dict->ul(MDD_JPEG_2000Wrapping)), + PICT_DEF_LABEL, UL(m_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(); } @@ -777,6 +872,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) {} }; @@ -799,15 +899,17 @@ 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); 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(); @@ -846,10 +948,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, @@ -897,19 +1001,26 @@ 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 ( Info.LabelSetType == LS_MXF_SMPTE ) + m_Writer = new h__SWriter(DefaultSMPTEDict()); + else + m_Writer = new h__SWriter(DefaultInteropDict()); + if ( PDesc.EditRate != ASDCP::EditRate_24 ) { DefaultLogSink().Error("Stereoscopic wrapping requires 24 fps input streams.\n"); return RESULT_FORMAT; } + if ( PDesc.StoredWidth > 2048 ) + DefaultLogSink().Warn("Wrapping non-standard 4K stereoscopic content. I hope you know what you are doing!\n"); + + 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;