@@ -1211,10 +1211,11 @@ ISOGetHEVCNALUs(MP4Handle sampleEntryH, MP4Handle nalus, u32 extraction_mode)
12111211 err = sampleEntryHToAtomPtr (sampleEntryH , (MP4AtomPtr * )& entry , MP4VisualSampleEntryAtomType );
12121212 if (err ) goto bail ;
12131213
1214- if (entry -> type == MP4EncVisualSampleEntryAtomType || entry -> type == MP4RestrictedVideoSampleEntryAtomType )
1214+ if (entry -> type == MP4EncVisualSampleEntryAtomType ||
1215+ entry -> type == MP4RestrictedVideoSampleEntryAtomType )
12151216 {
12161217 u32 origFmt = 0 ;
1217- err = ISOGetOriginalFormat (sampleEntryH , & origFmt );
1218+ err = ISOGetOriginalFormat (sampleEntryH , & origFmt );
12181219 if (origFmt != ISOHEVCSampleEntryAtomType && origFmt != ISOLHEVCSampleEntryAtomType )
12191220 BAILWITHERROR (MP4BadParamErr );
12201221 }
@@ -1474,45 +1475,45 @@ MP4_EXTERN(MP4Err) ISOGetNALUnitLength(MP4Handle sampleEntryH, u32 *out)
14741475
14751476MP4_EXTERN (MP4Err ) ISOGetOriginalFormat (MP4Handle sampleEntryH , u32 * outOrigFmt )
14761477{
1477- MP4Err err = MP4NoErr ;
1478+ MP4Err err = MP4NoErr ;
14781479 MP4AtomPtr entry = NULL ;
14791480 MP4OriginalFormatAtomPtr fmt ;
14801481
14811482 err = sampleEntryHToAtomPtr (sampleEntryH , & entry , MP4VisualSampleEntryAtomType );
1482- if (err ) goto bail ;
1483+ if (err ) goto bail ;
14831484
1484- switch (entry -> type )
1485+ switch (entry -> type )
14851486 {
1486- case MP4RestrictedVideoSampleEntryAtomType :
1487- {
1488- MP4RestrictedSchemeInfoAtomPtr rinf = NULL ;
1489- MP4RestrictedVideoSampleEntryAtomPtr resv = (MP4RestrictedVideoSampleEntryAtomPtr )entry ;
1487+ case MP4RestrictedVideoSampleEntryAtomType :
1488+ {
1489+ MP4RestrictedSchemeInfoAtomPtr rinf = NULL ;
1490+ MP4RestrictedVideoSampleEntryAtomPtr resv = (MP4RestrictedVideoSampleEntryAtomPtr )entry ;
14901491
1491- err = resv -> getRinf ((MP4AtomPtr )resv , (MP4AtomPtr * )& rinf );
1492- if (err || !rinf ) BAILWITHERROR (MP4BadParamErr );
1492+ err = resv -> getRinf ((MP4AtomPtr )resv , (MP4AtomPtr * )& rinf );
1493+ if (err || !rinf ) BAILWITHERROR (MP4BadParamErr );
14931494
1494- fmt = (MP4OriginalFormatAtomPtr )rinf -> MP4OriginalFormat ;
1495- break ;
1496- }
1495+ fmt = (MP4OriginalFormatAtomPtr )rinf -> MP4OriginalFormat ;
1496+ break ;
1497+ }
14971498
1498- case MP4EncVisualSampleEntryAtomType :
1499- {
1500- MP4EncVisualSampleEntryAtomPtr encv = (MP4EncVisualSampleEntryAtomPtr )entry ;
1501- MP4SecurityInfoAtomPtr sinf = (MP4SecurityInfoAtomPtr )encv -> SecurityInfo ;
1499+ case MP4EncVisualSampleEntryAtomType :
1500+ {
1501+ MP4EncVisualSampleEntryAtomPtr encv = (MP4EncVisualSampleEntryAtomPtr )entry ;
1502+ MP4SecurityInfoAtomPtr sinf = (MP4SecurityInfoAtomPtr )encv -> SecurityInfo ;
15021503
1503- if (!sinf ) BAILWITHERROR (MP4BadParamErr );
1504- fmt = (MP4OriginalFormatAtomPtr )sinf -> MP4OriginalFormat ;
1505- break ;
1506- }
1504+ if (!sinf ) BAILWITHERROR (MP4BadParamErr );
1505+ fmt = (MP4OriginalFormatAtomPtr )sinf -> MP4OriginalFormat ;
1506+ break ;
1507+ }
15071508
1508- default :
1509- BAILWITHERROR (MP4BadParamErr );
1509+ default :
1510+ BAILWITHERROR (MP4BadParamErr );
15101511 }
15111512
1512- if (!fmt ) BAILWITHERROR (MP4BadParamErr );
1513+ if (!fmt ) BAILWITHERROR (MP4BadParamErr );
15131514
15141515 * outOrigFmt = fmt -> original_format ;
1515-
1516+
15161517bail :
15171518 if (entry ) entry -> destroy ((MP4AtomPtr )entry );
15181519 return err ;
0 commit comments