diff options
Diffstat (limited to 'src/JP2K_Codestream_Parser.cpp')
| -rwxr-xr-x | src/JP2K_Codestream_Parser.cpp | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/src/JP2K_Codestream_Parser.cpp b/src/JP2K_Codestream_Parser.cpp index d68b52a..878f6a1 100755 --- a/src/JP2K_Codestream_Parser.cpp +++ b/src/JP2K_Codestream_Parser.cpp @@ -90,6 +90,28 @@ public: return result; } + + Result_t OpenReadFrame(const unsigned char* data, unsigned int size, FrameBuffer& FB) + { + if ( FB.Capacity() < size ) + { + DefaultLogSink().Error("FrameBuf.Capacity: %u frame length: %u\n", FB.Capacity(), (ui32_t)size); + return RESULT_SMALLBUF; + } + + ui32_t read_count; + + memcpy(FB.Data(), data, size); + FB.Size(size); + + byte_t start_of_data = 0; // out param + const Result_t result = ParseMetadataIntoDesc(FB, m_PDesc, &start_of_data); + + if ( ASDCP_SUCCESS(result) ) + FB.PlaintextOffset(start_of_data); + + return result; + } }; ASDCP::Result_t @@ -148,7 +170,7 @@ ASDCP::JP2K::ParseMetadataIntoDesc(const FrameBuffer& FB, PictureDescriptor& PDe DefaultLogSink().Error("Unexpected number of components: %u\n", PDesc.Csize); return RESULT_RAW_FORMAT; } - + for ( i = 0; i < PDesc.Csize; i++ ) SIZ_.ReadComponent(i, PDesc.ImageComponents[i]); } @@ -162,7 +184,7 @@ ASDCP::JP2K::ParseMetadataIntoDesc(const FrameBuffer& FB, PictureDescriptor& PDe DefaultLogSink().Error("Unexpectedly large CodingStyle data: %u\n", NextMarker.m_DataSize); return RESULT_RAW_FORMAT; } - + memcpy(&PDesc.CodingStyleDefault, NextMarker.m_Data, NextMarker.m_DataSize); break; @@ -174,7 +196,7 @@ ASDCP::JP2K::ParseMetadataIntoDesc(const FrameBuffer& FB, PictureDescriptor& PDe DefaultLogSink().Error("No quantization signaled. QCD size=%s.\n", NextMarker.m_DataSize); return RESULT_RAW_FORMAT; } - + if ( NextMarker.m_DataSize > MaxDefaults ) { DefaultLogSink().Error("Quantization Default length exceeds maximum %d\n", NextMarker.m_DataSize); @@ -188,7 +210,7 @@ ASDCP::JP2K::ParseMetadataIntoDesc(const FrameBuffer& FB, PictureDescriptor& PDe case MRK_CAP: { Accessor::CAP CAP_(NextMarker); - + PDesc.ExtendedCapabilities.Pcap = CAP_.pcap(); PDesc.ExtendedCapabilities.N = CAP_.N(); @@ -271,6 +293,13 @@ ASDCP::JP2K::CodestreamParser::OpenReadFrame(const std::string& filename, FrameB return m_Parser->OpenReadFrame(filename, FB); } +ASDCP::Result_t +ASDCP::JP2K::CodestreamParser::OpenReadFrame(const unsigned char* data, int size, FrameBuffer& FB) const +{ + const_cast<ASDCP::JP2K::CodestreamParser*>(this)->m_Parser = new h__CodestreamParser; + return m_Parser->OpenReadFrame(data, size, FB); +} + // ASDCP::Result_t ASDCP::JP2K::CodestreamParser::FillPictureDescriptor(PictureDescriptor& PDesc) const |