Skip to content

Commit 43b103f

Browse files
y-guyony-guyon
authored
Remove clang warnings (#66)
1 parent 45df3ed commit 43b103f

File tree

5 files changed

+59
-59
lines changed

5 files changed

+59
-59
lines changed

‎IsoLib/favs_example/src/hevc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ u8* stripNALEmulation(u8* buffer, u32* bufferLen) {
756756
return outBuffer;
757757
}
758758

759-
int parseHEVCNal(FILE* input, u8** data, int* data_len) {
759+
u32 parseHEVCNal(FILE* input, u8** data, u32* data_len) {
760760
size_t startPos;
761761
size_t NALStart = 0;
762762
size_t NALEnd = 0;

‎IsoLib/favs_example/src/hevc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ MP4Err hevc_parse_pps_minimal(BitBuffer *bb, struct hevc_pps* pps);
1313
MP4Err hevc_parse_slice_header_minimal(BitBuffer *bb, struct hevc_poc* poc, struct hevc_slice_header* header,
1414
struct hevc_sps* sps, struct hevc_pps* pps);
1515
u8* stripNALEmulation(u8* buffer, u32* bufferLen);
16-
int parseHEVCNal(FILE* input, u8** data, int* data_len);
16+
u32 parseHEVCNal(FILE* input, u8** data, u32* data_len);
1717
ISOErr analyze_hevc_stream(FILE* input, struct hevc_stream* stream);
1818

1919
#endif

‎IsoLib/ipmp_example/src/protectAudioMovie.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ MP4Err addIPMPToolDescriptorUpdateToODAccessUnit( MP4Handle odAccessUnitH,
7070
/
7171
/ main function
7272
/
73-
/*=====*/
73+
/ =====*/
7474

7575
int main( int argc, char **argv )
7676
{
@@ -100,7 +100,7 @@ int main( int argc, char **argv )
100100
/ protectMyAudioMovie
101101
/ Protect the audio media track using an IPMP Tool specified by its IPMP_ToolID
102102
/
103-
/*=====*/
103+
/ =====*/
104104

105105
MP4Err protectMyAudioMovie( char *inFilename, char *outFilename, u64 ipmpToolID )
106106
{
@@ -355,7 +355,7 @@ MP4Err protectMyAudioMovie( char *inFilename, char *outFilename, u64 ipmpToolID
355355
/ associateSampleDescWithIPMPToolPtr
356356
/ Create the IPMP_ToolDecriptorPointer and add it to the media Sample Description
357357
/
358-
/*=====*/
358+
/ =====*/
359359

360360
MP4Err associateSampleDescWithIPMPToolPtr( MP4Handle outMediaSampleDescrH,
361361
u16 theIPMP_ToolDescriptorID) {
@@ -384,7 +384,7 @@ MP4Err associateSampleDescWithIPMPToolPtr( MP4Handle outMediaSampleDescrH,
384384
/ addIPMPToolDescriptorUpdateToODAccessUnit
385385
/ Create the IPMP_ToolDecriptorUpdate command and add it to an OD access unit
386386
/
387-
/*=====*/
387+
/ =====*/
388388

389389
MP4Err addIPMPToolDescriptorUpdateToODAccessUnit( MP4Handle odAccessUnitH,
390390
u16 ipmpToolDescriptorId,
@@ -437,7 +437,7 @@ MP4Err addIPMPToolDescriptorUpdateToODAccessUnit( MP4Handle odAccessUnitH,
437437
/ protectSample
438438
/ Protect one media access unit (or sample)
439439
/
440-
/*=====*/
440+
/ =====*/
441441

442442
MP4Err protectSample(MP4Handle sampleH, u64 ipmpToolID) {
443443

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

457457
MP4Err putToolListInIOD( MP4Movie theMovie, u64 theIpmpToolID) {
458458

‎IsoLib/isoiff_tool/src/HEVCDecoderConfigRecord.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -334,13 +334,13 @@ MP4Err ISOIFF_CreateHEVCDecConfRecFromHandle(MP4Handle recordDataHandle,
334334
// buffer += 4;
335335
memcpy(&tmp8, buffer, 1);
336336
buffer += 1;
337-
hevcDecConfRec->general_profile_compatibility_flags = (tmp8 << 24);
337+
hevcDecConfRec->general_profile_compatibility_flags = ((u64)tmp8 << 24);
338338
memcpy(&tmp8, buffer, 1);
339339
buffer += 1;
340-
hevcDecConfRec->general_profile_compatibility_flags |= (tmp8 << 16);
340+
hevcDecConfRec->general_profile_compatibility_flags |= ((u64)tmp8 << 16);
341341
memcpy(&tmp8, buffer, 1);
342342
buffer += 1;
343-
hevcDecConfRec->general_profile_compatibility_flags |= (tmp8 << 8);
343+
hevcDecConfRec->general_profile_compatibility_flags |= ((u64)tmp8 << 8);
344344
memcpy(&tmp8, buffer, 1);
345345
buffer += 1;
346346
hevcDecConfRec->general_profile_compatibility_flags |= tmp8;
@@ -350,19 +350,19 @@ MP4Err ISOIFF_CreateHEVCDecConfRecFromHandle(MP4Handle recordDataHandle,
350350
// hevcDecConfRec->general_constraint_indicator_flags = tmp64 >> 16;
351351
memcpy(&tmp8, buffer, 1);
352352
buffer += 1;
353-
hevcDecConfRec->general_constraint_indicator_flags = tmp8 << 40;
353+
hevcDecConfRec->general_constraint_indicator_flags = (u64)tmp8 << 40;
354354
memcpy(&tmp8, buffer, 1);
355355
buffer += 1;
356-
hevcDecConfRec->general_constraint_indicator_flags |= (tmp8 << 32);
356+
hevcDecConfRec->general_constraint_indicator_flags |= ((u64)tmp8 << 32);
357357
memcpy(&tmp8, buffer, 1);
358358
buffer += 1;
359-
hevcDecConfRec->general_constraint_indicator_flags |= (tmp8 << 24);
359+
hevcDecConfRec->general_constraint_indicator_flags |= ((u64)tmp8 << 24);
360360
memcpy(&tmp8, buffer, 1);
361361
buffer += 1;
362-
hevcDecConfRec->general_constraint_indicator_flags |= (tmp8 << 16);
362+
hevcDecConfRec->general_constraint_indicator_flags |= ((u64)tmp8 << 16);
363363
memcpy(&tmp8, buffer, 1);
364364
buffer += 1;
365-
hevcDecConfRec->general_constraint_indicator_flags |= (tmp8 << 8);
365+
hevcDecConfRec->general_constraint_indicator_flags |= ((u64)tmp8 << 8);
366366
memcpy(&tmp8, buffer, 1);
367367
buffer += 1;
368368
hevcDecConfRec->general_constraint_indicator_flags |= tmp8;

‎IsoLib/t35_tool/sources/SMPTE_ST2094_50.cpp‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -544,35 +544,35 @@ void SMPTE_ST2094_50::convertMetadataItemsToSyntaxElements(){
544544

545545
// Check if the primary combination is known
546546
if (
547-
abs(cvt.hatm.gainApplicationSpaceChromaticities[0] - 0.64 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
548-
abs(cvt.hatm.gainApplicationSpaceChromaticities[1] - 0.33 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
549-
abs(cvt.hatm.gainApplicationSpaceChromaticities[2] - 0.30 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
550-
abs(cvt.hatm.gainApplicationSpaceChromaticities[3] - 0.60 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
551-
abs(cvt.hatm.gainApplicationSpaceChromaticities[4] - 0.15 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
552-
abs(cvt.hatm.gainApplicationSpaceChromaticities[5] - 0.06 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
553-
abs(cvt.hatm.gainApplicationSpaceChromaticities[6] - 0.3127) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
554-
abs(cvt.hatm.gainApplicationSpaceChromaticities[7] - 0.3290) < P_GAIN_APPLICATION_SPACE_CHROMATICITY){
547+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[0] - 0.64 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
548+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[1] - 0.33 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
549+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[2] - 0.30 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
550+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[3] - 0.60 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
551+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[4] - 0.15 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
552+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[5] - 0.06 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
553+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[6] - 0.3127) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
554+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[7] - 0.3290) < P_GAIN_APPLICATION_SPACE_CHROMATICITY){
555555
elm.gain_application_space_chromaticities_mode = 0;
556556
}
557557
else if (
558-
abs(cvt.hatm.gainApplicationSpaceChromaticities[0] - 0.68 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
559-
abs(cvt.hatm.gainApplicationSpaceChromaticities[1] - 0.32 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
560-
abs(cvt.hatm.gainApplicationSpaceChromaticities[2] - 0.265 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
561-
abs(cvt.hatm.gainApplicationSpaceChromaticities[3] - 0.69 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
562-
abs(cvt.hatm.gainApplicationSpaceChromaticities[4] - 0.15 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
563-
abs(cvt.hatm.gainApplicationSpaceChromaticities[5] - 0.06 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
564-
abs(cvt.hatm.gainApplicationSpaceChromaticities[6] - 0.3127) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
565-
abs(cvt.hatm.gainApplicationSpaceChromaticities[7] - 0.3290) < P_GAIN_APPLICATION_SPACE_CHROMATICITY ) {
558+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[0] - 0.68 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
559+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[1] - 0.32 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
560+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[2] - 0.265 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
561+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[3] - 0.69 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
562+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[4] - 0.15 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
563+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[5] - 0.06 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
564+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[6] - 0.3127) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
565+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[7] - 0.3290) < P_GAIN_APPLICATION_SPACE_CHROMATICITY ) {
566566
elm.gain_application_space_chromaticities_mode = 1;
567567
} else if (
568-
abs(cvt.hatm.gainApplicationSpaceChromaticities[0] - 0.708 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
569-
abs(cvt.hatm.gainApplicationSpaceChromaticities[1] - 0.292 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
570-
abs(cvt.hatm.gainApplicationSpaceChromaticities[2] - 0.17 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
571-
abs(cvt.hatm.gainApplicationSpaceChromaticities[3] - 0.797 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
572-
abs(cvt.hatm.gainApplicationSpaceChromaticities[4] - 0.131 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
573-
abs(cvt.hatm.gainApplicationSpaceChromaticities[5] - 0.046 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
574-
abs(cvt.hatm.gainApplicationSpaceChromaticities[6] - 0.3127) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
575-
abs(cvt.hatm.gainApplicationSpaceChromaticities[7] - 0.3290) < P_GAIN_APPLICATION_SPACE_CHROMATICITY){
568+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[0] - 0.708 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
569+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[1] - 0.292 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
570+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[2] - 0.17 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
571+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[3] - 0.797 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
572+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[4] - 0.131 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
573+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[5] - 0.046 ) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
574+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[6] - 0.3127) < P_GAIN_APPLICATION_SPACE_CHROMATICITY &&
575+
std::abs(cvt.hatm.gainApplicationSpaceChromaticities[7] - 0.3290) < P_GAIN_APPLICATION_SPACE_CHROMATICITY){
576576
elm.gain_application_space_chromaticities_mode = 2;
577577
} else {
578578
elm.gain_application_space_chromaticities_mode = 3;
@@ -601,28 +601,28 @@ void SMPTE_ST2094_50::convertMetadataItemsToSyntaxElements(){
601601
}
602602
// Component mixing
603603
if (
604-
abs(cvt.hatm.cgf[iAlt].cm.componentMixRed ) < P_COMPONENT_MIXING_COEFFICIENT &&
605-
abs(cvt.hatm.cgf[iAlt].cm.componentMixGreen ) < P_COMPONENT_MIXING_COEFFICIENT &&
606-
abs(cvt.hatm.cgf[iAlt].cm.componentMixBlue ) < P_COMPONENT_MIXING_COEFFICIENT &&
607-
abs(cvt.hatm.cgf[iAlt].cm.componentMixMax- 1.0 ) < P_COMPONENT_MIXING_COEFFICIENT &&
608-
abs(cvt.hatm.cgf[iAlt].cm.componentMixMin ) < P_COMPONENT_MIXING_COEFFICIENT &&
609-
abs(cvt.hatm.cgf[iAlt].cm.componentMixComponent) < P_COMPONENT_MIXING_COEFFICIENT){
604+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixRed ) < P_COMPONENT_MIXING_COEFFICIENT &&
605+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixGreen ) < P_COMPONENT_MIXING_COEFFICIENT &&
606+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixBlue ) < P_COMPONENT_MIXING_COEFFICIENT &&
607+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixMax- 1.0 ) < P_COMPONENT_MIXING_COEFFICIENT &&
608+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixMin ) < P_COMPONENT_MIXING_COEFFICIENT &&
609+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixComponent) < P_COMPONENT_MIXING_COEFFICIENT){
610610
elm.component_mixing_type[iAlt] = 0;
611611
} else if (
612-
abs(cvt.hatm.cgf[iAlt].cm.componentMixRed ) < P_COMPONENT_MIXING_COEFFICIENT &&
613-
abs(cvt.hatm.cgf[iAlt].cm.componentMixGreen ) < P_COMPONENT_MIXING_COEFFICIENT &&
614-
abs(cvt.hatm.cgf[iAlt].cm.componentMixBlue ) < P_COMPONENT_MIXING_COEFFICIENT &&
615-
abs(cvt.hatm.cgf[iAlt].cm.componentMixMax ) < P_COMPONENT_MIXING_COEFFICIENT &&
616-
abs(cvt.hatm.cgf[iAlt].cm.componentMixMin ) < P_COMPONENT_MIXING_COEFFICIENT &&
617-
abs(cvt.hatm.cgf[iAlt].cm.componentMixComponent - 1.0 ) < P_COMPONENT_MIXING_COEFFICIENT){
612+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixRed ) < P_COMPONENT_MIXING_COEFFICIENT &&
613+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixGreen ) < P_COMPONENT_MIXING_COEFFICIENT &&
614+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixBlue ) < P_COMPONENT_MIXING_COEFFICIENT &&
615+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixMax ) < P_COMPONENT_MIXING_COEFFICIENT &&
616+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixMin ) < P_COMPONENT_MIXING_COEFFICIENT &&
617+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixComponent - 1.0 ) < P_COMPONENT_MIXING_COEFFICIENT){
618618
elm.component_mixing_type[iAlt] = 1;
619619
} else if (
620-
abs(cvt.hatm.cgf[iAlt].cm.componentMixRed - (1.0 / 6.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
621-
abs(cvt.hatm.cgf[iAlt].cm.componentMixGreen - (1.0 / 6.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
622-
abs(cvt.hatm.cgf[iAlt].cm.componentMixBlue - (1.0 / 6.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
623-
abs(cvt.hatm.cgf[iAlt].cm.componentMixMax - (1.0 / 2.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
624-
abs(cvt.hatm.cgf[iAlt].cm.componentMixMin ) < P_COMPONENT_MIXING_COEFFICIENT &&
625-
abs(cvt.hatm.cgf[iAlt].cm.componentMixComponent) < P_COMPONENT_MIXING_COEFFICIENT){
620+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixRed - (1.0 / 6.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
621+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixGreen - (1.0 / 6.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
622+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixBlue - (1.0 / 6.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
623+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixMax - (1.0 / 2.0)) < P_COMPONENT_MIXING_COEFFICIENT &&
624+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixMin ) < P_COMPONENT_MIXING_COEFFICIENT &&
625+
std::abs(cvt.hatm.cgf[iAlt].cm.componentMixComponent) < P_COMPONENT_MIXING_COEFFICIENT){
626626
elm.component_mixing_type[iAlt] = 2;
627627
} else { // Send flag to true for each non-zero coefficient
628628
elm.component_mixing_type[iAlt] = 3;
@@ -666,7 +666,7 @@ void SMPTE_ST2094_50::convertMetadataItemsToSyntaxElements(){
666666
elm.has_common_curve_params_flag = false;
667667
}
668668

669-
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);
669+
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);
670670
}
671671
elm.gain_curve_use_pchip_slope_flag[iAlt] = !hasSlopeParameter[iAlt];
672672
if (elm.gain_curve_use_pchip_slope_flag[0] != elm.gain_curve_use_pchip_slope_flag[iAlt]){

0 commit comments

Comments
 (0)