X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.h;h=4f1624cee5c73558233cf2ec00c8bd4169d228af;hb=f62d927a25cb3b02f2197fde99c77df3005d41a7;hp=18516d3611c1bd5a6116698a290622ca8e477f75;hpb=c9c0e07706fad701a70ee0d1ffb0fcb6304f138c;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index 18516d36..4f1624ce 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -99,11 +99,12 @@ public:
 	virtual int decode_frame(AVFrame *frame) = 0;
 	virtual int encode_frame(AVFrame *frame) = 0;
 	virtual int init_frame(AVFrame *frame) = 0;
-	virtual int create_filter(const char *filter_spec, AVCodecParameters *avpar) = 0;
+	virtual int create_filter(const char *filter_spec) = 0;
 	virtual void load_markers() = 0;
 	virtual IndexMarks *get_markers() = 0;
-	int create_filter(const char *filter_spec);
-	int load_filter(AVFrame *frame);
+	int insert_filter(const char *name, const char *arg, const char *inst_name=0);
+	int config_filters(const char *filter_spec, AVFilterContext *fsrc);
+	virtual int load_filter(AVFrame *frame);
 	int read_filter(AVFrame *frame);
 	int read_frame(AVFrame *frame);
 	int open_stats_file();
@@ -117,8 +118,10 @@ public:
 	AVFormatContext *fmt_ctx;
 	AVCodecContext *avctx;
 
-	AVFilterContext *buffersink_ctx;
+	AVFilterContext *filt_ctx;
+	int filt_id;
 	AVFilterContext *buffersrc_ctx;
+	AVFilterContext *buffersink_ctx;
 	AVFilterGraph *filter_graph;
 	AVFrame *frame, *fframe;
 	AVFrame *probe_frame;
@@ -135,7 +138,7 @@ public:
 	int64_t seek_pos, curr_pos;
 	int fidx;
 	int reading, writing;
-	int seeked, eof;
+	int seeking, seeked, eof;
 
 	int hw_pixfmt;
 	AVBufferRef *hw_device_ctx;
@@ -177,7 +180,7 @@ public:
 	int load_history(uint8_t **data, int len);
 	int decode_frame(AVFrame *frame);
 	int encode_frame(AVFrame *frame);
-	int create_filter(const char *filter_spec, AVCodecParameters *avpar);
+	int create_filter(const char *filter_spec);
 	void load_markers();
 	IndexMarks *get_markers();
 
@@ -247,17 +250,20 @@ public:
 	AVHWDeviceType encode_hw_activate(const char *hw_dev);
 	int encode_hw_write(FFrame *picture);
 	int encode_frame(AVFrame *frame);
-	int create_filter(const char *filter_spec, AVCodecParameters *avpar);
+	int create_filter(const char *filter_spec);
 	void load_markers();
 	IndexMarks *get_markers();
 
 	int init_frame(AVFrame *picture);
 	int load(VFrame *vframe, int64_t pos);
+	int probe(int64_t pos);
 	int video_seek(int64_t pos);
 	int encode(VFrame *vframe);
 	int drain();
+	int convert_hw_frame(AVFrame *ifrm, AVFrame *ofrm);
+	int load_filter(AVFrame *frame);
 	double get_rotation_angle();
-	void flip();
+	int flip(double theta);
 
 	int idx;
 	double frame_rate;
@@ -268,6 +274,7 @@ public:
 	int interlaced;
 	int top_field_first;
 	int color_space, color_range;
+	struct SwsContext *fconvert_ctx;
 };
 
 class FFCodecRemap
@@ -362,6 +369,10 @@ public:
 	static double to_secs(int64_t time, AVRational time_base);
 	int info(char *text, int len);
 
+	void put_cache_frame(VFrame *frame, int64_t position);
+	int get_use_cache();
+	void purge_cache();
+
 	int init_decoder(const char *filename);
 	int open_decoder();
 	int init_encoder(const char *filename);
@@ -373,6 +384,7 @@ public:
 	double get_initial_timecode(int data_type, int channel, double frame_rate);
 
 	int audio_seek(int ch, int64_t pos);
+	int video_probe(int64_t pos);
 	int video_seek(int layer, int64_t pos);
 
 	int decode(int chn, int64_t pos, double *samples, int len);
@@ -424,6 +436,7 @@ public:
 
 	int decoding, encoding;
 	int has_audio, has_video;
+	int interlace_from_codec;
 
 	FFMPEG(FileBase *file_base=0);
 	~FFMPEG();
@@ -453,6 +466,7 @@ public:
 	float ff_aspect_ratio(int stream);
 	int ff_color_range(int stream);
 	int ff_color_space(int stream);
+	int ff_interlace(int stream);
 	double ff_frame_rate(int stream);
 	const char *ff_video_codec(int stream);
 	int64_t ff_video_frames(int stream);