X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fffmpeg.h;h=8400751bc5f63329f8c6271c2d509f88e7675b79;hb=5aad2133f228b736f033d6c48e1629078b858286;hp=003d55836e9037d43001b0d86781090b5c57d7da;hpb=328cb789bec2048b23fc731cf4eae860dbacd2b6;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/ffmpeg.h b/cinelerra-5.0/cinelerra/ffmpeg.h
index 003d5583..8400751b 100644
--- a/cinelerra-5.0/cinelerra/ffmpeg.h
+++ b/cinelerra-5.0/cinelerra/ffmpeg.h
@@ -77,9 +77,12 @@ public:
 	virtual int encode_activate();
 	virtual int decode_activate();
 	int read_packet();
+	int write_packet(FFPacket &pkt);
+	int flush();
 	int decode(AVFrame *frame);
 
 	virtual int decode_frame(AVFrame *frame, int &got_frame) = 0;
+	virtual int encode_frame(FFPacket &pkt, AVFrame *frame, int &got_frame) = 0;
 	virtual int init_frame(AVFrame *frame) = 0;
 	virtual int create_filter(const char *filter_spec,
 		AVCodecContext *src_ctx, AVCodecContext *sink_ctx) = 0;
@@ -126,13 +129,8 @@ public:
 	int reading, writing;
 	int eof;
 
-	int st_eof() {
-		return eof;
-	}
-	void st_eof(int v) {
-		if( !v ) { flushed = 0;  need_packet = 1; }
-		eof = v;
-	}
+	int st_eof() { return eof; }
+	void st_eof(int v) { eof = v; }
 };
 
 class FFAudioStream : public FFStream {
@@ -158,6 +156,7 @@ public:
 	virtual ~FFAudioStream();
 	int load_history(uint8_t **data, int len);
 	int decode_frame(AVFrame *frame, int &got_frame);
+	int encode_frame(FFPacket &pkt, AVFrame *frame, int &got_frame);
 	int create_filter(const char *filter_spec,
 		AVCodecContext *src_ctx, AVCodecContext *sink_ctx);
 
@@ -188,6 +187,7 @@ public:
 	FFVideoStream(FFMPEG *ffmpeg, AVStream *strm, int idx);
 	virtual ~FFVideoStream();
 	int decode_frame(AVFrame *frame, int &got_frame);
+	int encode_frame(FFPacket &pkt, AVFrame *frame, int &got_frame);
 	int create_filter(const char *filter_spec,
 		AVCodecContext *src_ctx, AVCodecContext *sink_ctx);
 
@@ -227,20 +227,20 @@ public:
 
 	int check_sample_rate(AVCodec *codec, int sample_rate);
 	AVRational check_frame_rate(AVCodec *codec, double frame_rate);
-	AVRational to_sample_aspect_ratio(double aspect_ratio);
+	AVRational to_sample_aspect_ratio(Asset *asset);
 	AVRational to_time_base(int sample_rate);
 
 	static void set_option_path(char *path, const char *fmt, ...);
 	static void get_option_path(char *path, const char *type, const char *spec);
-	int get_format(char *format, const char *path, char *spec);
+	static int get_format(char *format, const char *path, char *spec);
+	static int scan_option_line(char *cp,char *tag,char *val);
 	int get_file_format();
-	int scan_option_line(char *cp,char *tag,char *val);
 	int get_encoder(const char *options,
 		char *format, char *codec, char *bsfilter, char *bsargs);
 	int get_encoder(FILE *fp,
 		char *format, char *codec, char *bsfilter, char *bsargs);
 	int read_options(const char *options, AVDictionary *&opts);
-	int scan_options(const char *options, AVDictionary *&opts);
+	int scan_options(const char *options, AVDictionary *&opts, AVStream *st);
 	int read_options(FILE *fp, const char *options, AVDictionary *&opts);
 	int load_options(const char *options, AVDictionary *&opts);
 	static int load_options(const char *path, char *bfr, int len);