Skip to content

Remove clang warnings #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
y-guyon merged 1 commit into from
Mar 24, 2026
Merged

Remove clang warnings #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IsoLib/favs_example/src/hevc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ u8* stripNALEmulation(u8* buffer, u32* bufferLen) {
return outBuffer;
}

int parseHEVCNal(FILE* input, u8** data, int* data_len) {
u32 parseHEVCNal(FILE* input, u8** data, u32* data_len) {
size_t startPos;
size_t NALStart = 0;
size_t NALEnd = 0;
Expand Down
2 changes: 1 addition & 1 deletion IsoLib/favs_example/src/hevc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ MP4Err hevc_parse_pps_minimal(BitBuffer *bb, struct hevc_pps* pps);
MP4Err hevc_parse_slice_header_minimal(BitBuffer *bb, struct hevc_poc* poc, struct hevc_slice_header* header,
struct hevc_sps* sps, struct hevc_pps* pps);
u8* stripNALEmulation(u8* buffer, u32* bufferLen);
int parseHEVCNal(FILE* input, u8** data, int* data_len);
u32 parseHEVCNal(FILE* input, u8** data, u32* data_len);
ISOErr analyze_hevc_stream(FILE* input, struct hevc_stream* stream);

#endif
12 changes: 6 additions & 6 deletions IsoLib/ipmp_example/src/protectAudioMovie.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ MP4Err addIPMPToolDescriptorUpdateToODAccessUnit( MP4Handle odAccessUnitH,
/
/ main function
/
/*=====*/
/ =====*/

int main( int argc, char **argv )
{
Expand Down Expand Up @@ -100,7 +100,7 @@ int main( int argc, char **argv )
/ protectMyAudioMovie
/ Protect the audio media track using an IPMP Tool specified by its IPMP_ToolID
/
/*=====*/
/ =====*/

MP4Err protectMyAudioMovie( char *inFilename, char *outFilename, u64 ipmpToolID )
{
Expand Down Expand Up @@ -355,7 +355,7 @@ MP4Err protectMyAudioMovie( char *inFilename, char *outFilename, u64 ipmpToolID
/ associateSampleDescWithIPMPToolPtr
/ Create the IPMP_ToolDecriptorPointer and add it to the media Sample Description
/
/*=====*/
/ =====*/

MP4Err associateSampleDescWithIPMPToolPtr( MP4Handle outMediaSampleDescrH,
u16 theIPMP_ToolDescriptorID) {
Expand Down Expand Up @@ -384,7 +384,7 @@ MP4Err associateSampleDescWithIPMPToolPtr( MP4Handle outMediaSampleDescrH,
/ addIPMPToolDescriptorUpdateToODAccessUnit
/ Create the IPMP_ToolDecriptorUpdate command and add it to an OD access unit
/
/*=====*/
/ =====*/

MP4Err addIPMPToolDescriptorUpdateToODAccessUnit( MP4Handle odAccessUnitH,
u16 ipmpToolDescriptorId,
Expand Down Expand Up @@ -437,7 +437,7 @@ MP4Err addIPMPToolDescriptorUpdateToODAccessUnit( MP4Handle odAccessUnitH,
/ protectSample
/ Protect one media access unit (or sample)
/
/*=====*/
/ =====*/

MP4Err protectSample(MP4Handle sampleH, u64 ipmpToolID) {

Expand All @@ -452,7 +452,7 @@ MP4Err protectSample(MP4Handle sampleH, u64 ipmpToolID) {
/ putToolListInIOD
/ Create the IPMP Tool List and put it in the IOD
/
/*=====*/
/ =====*/

MP4Err putToolListInIOD( MP4Movie theMovie, u64 theIpmpToolID) {

Expand Down
16 changes: 8 additions & 8 deletions IsoLib/isoiff_tool/src/HEVCDecoderConfigRecord.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,13 @@ MP4Err ISOIFF_CreateHEVCDecConfRecFromHandle(MP4Handle recordDataHandle,
// buffer += 4;
memcpy(&tmp8, buffer, 1);
buffer += 1;
hevcDecConfRec->general_profile_compatibility_flags = (tmp8 << 24);
hevcDecConfRec->general_profile_compatibility_flags = ((u64)tmp8 << 24);
memcpy(&tmp8, buffer, 1);
buffer += 1;
hevcDecConfRec->general_profile_compatibility_flags |= (tmp8 << 16);
hevcDecConfRec->general_profile_compatibility_flags |= ((u64)tmp8 << 16);
memcpy(&tmp8, buffer, 1);
buffer += 1;
hevcDecConfRec->general_profile_compatibility_flags |= (tmp8 << 8);
hevcDecConfRec->general_profile_compatibility_flags |= ((u64)tmp8 << 8);
memcpy(&tmp8, buffer, 1);
buffer += 1;
hevcDecConfRec->general_profile_compatibility_flags |= tmp8;
Expand All @@ -350,19 +350,19 @@ MP4Err ISOIFF_CreateHEVCDecConfRecFromHandle(MP4Handle recordDataHandle,
// hevcDecConfRec->general_constraint_indicator_flags = tmp64 >> 16;
memcpy(&tmp8, buffer, 1);
buffer += 1;
hevcDecConfRec->general_constraint_indicator_flags = tmp8 << 40;
hevcDecConfRec->general_constraint_indicator_flags = (u64)tmp8 << 40;
memcpy(&tmp8, buffer, 1);
buffer += 1;
hevcDecConfRec->general_constraint_indicator_flags |= (tmp8 << 32);
hevcDecConfRec->general_constraint_indicator_flags |= ((u64)tmp8 << 32);
memcpy(&tmp8, buffer, 1);
buffer += 1;
hevcDecConfRec->general_constraint_indicator_flags |= (tmp8 << 24);
hevcDecConfRec->general_constraint_indicator_flags |= ((u64)tmp8 << 24);
memcpy(&tmp8, buffer, 1);
buffer += 1;
hevcDecConfRec->general_constraint_indicator_flags |= (tmp8 << 16);
hevcDecConfRec->general_constraint_indicator_flags |= ((u64)tmp8 << 16);
memcpy(&tmp8, buffer, 1);
buffer += 1;
hevcDecConfRec->general_constraint_indicator_flags |= (tmp8 << 8);
hevcDecConfRec->general_constraint_indicator_flags |= ((u64)tmp8 << 8);
memcpy(&tmp8, buffer, 1);
buffer += 1;
hevcDecConfRec->general_constraint_indicator_flags |= tmp8;
Expand Down
86 changes: 43 additions & 43 deletions IsoLib/t35_tool/sources/SMPTE_ST2094_50.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,35 +544,35 @@ void SMPTE_ST2094_50::convertMetadataItemsToSyntaxElements(){

// Check if the primary combination is known
if (
abs(cvt.hatm.gainApplicationSpaceChromaticities[0] - 0.64 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[1] - 0.33 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[2] - 0.30 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[3] - 0.60 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[4] - 0.15 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[5] - 0.06 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[6] - 0.3127) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[7] - 0.3290) < P_GAIN_APPLICATION_SPACE_CHROMATICITY){
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[0] - 0.64 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[1] - 0.33 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[2] - 0.30 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[3] - 0.60 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[4] - 0.15 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[5] - 0.06 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[6] - 0.3127) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[7] - 0.3290) < P_GAIN_APPLICATION_SPACE_CHROMATICITY){
elm.gain_application_space_chromaticities_mode = 0;
}
else if (
abs(cvt.hatm.gainApplicationSpaceChromaticities[0] - 0.68 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[1] - 0.32 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[2] - 0.265 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[3] - 0.69 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[4] - 0.15 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[5] - 0.06 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[6] - 0.3127) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[7] - 0.3290) < P_GAIN_APPLICATION_SPACE_CHROMATICITY ) {
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[0] - 0.68 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[1] - 0.32 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[2] - 0.265 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[3] - 0.69 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[4] - 0.15 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[5] - 0.06 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[6] - 0.3127) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[7] - 0.3290) < P_GAIN_APPLICATION_SPACE_CHROMATICITY ) {
elm.gain_application_space_chromaticities_mode = 1;
} else if (
abs(cvt.hatm.gainApplicationSpaceChromaticities[0] - 0.708 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[1] - 0.292 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[2] - 0.17 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[3] - 0.797 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[4] - 0.131 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[5] - 0.046 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[6] - 0.3127) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
abs(cvt.hatm.gainApplicationSpaceChromaticities[7] - 0.3290) < P_GAIN_APPLICATION_SPACE_CHROMATICITY){
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[0] - 0.708 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[1] - 0.292 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[2] - 0.17 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[3] - 0.797 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[4] - 0.131 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[5] - 0.046 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[6] - 0.3127) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[7] - 0.3290) < P_GAIN_APPLICATION_SPACE_CHROMATICITY){
elm.gain_application_space_chromaticities_mode = 2;
} else {
elm.gain_application_space_chromaticities_mode = 3;
Expand Down Expand Up @@ -601,28 +601,28 @@ void SMPTE_ST2094_50::convertMetadataItemsToSyntaxElements(){
}
// Component mixing
if (
abs(cvt.hatm.cgf[iAlt].cm.componentMixRed ) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixGreen ) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixBlue ) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixMax- 1.0 ) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixMin ) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixComponent) < P_COMPONENT_MIXING_COEFFICIENT){
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixRed ) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixGreen ) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixBlue ) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixMax- 1.0 ) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixMin ) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixComponent) < P_COMPONENT_MIXING_COEFFICIENT){
elm.component_mixing_type[iAlt] = 0;
} else if (
abs(cvt.hatm.cgf[iAlt].cm.componentMixRed ) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixGreen ) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixBlue ) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixMax ) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixMin ) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixComponent - 1.0 ) < P_COMPONENT_MIXING_COEFFICIENT){
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixRed ) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixGreen ) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixBlue ) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixMax ) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixMin ) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixComponent - 1.0 ) < P_COMPONENT_MIXING_COEFFICIENT){
elm.component_mixing_type[iAlt] = 1;
} else if (
abs(cvt.hatm.cgf[iAlt].cm.componentMixRed - (1.0 / 6.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixGreen - (1.0 / 6.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixBlue - (1.0 / 6.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixMax - (1.0 / 2.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixMin ) < P_COMPONENT_MIXING_COEFFICIENT &&
abs(cvt.hatm.cgf[iAlt].cm.componentMixComponent) < P_COMPONENT_MIXING_COEFFICIENT){
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixRed - (1.0 / 6.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixGreen - (1.0 / 6.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixBlue - (1.0 / 6.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixMax - (1.0 / 2.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixMin ) < P_COMPONENT_MIXING_COEFFICIENT &&
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixComponent) < P_COMPONENT_MIXING_COEFFICIENT){
elm.component_mixing_type[iAlt] = 2;
} else { // Send flag to true for each non-zero coefficient
elm.component_mixing_type[iAlt] = 3;
Expand Down Expand Up @@ -666,7 +666,7 @@ void SMPTE_ST2094_50::convertMetadataItemsToSyntaxElements(){
elm.has_common_curve_params_flag = false;
}

elm.gain_curve_control_points_y[iAlt][iCps] = uint16_t( abs( cvt.hatm.cgf[iAlt].gc.gainCurveControlPointY[iCps] ) * Q_GAIN_CURVE_CONTROL_POINT_Y + 0.5f);
elm.gain_curve_control_points_y[iAlt][iCps] = uint16_t( std::abs( cvt.hatm.cgf[iAlt].gc.gainCurveControlPointY[iCps] ) * Q_GAIN_CURVE_CONTROL_POINT_Y + 0.5f);
}
elm.gain_curve_use_pchip_slope_flag[iAlt] = !hasSlopeParameter[iAlt];
if (elm.gain_curve_use_pchip_slope_flag[0] != elm.gain_curve_use_pchip_slope_flag[iAlt]){
Expand Down
Loading