avfilter/avfilter: Move init_state to FilterLinkInternal

Andreas Rheinhardt committed 2 years ago

Commit 40b91ea1 parent 89eea4e3 files · +11 −10Browse files

Unified · Split

3 files

     for (i = 0; i < filter->nb_inputs; i ++) {
         AVFilterLink *link = filter->inputs[i];
         AVFilterLink *inlink;
+        FilterLinkInternal *li = ff_link_internal(link);
         if (!link) continue;
         if (!link->src || !link->dst) {
         link->current_pts =
         link->current_pts_us = AV_NOPTS_VALUE;
-        switch (link->init_state) {
+        switch (li->init_state) {
         case AVLINK_INIT:
             continue;
         case AVLINK_STARTINIT:
             av_log(filter, AV_LOG_INFO, "circular filter chain detected\n");
             return 0;
         case AVLINK_UNINIT:
-            link->init_state = AVLINK_STARTINIT;
+            li->init_state = AVLINK_STARTINIT;
             if ((ret = avfilter_config_links(link->src)) < 0)
                 return ret;
                     return ret;
                 }
-            link->init_state = AVLINK_INIT;
+            li->init_state = AVLINK_INIT;
         }
     }

@@ -611,13 +611,6 @@ struct AVFilterLink { · 610 unmodified lines
611	*/	611	*/
612	AVFilterFormatsConfig outcfg;	612	AVFilterFormatsConfig outcfg;
613		613
614	/** stage of the initialization of the link properties (dimensions, etc) */
615	enum {
616	AVLINK_UNINIT = 0, ///< not started
617	AVLINK_STARTINIT, ///< started, but incomplete
618	AVLINK_INIT ///< complete
619	} init_state;
620
621	/**	614	/**
622	* Graph the filter belongs to.	615	* Graph the filter belongs to.
623	*/	616	*/

@@ -63,6 +63,13 @@ typedef struct FilterLinkInternal { · 62 unmodified lines
63	* corresponding code.	63	* corresponding code.
64	*/	64	*/
65	int status_out;	65	int status_out;
		66
		67	/** stage of the initialization of the link properties (dimensions, etc) */
		68	enum {
		69	AVLINK_UNINIT = 0, ///< not started
		70	AVLINK_STARTINIT, ///< started, but incomplete
		71	AVLINK_INIT ///< complete
		72	} init_state;
66	} FilterLinkInternal;	73	} FilterLinkInternal;
67		74
68	static inline FilterLinkInternal ff_link_internal(AVFilterLink link)	75	static inline FilterLinkInternal ff_link_internal(AVFilterLink link)

Keyboard shortcuts