Skip to content

Commit

Permalink
clangformat
Browse files Browse the repository at this point in the history
  • Loading branch information
podborski committed Nov 11, 2023
1 parent b098222 commit da4ce1b
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 17 deletions.
5 changes: 3 additions & 2 deletions IsoLib/libisomediafile/src/MP4Atoms.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 6 additions & 5 deletions IsoLib/libisomediafile/src/MP4Movies.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
*
Expand Down
9 changes: 5 additions & 4 deletions IsoLib/libisomediafile/src/MovieTracks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
14 changes: 8 additions & 6 deletions IsoLib/libisomediafile/src/SubSampleInformationAtom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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++;
Expand Down

0 comments on commit da4ce1b

Please sign in to comment.