X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.h;h=56ce4e5b22d512a09d2f97863e5d321987f24b63;hp=5c9b1ea1e1d0c5fe91f61d96eac480f6261ff332;hb=9b18af02dc4ccbf052ef9d70180a3d16c0f9848b;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index 5c9b1ea1..56ce4e5b 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -20,6 +20,7 @@
 #include "fileffmpeg.inc"
 #include "indexstate.inc"
 #include "mutex.h"
+#include "preferences.inc"
 #include "thread.h"
 #include "vframe.inc"
 
@@ -68,6 +69,7 @@ public:
 	int initted() { return init; }
 	void queue(int64_t pos);
 	void dequeue();
+	void set_hw_frame(AVFrame *frame);
 };
 
 class FFStream {
@@ -81,6 +83,8 @@ public:
 
 	virtual int encode_activate();
 	virtual int decode_activate();
+	virtual AVHWDeviceType decode_hw_activate();
+	virtual int decode_hw_format(AVCodec *decoder, AVHWDeviceType type);
 	virtual int write_packet(FFPacket &pkt);
 	int read_packet();
 	int seek(int64_t no, double rate);
@@ -115,6 +119,7 @@ public:
 	AVFilterContext *buffersrc_ctx;
 	AVFilterGraph *filter_graph;
 	AVFrame *frame, *fframe;
+	AVFrame *probe_frame;
 	AVBSFContext *bsfc;
 
 	FFPacket ipkt;
@@ -130,6 +135,9 @@ public:
 	int reading, writing;
 	int seeked, eof;
 
+	int hw_pixfmt;
+	AVBufferRef *hw_device_ctx;
+
 	FILE *stats_fp;
 	char *stats_filename;
 	char *stats_in;
@@ -198,10 +206,18 @@ public:
 
 class FFVideoConvert {
 public:
+	Preferences *preferences;
 	struct SwsContext *convert_ctx;
+	AVFrame *sw_frame;
 
-	FFVideoConvert() { convert_ctx = 0; }
-	~FFVideoConvert() { if( convert_ctx ) sws_freeContext(convert_ctx); }
+	FFVideoConvert(Preferences *preferences) {
+		this->preferences = preferences;
+		convert_ctx = 0; sw_frame = 0;
+	}
+	~FFVideoConvert() {
+		if( convert_ctx ) sws_freeContext(convert_ctx);
+		if( sw_frame ) av_frame_free(&sw_frame);
+	}
 
 	static AVPixelFormat color_model_to_pix_fmt(int color_model);
 	static int pix_fmt_to_color_model(AVPixelFormat pix_fmt);
@@ -224,6 +240,10 @@ public:
 	int is_audio() { return 0; }
 	int is_video() { return 1; }
 	int decode_frame(AVFrame *frame);
+	AVHWDeviceType decode_hw_activate();
+	int decode_hw_format(AVCodec *decoder, AVHWDeviceType type);
+	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);
 	void load_markers();
@@ -243,6 +263,23 @@ public:
 
 	int interlaced;
 	int top_field_first;
+	int color_space, color_range;
+};
+
+class FFCodecRemap
+{
+public:
+	FFCodecRemap();
+	~FFCodecRemap();
+	const char *old_codec, *new_codec;
+};
+
+class FFCodecRemaps : public ArrayList<FFCodecRemap>
+{
+public:
+	FFCodecRemaps() {}
+	int add(const char *val);
+	int update(AVCodecID &codec_id, AVCodec *&decoder);
 };
 
 class FFMPEG : public Thread {
@@ -274,6 +311,8 @@ public:
 	static void load_audio_options(Asset *asset, EDL *edl);
 	static void scan_video_options(Asset *asset, EDL *edl);
 	static void load_video_options(Asset *asset, EDL *edl);
+	static void scan_format_options(Asset *asset, EDL *edl);
+	static void load_format_options(Asset *asset, EDL *edl);
 	static void set_asset_format(Asset *asset, EDL *edl, const char *text);
 	int get_file_format();
 	static int get_encoder(const char *options, char *format, char *codec, char *bsfilter);
@@ -314,7 +353,13 @@ public:
 	double opt_duration;
 	char *opt_video_filter;
 	char *opt_audio_filter;
+	char *opt_hw_dev;
+	char *opt_video_decoder;
+	char *opt_audio_decoder;
+	FFCodecRemaps video_codec_remaps;
+	FFCodecRemaps audio_codec_remaps;
 	char file_format[BCTEXTLEN];
+	int fflags;
 
 	class ffidx {
 	public:
@@ -368,13 +413,17 @@ public:
 	int ff_coded_width(int stream);
 	int ff_coded_height(int stream);
 	float ff_aspect_ratio(int stream);
+	int ff_color_range(int stream);
+	int ff_color_space(int stream);
 	double ff_frame_rate(int stream);
-	const char *ff_video_format(int stream);
+	const char *ff_video_codec(int stream);
 	int64_t ff_video_frames(int stream);
 	int ff_video_pid(int stream);
 	int ff_video_mpeg_color_range(int stream);
 
 	int ff_cpus();
+	const char *ff_hw_dev();
+	Preferences *ff_prefs();
 	void dump_context(AVCodecContext *ctx);
 };