X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2FJP2K_Sequence_Parser.cpp;h=a1ece3facc18fc9f98c4439a04adefd854647849;hb=2a1a0da4f67debb7dcfd01b885dad35279f27663;hp=a0fd5d0b9c2fde47ac8143fe13a5cd5b1cd228b4;hpb=20c2f749a4593c418259bcf8b5f6f0775b70d910;p=asdcplib.git diff --git a/src/JP2K_Sequence_Parser.cpp b/src/JP2K_Sequence_Parser.cpp index a0fd5d0..a1ece3f 100755 --- a/src/JP2K_Sequence_Parser.cpp +++ b/src/JP2K_Sequence_Parser.cpp @@ -249,6 +249,51 @@ operator==(const ASDCP::JP2K::CodingStyleDefault_t& lhs, const ASDCP::JP2K::Codi return true; } +// +bool +operator==(const ASDCP::JP2K::ExtendedCapabilities_t& lhs, const ASDCP::JP2K::ExtendedCapabilities_t& rhs) +{ + if (lhs.Pcap != rhs.Pcap) return false; + + for (ui32_t i = 0; i < JP2K::MaxCapabilities; i++) + { + if (lhs.Ccap[i] != rhs.Ccap[i]) + return false; + } + + return true; +} + +// +bool +operator==(const ASDCP::JP2K::CorrespondingProfile_t& lhs, const ASDCP::JP2K::CorrespondingProfile_t& rhs) +{ + if (lhs.N != rhs.N) return false; + + for (ui32_t i = 0; i < lhs.N; i++) + { + if (lhs.Pcpf[i] != rhs.Pcpf[i]) + return false; + } + + return true; +} + +// +bool +operator==(const ASDCP::JP2K::Profile_t& lhs, const ASDCP::JP2K::Profile_t& rhs) +{ + if (lhs.N != rhs.N) return false; + + for (ui32_t i = 0; i < lhs.N; i++) + { + if (lhs.Pprf[i] != rhs.Pprf[i]) + return false; + } + + return true; +} + // bool operator==(const ASDCP::JP2K::PictureDescriptor& lhs, const ASDCP::JP2K::PictureDescriptor& rhs) @@ -271,6 +316,9 @@ operator==(const ASDCP::JP2K::PictureDescriptor& lhs, const ASDCP::JP2K::Picture if ( lhs.Csize != rhs.Csize ) return false; if ( ! ( lhs.CodingStyleDefault == rhs.CodingStyleDefault ) ) return false; if ( ! ( lhs.QuantizationDefault == rhs.QuantizationDefault ) ) return false; + if (!(lhs.Profile == rhs.Profile)) return false; + if (!(lhs.CorrespondingProfile == rhs.CorrespondingProfile)) return false; + if (!(lhs.ExtendedCapabilities == rhs.ExtendedCapabilities)) return false; for ( ui32_t i = 0; i < JP2K::MaxComponents; i++ ) {