X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.h;h=9e17d8b9024fda0a7b135175d78c6eb41f532c8c;hp=15659944c9b3ef57ae599e2eac3527099b438db0;hb=b290324e67a45e465f2d0ad5d0ee662b64343339;hpb=97552ff95c1bf20be9192b8101f61de5490eff20

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index 15659944..9e17d8b9 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -68,6 +68,7 @@ public:
 	int initted() { return init; }
 	void queue(int64_t pos);
 	void dequeue();
+	void set_hw_frame(AVFrame *frame);
 };
 
 class FFStream {
@@ -82,7 +83,7 @@ public:
 	virtual int encode_activate();
 	virtual int decode_activate();
 	virtual AVHWDeviceType decode_hw_activate();
-	virtual void decode_hw_format(AVCodec *decoder, AVHWDeviceType type);
+	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);
@@ -234,7 +235,9 @@ public:
 	int is_video() { return 1; }
 	int decode_frame(AVFrame *frame);
 	AVHWDeviceType decode_hw_activate();
-	void decode_hw_format(AVCodec *decoder, AVHWDeviceType type);
+	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();
@@ -256,6 +259,22 @@ public:
 	int top_field_first;
 };
 
+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 {
 public:
 	static Mutex fflock;
@@ -326,6 +345,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;