lavfi: move AVFilterLink.frame_wanted_out to FilterLinkInternal

Anton Khirnov committed 2 years ago

Commit fb3efef1 parent 42cbf666 files · +25 −21Browse files

Showing the changes to libavfilter (6 of 6 files). Show all

Unified · Split

6 files

libavfilter/avfilter.c +14 −8
libavfilter/avfilter.h +0 −7
libavfilter/avfilter_internal.h +7 −0
libavfilter/avfiltergraph.c +1 −1
libavfilter/buffersink.c +2 −1
libavfilter/filters.h +1 −4

     av_assert0(!li->status_in);
     li->status_in = status;
     li->status_in_pts = pts;
-    link->frame_wanted_out = 0;
+    li->frame_wanted_out = 0;
     li->frame_blocked_in = 0;
     filter_unblock(link->dst);
     ff_filter_set_ready(link->dst, 200);
 {
     FilterLinkInternal * const li = ff_link_internal(link);
-    av_assert0(!link->frame_wanted_out);
+    av_assert0(!li->frame_wanted_out);
     av_assert0(!li->status_out);
     li->status_out = status;
     if (pts != AV_NOPTS_VALUE)
         return li->status_out;
     if (li->status_in) {
         if (ff_framequeue_queued_frames(&li->fifo)) {
-            av_assert1(!link->frame_wanted_out);
+            av_assert1(!li->frame_wanted_out);
             av_assert1(link->dst->ready >= 300);
             return 0;
         } else {
             return li->status_out;
         }
     }
-    link->frame_wanted_out = 1;
+    li->frame_wanted_out = 1;
     ff_filter_set_ready(link->src, 100);
     return 0;
 }
                                        link->time_base);
     }
-    li->frame_blocked_in = link->frame_wanted_out = 0;
+    li->frame_blocked_in = li->frame_wanted_out = 0;
     li->l.frame_count_in++;
     li->l.sample_count_in += frame->nb_samples;
     filter_unblock(link->dst);
     }
     for (i = 0; i < filter->nb_outputs; i++) {
         FilterLinkInternal * const li = ff_link_internal(filter->outputs[i]);
-        if (filter->outputs[i]->frame_wanted_out &&
+        if (li->frame_wanted_out &&
             !li->frame_blocked_in) {
             return ff_request_frame_to_filter(filter->outputs[i]);
         }
     av_unused FilterLinkInternal *li = ff_link_internal(link);
     av_assert1(!li->status_in);
     av_assert1(!li->status_out);
-    link->frame_wanted_out = 1;
+    li->frame_wanted_out = 1;
     ff_filter_set_ready(link->src, 100);
 }
     FilterLinkInternal * const li = ff_link_internal(link);
     if (li->status_out)
         return;
-    link->frame_wanted_out = 0;
+    li->frame_wanted_out = 0;
     li->frame_blocked_in = 0;
     link_set_out_status(link, status, AV_NOPTS_VALUE);
     while (ff_framequeue_queued_frames(&li->fifo)) {
     return 0;
 }
+int ff_outlink_frame_wanted(AVFilterLink *link)
+{
+    FilterLinkInternal * const li = ff_link_internal(link);
+    return li->frame_wanted_out;
+}

libavfilter/avfilter.h+0−7

@@ -599,13 +599,6 @@ struct AVFilterLink { · 598 unmodified lines
599	* Graph the filter belongs to.	599	* Graph the filter belongs to.
600	*/	600	*/
601	struct AVFilterGraph *graph;	601	struct AVFilterGraph *graph;
602
603	/**
604	* True if a frame is currently wanted on the output of this filter.
605	* Set when ff_request_frame() is called by the output,
606	* cleared when a frame is filtered.
607	*/
608	int frame_wanted_out;
609	};	602	};
610		603
611	/**	604	/**

libavfilter/avfilter_internal.h+7−0

@@ -67,6 +67,13 @@ typedef struct FilterLinkInternal { · 66 unmodified lines
67	*/	67	*/
68	int status_out;	68	int status_out;
69		69
		70	/**
		71	* True if a frame is currently wanted on the output of this filter.
		72	* Set when ff_request_frame() is called by the output,
		73	* cleared when a frame is filtered.
		74	*/
		75	int frame_wanted_out;
		76
70	/**	77	/**
71	* Index in the age array.	78	* Index in the age array.
72	*/	79	*/

libavfilter/avfiltergraph.c+1−1

@@ -1406,7 +1406,7 @@ int avfilter_graph_request_oldest(AVFilterGraph *graph) · 1405 unmodified lines
1406	while (frame_count == oldesti->l.frame_count_out) {	1406	while (frame_count == oldesti->l.frame_count_out) {
1407	r = ff_filter_graph_run_once(graph);	1407	r = ff_filter_graph_run_once(graph);
1408	if (r == AVERROR(EAGAIN) &&	1408	if (r == AVERROR(EAGAIN) &&
1409	!oldest->frame_wanted_out && !oldesti->frame_blocked_in &&	1409	!oldesti->frame_wanted_out && !oldesti->frame_blocked_in &&
1410	!oldesti->status_in)	1410	!oldesti->status_in)
1411	(void)ff_request_frame(oldest);	1411	(void)ff_request_frame(oldest);
1412	else if (r < 0)	1412	else if (r < 0)

libavfilter/buffersink.c+2−1

 {
     BufferSinkContext *buf = ctx->priv;
     AVFilterLink *inlink = ctx->inputs[0];
+    FilterLinkInternal *li = ff_link_internal(inlink);
     int status, ret;
     AVFrame *cur_frame;
     int64_t pts;
             return status;
         } else if ((flags & AV_BUFFERSINK_FLAG_NO_REQUEST)) {
             return AVERROR(EAGAIN);
-        } else if (inlink->frame_wanted_out) {
+        } else if (li->frame_wanted_out) {
             ret = ff_filter_graph_run_once(ctx->graph);
             if (ret < 0)
                 return ret;

libavfilter/filters.h+1−4

 /**
  * Test if a frame is wanted on an output link.
  */
-static inline int ff_outlink_frame_wanted(AVFilterLink *link)
+int ff_outlink_frame_wanted(AVFilterLink *link);
-{
-    return link->frame_wanted_out;
-}
 /**
  * Get the status on an output link.

lavfi: move AVFilterLink.frame_wanted_out to FilterLinkInternal

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code