diff --git a/IsoLib/libisomediafile/src/MP4Atoms.h b/IsoLib/libisomediafile/src/MP4Atoms.h index 578683b..818e905 100644 --- a/IsoLib/libisomediafile/src/MP4Atoms.h +++ b/IsoLib/libisomediafile/src/MP4Atoms.h @@ -1225,8 +1225,9 @@ typedef struct MP4SubSampleInformationAtom u32 subsample_count, MP4Handle subsample_size_array, MP4Handle subsample_priority_array, MP4Handle subsample_discardable_array); MP4Err (*addEntry2)(struct MP4SubSampleInformationAtom *self, u32 sample_delta, - u32 subsample_count, MP4Handle subsample_size_array, - MP4Handle subsample_priority_array, MP4Handle subsample_discardable_array, MP4Handle codec_specific_parameters_array); + u32 subsample_count, MP4Handle subsample_size_array, + MP4Handle subsample_priority_array, MP4Handle subsample_discardable_array, + MP4Handle codec_specific_parameters_array); u32 entry_count; u32 *sample_delta; u32 *subsample_count; diff --git a/IsoLib/libisomediafile/src/MP4Movies.h b/IsoLib/libisomediafile/src/MP4Movies.h index 0d7d3e1..34ddb46 100644 --- a/IsoLib/libisomediafile/src/MP4Movies.h +++ b/IsoLib/libisomediafile/src/MP4Movies.h @@ -694,7 +694,8 @@ extern "C" MP4Handle subsample_priority_array, MP4Handle subsample_discardable_array); /** - * @brief Same as MP4AddSubSampleInformationEntry but also allows to add the codec specific parameters + * @brief Same as MP4AddSubSampleInformationEntry but also allows to add the codec specific + * parameters * * @param subsample * @param sample_delta @@ -707,10 +708,10 @@ extern "C" */ MP4_EXTERN(MP4Err) MP4AddSubSampleInformationEntry2(MP4GenericAtom subsample, u32 sample_delta, u32 subsample_count, - MP4Handle subsample_size_array, - MP4Handle subsample_priority_array, - MP4Handle subsample_discardable_array, - MP4Handle codec_specific_parameters_array); + MP4Handle subsample_size_array, + MP4Handle subsample_priority_array, + MP4Handle subsample_discardable_array, + MP4Handle codec_specific_parameters_array); /** * @brief Add track to a track group ID. * diff --git a/IsoLib/libisomediafile/src/MovieTracks.c b/IsoLib/libisomediafile/src/MovieTracks.c index 60ab137..7b3f2fe 100644 --- a/IsoLib/libisomediafile/src/MovieTracks.c +++ b/IsoLib/libisomediafile/src/MovieTracks.c @@ -325,9 +325,9 @@ MP4AddSubSampleInformationEntry(MP4GenericAtom subsample, u32 sample_delta, u32 MP4_EXTERN(MP4Err) MP4AddSubSampleInformationEntry2(MP4GenericAtom subsample, u32 sample_delta, u32 subsample_count, - MP4Handle subsample_size_array, MP4Handle subsample_priority_array, - MP4Handle subsample_discardable_array, - MP4Handle codec_specific_parameters_array) + MP4Handle subsample_size_array, MP4Handle subsample_priority_array, + MP4Handle subsample_discardable_array, + MP4Handle codec_specific_parameters_array) { MP4Err err; MP4SubSampleInformationAtomPtr subs; @@ -337,7 +337,8 @@ MP4AddSubSampleInformationEntry2(MP4GenericAtom subsample, u32 sample_delta, u32 subs = (MP4SubSampleInformationAtomPtr)subsample; err = subs->addEntry2(subs, sample_delta, subsample_count, subsample_size_array, - subsample_priority_array, subsample_discardable_array, codec_specific_parameters_array); + subsample_priority_array, subsample_discardable_array, + codec_specific_parameters_array); bail: TEST_RETURN(err); diff --git a/IsoLib/libisomediafile/src/SubSampleInformationAtom.c b/IsoLib/libisomediafile/src/SubSampleInformationAtom.c index 8933ea0..2e430f0 100644 --- a/IsoLib/libisomediafile/src/SubSampleInformationAtom.c +++ b/IsoLib/libisomediafile/src/SubSampleInformationAtom.c @@ -179,8 +179,9 @@ static MP4Err addEntry(MP4SubSampleInformationAtom *s, u32 sample_delta, u32 sub } static MP4Err addEntry2(MP4SubSampleInformationAtom *s, u32 sample_delta, u32 subsample_count, - MP4Handle subsample_size_array, MP4Handle subsample_priority_array, - MP4Handle subsample_discardable_array, MP4Handle codec_specific_parameters_array) + MP4Handle subsample_size_array, MP4Handle subsample_priority_array, + MP4Handle subsample_discardable_array, + MP4Handle codec_specific_parameters_array) { MP4Err err; MP4SubSampleInformationAtomPtr self; @@ -230,10 +231,11 @@ static MP4Err addEntry2(MP4SubSampleInformationAtom *s, u32 sample_delta, u32 su { self->version = 1; } - self->subsample_size[current_entry][i] = ((u32 *)*subsample_size_array)[i]; - self->subsample_priority[current_entry][i] = ((u32 *)*subsample_priority_array)[i]; - self->discardable[current_entry][i] = ((u32 *)*subsample_discardable_array)[i]; - self->codec_specific_parameters[current_entry][i] = ((u32 *)*codec_specific_parameters_array)[i]; + self->subsample_size[current_entry][i] = ((u32 *)*subsample_size_array)[i]; + self->subsample_priority[current_entry][i] = ((u32 *)*subsample_priority_array)[i]; + self->discardable[current_entry][i] = ((u32 *)*subsample_discardable_array)[i]; + self->codec_specific_parameters[current_entry][i] = + ((u32 *)*codec_specific_parameters_array)[i]; } self->entry_count++;