X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.h;h=6ad5124664940694e519527ac11e4466451a4027;hb=86c9537e0540010ff43b16feb4cd7de98409eba1;hp=b4867b8eb1943879499d7a6ed33515d9533ff44f;hpb=f890683b11652fc31712acd0d7317a1b235a314e;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index b4867b8e..6ad51246 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"
 
@@ -204,10 +205,14 @@ public:
 
 class FFVideoConvert {
 public:
+	Preferences *preferences;
 	struct SwsContext *convert_ctx;
 	AVFrame *sw_frame;
 
-	FFVideoConvert() { convert_ctx = 0; sw_frame = 0; }
+	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);
@@ -257,6 +262,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 {
@@ -288,6 +310,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);
@@ -329,6 +353,10 @@ public:
 	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;
 
@@ -384,6 +412,8 @@ 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);
 	int64_t ff_video_frames(int stream);
@@ -392,6 +422,7 @@ public:
 
 	int ff_cpus();
 	const char *ff_hw_dev();
+	Preferences *ff_prefs();
 	void dump_context(AVCodecContext *ctx);
 };