mirror of https://git.ffmpeg.org/ffmpeg.git
fftools/ffmpeg: move freeing a filtergraph into a separate function
This commit is contained in:
parent
eb9ce9de3b
commit
cc7a8ddf56
|
@ -487,51 +487,15 @@ const AVIOInterruptCB int_cb = { decode_interrupt_cb, NULL };
|
||||||
|
|
||||||
static void ffmpeg_cleanup(int ret)
|
static void ffmpeg_cleanup(int ret)
|
||||||
{
|
{
|
||||||
int i, j;
|
int i;
|
||||||
|
|
||||||
if (do_benchmark) {
|
if (do_benchmark) {
|
||||||
int maxrss = getmaxrss() / 1024;
|
int maxrss = getmaxrss() / 1024;
|
||||||
av_log(NULL, AV_LOG_INFO, "bench: maxrss=%ikB\n", maxrss);
|
av_log(NULL, AV_LOG_INFO, "bench: maxrss=%ikB\n", maxrss);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < nb_filtergraphs; i++) {
|
for (i = 0; i < nb_filtergraphs; i++)
|
||||||
FilterGraph *fg = filtergraphs[i];
|
fg_free(&filtergraphs[i]);
|
||||||
avfilter_graph_free(&fg->graph);
|
|
||||||
for (j = 0; j < fg->nb_inputs; j++) {
|
|
||||||
InputFilter *ifilter = fg->inputs[j];
|
|
||||||
struct InputStream *ist = ifilter->ist;
|
|
||||||
|
|
||||||
if (ifilter->frame_queue) {
|
|
||||||
AVFrame *frame;
|
|
||||||
while (av_fifo_read(ifilter->frame_queue, &frame, 1) >= 0)
|
|
||||||
av_frame_free(&frame);
|
|
||||||
av_fifo_freep2(&ifilter->frame_queue);
|
|
||||||
}
|
|
||||||
av_freep(&ifilter->displaymatrix);
|
|
||||||
if (ist->sub2video.sub_queue) {
|
|
||||||
AVSubtitle sub;
|
|
||||||
while (av_fifo_read(ist->sub2video.sub_queue, &sub, 1) >= 0)
|
|
||||||
avsubtitle_free(&sub);
|
|
||||||
av_fifo_freep2(&ist->sub2video.sub_queue);
|
|
||||||
}
|
|
||||||
av_buffer_unref(&ifilter->hw_frames_ctx);
|
|
||||||
av_freep(&ifilter->name);
|
|
||||||
av_freep(&fg->inputs[j]);
|
|
||||||
}
|
|
||||||
av_freep(&fg->inputs);
|
|
||||||
for (j = 0; j < fg->nb_outputs; j++) {
|
|
||||||
OutputFilter *ofilter = fg->outputs[j];
|
|
||||||
|
|
||||||
avfilter_inout_free(&ofilter->out_tmp);
|
|
||||||
av_freep(&ofilter->name);
|
|
||||||
av_channel_layout_uninit(&ofilter->ch_layout);
|
|
||||||
av_freep(&fg->outputs[j]);
|
|
||||||
}
|
|
||||||
av_freep(&fg->outputs);
|
|
||||||
av_freep(&fg->graph_desc);
|
|
||||||
|
|
||||||
av_freep(&filtergraphs[i]);
|
|
||||||
}
|
|
||||||
av_freep(&filtergraphs);
|
av_freep(&filtergraphs);
|
||||||
|
|
||||||
/* close files */
|
/* close files */
|
||||||
|
|
|
@ -814,6 +814,8 @@ int ifilter_has_all_input_formats(FilterGraph *fg);
|
||||||
*/
|
*/
|
||||||
FilterGraph *fg_create(char *graph_desc);
|
FilterGraph *fg_create(char *graph_desc);
|
||||||
|
|
||||||
|
void fg_free(FilterGraph **pfg);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Perform a step of transcoding for the specified filter graph.
|
* Perform a step of transcoding for the specified filter graph.
|
||||||
*
|
*
|
||||||
|
|
|
@ -189,6 +189,50 @@ static OutputFilter *ofilter_alloc(FilterGraph *fg)
|
||||||
return ofilter;
|
return ofilter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void fg_free(FilterGraph **pfg)
|
||||||
|
{
|
||||||
|
FilterGraph *fg = *pfg;
|
||||||
|
|
||||||
|
if (!fg)
|
||||||
|
return;
|
||||||
|
|
||||||
|
avfilter_graph_free(&fg->graph);
|
||||||
|
for (int j = 0; j < fg->nb_inputs; j++) {
|
||||||
|
InputFilter *ifilter = fg->inputs[j];
|
||||||
|
struct InputStream *ist = ifilter->ist;
|
||||||
|
|
||||||
|
if (ifilter->frame_queue) {
|
||||||
|
AVFrame *frame;
|
||||||
|
while (av_fifo_read(ifilter->frame_queue, &frame, 1) >= 0)
|
||||||
|
av_frame_free(&frame);
|
||||||
|
av_fifo_freep2(&ifilter->frame_queue);
|
||||||
|
}
|
||||||
|
av_freep(&ifilter->displaymatrix);
|
||||||
|
if (ist->sub2video.sub_queue) {
|
||||||
|
AVSubtitle sub;
|
||||||
|
while (av_fifo_read(ist->sub2video.sub_queue, &sub, 1) >= 0)
|
||||||
|
avsubtitle_free(&sub);
|
||||||
|
av_fifo_freep2(&ist->sub2video.sub_queue);
|
||||||
|
}
|
||||||
|
av_buffer_unref(&ifilter->hw_frames_ctx);
|
||||||
|
av_freep(&ifilter->name);
|
||||||
|
av_freep(&fg->inputs[j]);
|
||||||
|
}
|
||||||
|
av_freep(&fg->inputs);
|
||||||
|
for (int j = 0; j < fg->nb_outputs; j++) {
|
||||||
|
OutputFilter *ofilter = fg->outputs[j];
|
||||||
|
|
||||||
|
avfilter_inout_free(&ofilter->out_tmp);
|
||||||
|
av_freep(&ofilter->name);
|
||||||
|
av_channel_layout_uninit(&ofilter->ch_layout);
|
||||||
|
av_freep(&fg->outputs[j]);
|
||||||
|
}
|
||||||
|
av_freep(&fg->outputs);
|
||||||
|
av_freep(&fg->graph_desc);
|
||||||
|
|
||||||
|
av_freep(pfg);
|
||||||
|
}
|
||||||
|
|
||||||
FilterGraph *fg_create(char *graph_desc)
|
FilterGraph *fg_create(char *graph_desc)
|
||||||
{
|
{
|
||||||
FilterGraph *fg;
|
FilterGraph *fg;
|
||||||
|
|
Loading…
Reference in New Issue