Merge pull request #902 from riba101/master

Added CBCS encryption for DVHE and DVH1
axiomatic-systems · Nov 18, 2023 · feb99f5 · feb99f5
2 parents 2e2dc01 + 7fc31d2
commit feb99f5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Source/C++/Core/Ap4CommonEncryption.cpp b/Source/C++/Core/Ap4CommonEncryption.cpp
@@ -290,6 +290,8 @@ AP4_CencCbcsSubSampleMapper::AP4_CencCbcsSubSampleMapper(AP4_Size nalu_length_si
         // look for an hevc sample description
         AP4_HvccAtom* hvcc = AP4_DYNAMIC_CAST(AP4_HvccAtom, stsd->FindChild("hvc1/hvcC"));
         if (!hvcc)    hvcc = AP4_DYNAMIC_CAST(AP4_HvccAtom, stsd->FindChild("hev1/hvcC"));
+	if (!hvcc)    hvcc = AP4_DYNAMIC_CAST(AP4_HvccAtom, stsd->FindChild("dvh1/hvcC"));
+	if (!hvcc)    hvcc = AP4_DYNAMIC_CAST(AP4_HvccAtom, stsd->FindChild("dvhe/hvcC"));
         if (!hvcc)    return;
 
         // parse the vps, sps and pps if we have them