mirror of https://github.com/FFmpeg/FFmpeg.git
This commit moves the generic-layer stuff (that is not used
by filters) to a new header of its own, similarly to
5e7b5b0090 for libavcodec.
thread.h and link_internal.h are merged into this header.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
release/7.0
Andreas Rheinhardt
12 months ago
parent
db98b0e04e
commit
a272c9cffa
10 changed files with 132 additions and 154 deletions
@ -0,0 +1,126 @@ |
||||
/*
|
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
/*
|
||||
* APIs internal to the generic filter(graph) layer. |
||||
* |
||||
* MUST NOT be included by individual filters. |
||||
*/ |
||||
|
||||
#ifndef AVFILTER_AVFILTER_INTERNAL_H |
||||
#define AVFILTER_AVFILTER_INTERNAL_H |
||||
|
||||
#include <stdint.h> |
||||
|
||||
#include "avfilter.h" |
||||
#include "framequeue.h" |
||||
|
||||
typedef struct FilterLinkInternal { |
||||
AVFilterLink l; |
||||
|
||||
/**
|
||||
* Queue of frames waiting to be filtered. |
||||
*/ |
||||
FFFrameQueue fifo; |
||||
|
||||
/**
|
||||
* If set, the source filter can not generate a frame as is. |
||||
* The goal is to avoid repeatedly calling the request_frame() method on |
||||
* the same link. |
||||
*/ |
||||
int frame_blocked_in; |
||||
|
||||
/**
|
||||
* Link input status. |
||||
* If not zero, all attempts of filter_frame will fail with the |
||||
* corresponding code. |
||||
*/ |
||||
int status_in; |
||||
|
||||
/**
|
||||
* Timestamp of the input status change. |
||||
*/ |
||||
int64_t status_in_pts; |
||||
|
||||
/**
|
||||
* Link output status. |
||||
* If not zero, all attempts of request_frame will fail with the |
||||
* corresponding code. |
||||
*/ |
||||
int status_out; |
||||
} FilterLinkInternal; |
||||
|
||||
static inline FilterLinkInternal *ff_link_internal(AVFilterLink *link) |
||||
{ |
||||
return (FilterLinkInternal*)link; |
||||
} |
||||
|
||||
typedef struct AVFilterCommand { |
||||
double time; ///< time expressed in seconds
|
||||
char *command; ///< command
|
||||
char *arg; ///< optional argument for the command
|
||||
int flags; |
||||
struct AVFilterCommand *next; |
||||
} AVFilterCommand; |
||||
|
||||
struct AVFilterGraphInternal { |
||||
void *thread; |
||||
avfilter_execute_func *thread_execute; |
||||
FFFrameQueueGlobal frame_queues; |
||||
}; |
||||
|
||||
/**
|
||||
* Update the position of a link in the age heap. |
||||
*/ |
||||
void ff_avfilter_graph_update_heap(AVFilterGraph *graph, AVFilterLink *link); |
||||
|
||||
/**
|
||||
* Allocate a new filter context and return it. |
||||
* |
||||
* @param filter what filter to create an instance of |
||||
* @param inst_name name to give to the new filter context |
||||
* |
||||
* @return newly created filter context or NULL on failure |
||||
*/ |
||||
AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name); |
||||
|
||||
/**
|
||||
* Remove a filter from a graph; |
||||
*/ |
||||
void ff_filter_graph_remove_filter(AVFilterGraph *graph, AVFilterContext *filter); |
||||
|
||||
int ff_filter_activate(AVFilterContext *filter); |
||||
|
||||
/**
|
||||
* Parse filter options into a dictionary. |
||||
* |
||||
* @param logctx context for logging |
||||
* @param priv_class a filter's private class for shorthand options or NULL |
||||
* @param options dictionary to store parsed options in |
||||
* @param args options string to parse |
||||
* |
||||
* @return a non-negative number on success, a negative error code on failure |
||||
*/ |
||||
int ff_filter_opt_parse(void *logctx, const AVClass *priv_class, |
||||
AVDictionary **options, const char *args); |
||||
|
||||
int ff_graph_thread_init(AVFilterGraph *graph); |
||||
|
||||
void ff_graph_thread_free(AVFilterGraph *graph); |
||||
|
||||
#endif /* AVFILTER_AVFILTER_INTERNAL_H */ |
||||
@ -1,69 +0,0 @@ |
||||
/*
|
||||
* Internal filter link API |
||||
* |
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#ifndef AVFILTER_LINK_INTERNAL_H |
||||
#define AVFILTER_LINK_INTERNAL_H |
||||
|
||||
#include <stdint.h> |
||||
|
||||
#include "avfilter.h" |
||||
#include "framequeue.h" |
||||
|
||||
typedef struct FilterLinkInternal { |
||||
AVFilterLink l; |
||||
|
||||
/**
|
||||
* Queue of frames waiting to be filtered. |
||||
*/ |
||||
FFFrameQueue fifo; |
||||
|
||||
/**
|
||||
* If set, the source filter can not generate a frame as is. |
||||
* The goal is to avoid repeatedly calling the request_frame() method on |
||||
* the same link. |
||||
*/ |
||||
int frame_blocked_in; |
||||
|
||||
/**
|
||||
* Link input status. |
||||
* If not zero, all attempts of filter_frame will fail with the |
||||
* corresponding code. |
||||
*/ |
||||
int status_in; |
||||
|
||||
/**
|
||||
* Timestamp of the input status change. |
||||
*/ |
||||
int64_t status_in_pts; |
||||
|
||||
/**
|
||||
* Link output status. |
||||
* If not zero, all attempts of request_frame will fail with the |
||||
* corresponding code. |
||||
*/ |
||||
int status_out; |
||||
} FilterLinkInternal; |
||||
|
||||
static inline FilterLinkInternal *ff_link_internal(AVFilterLink *link) |
||||
{ |
||||
return (FilterLinkInternal*)link; |
||||
} |
||||
|
||||
#endif /* AVFILTER_LINK_INTERNAL_H */ |
||||
@ -1,28 +0,0 @@ |
||||
/*
|
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#ifndef AVFILTER_THREAD_H |
||||
#define AVFILTER_THREAD_H |
||||
|
||||
#include "avfilter.h" |
||||
|
||||
int ff_graph_thread_init(AVFilterGraph *graph); |
||||
|
||||
void ff_graph_thread_free(AVFilterGraph *graph); |
||||
|
||||
#endif /* AVFILTER_THREAD_H */ |
||||
Loading…
Reference in new issue