Message ID | 20230901203828.275197-6-jeebjp@gmail.com |
---|---|
State | New |
Headers | show |
Series | encoder AVCodecContext configuration side data | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
On 9/1/23 16:38, Jan Ekström wrote: > This will make it possible to reuse logic in further commits. > --- > libavutil/frame.c | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/libavutil/frame.c b/libavutil/frame.c > index 9eff851d64..0b1a8e5244 100644 > --- a/libavutil/frame.c > +++ b/libavutil/frame.c > @@ -95,6 +95,21 @@ void av_frame_side_data_set_uninit(AVFrameSideDataSet *set) > wipe_side_data(&set->sd, &set->nb_sd); > } > > +static void remove_side_data(AVFrameSideData ***sd, int *nb_side_data, > + const enum AVFrameSideDataType type) > +{ > + for (int i = *nb_side_data - 1; i >= 0; i--) { > + AVFrameSideData *entry = ((*sd)[i]); > + if (entry->type != type) > + continue; > + > + free_side_data(&entry); > + > + ((*sd)[i]) = ((*sd)[*nb_side_data - 1]); > + (*nb_side_data)--; > + } > +} > + Do we need AVFrameSideData ***sd here? It looks like **sd will suffice, as sd[i] = foo will still modify the original. > AVFrame *av_frame_alloc(void) > { > AVFrame *frame = av_malloc(sizeof(*frame)); > @@ -945,14 +960,7 @@ FF_ENABLE_DEPRECATION_WARNINGS > > void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type) > { > - for (int i = frame->nb_side_data - 1; i >= 0; i--) { > - AVFrameSideData *sd = frame->side_data[i]; > - if (sd->type == type) { > - free_side_data(&frame->side_data[i]); > - frame->side_data[i] = frame->side_data[frame->nb_side_data - 1]; > - frame->nb_side_data--; > - } > - } > + remove_side_data(&frame->side_data, &frame->nb_side_data, type); > } > > const char *av_frame_side_data_name(enum AVFrameSideDataType type)
diff --git a/libavutil/frame.c b/libavutil/frame.c index 9eff851d64..0b1a8e5244 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -95,6 +95,21 @@ void av_frame_side_data_set_uninit(AVFrameSideDataSet *set) wipe_side_data(&set->sd, &set->nb_sd); } +static void remove_side_data(AVFrameSideData ***sd, int *nb_side_data, + const enum AVFrameSideDataType type) +{ + for (int i = *nb_side_data - 1; i >= 0; i--) { + AVFrameSideData *entry = ((*sd)[i]); + if (entry->type != type) + continue; + + free_side_data(&entry); + + ((*sd)[i]) = ((*sd)[*nb_side_data - 1]); + (*nb_side_data)--; + } +} + AVFrame *av_frame_alloc(void) { AVFrame *frame = av_malloc(sizeof(*frame)); @@ -945,14 +960,7 @@ FF_ENABLE_DEPRECATION_WARNINGS void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type) { - for (int i = frame->nb_side_data - 1; i >= 0; i--) { - AVFrameSideData *sd = frame->side_data[i]; - if (sd->type == type) { - free_side_data(&frame->side_data[i]); - frame->side_data[i] = frame->side_data[frame->nb_side_data - 1]; - frame->nb_side_data--; - } - } + remove_side_data(&frame->side_data, &frame->nb_side_data, type); } const char *av_frame_side_data_name(enum AVFrameSideDataType type)