X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.h;h=34bb736448ddc4384990abc6335857ece16e0d37;hb=15df6cbff7373d232ae0b8dcaecd9aa51ff5c388;hp=cbd01c3c1e38c4d27707d938fa033750273f2268;hpb=c8c97de4bed1b06c686fe7155e41ecb85d633b34;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index cbd01c3c..34bb7364 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -80,9 +80,9 @@ public:
 
 	virtual int encode_activate();
 	virtual int decode_activate();
+	virtual int write_packet(FFPacket &pkt);
 	int read_packet();
 	int seek(int64_t no, double rate);
-	int write_packet(FFPacket &pkt);
 	int flush();
 	int decode(AVFrame *frame);
 	void load_markers(IndexMarks &marks, double rate);
@@ -145,11 +145,13 @@ class FFAudioStream : public FFStream {
 	int write(const float *fp, long len);
 	int zero(long len);
 	int write(const double *dp, long len, int ch);
+	int write_packet(FFPacket &pkt);
 public:
 	FFAudioStream(FFMPEG *ffmpeg, AVStream *strm, int idx, int fidx);
 	virtual ~FFAudioStream();
 	int is_audio() { return 1; }
 	int is_video() { return 0; }
+	void init_swr(int ichs, int ifmt, int irate);
 	int get_samples(float *&samples, uint8_t **data, int len);
 	int load_history(uint8_t **data, int len);
 	int decode_frame(AVFrame *frame);
@@ -177,6 +179,7 @@ public:
 	int64_t length;
 
 	SwrContext *resample_context;
+	int swr_ichs, swr_ifmt, swr_irate;
 	int aud_bfr_sz;
 	float *aud_bfr;
 };
@@ -203,6 +206,7 @@ public:
 };
 
 class FFVideoStream : public FFStream, public FFVideoConvert {
+	int write_packet(FFPacket &pkt);
 public:
 	FFVideoStream(FFMPEG *ffmpeg, AVStream *strm, int idx, int fidx);
 	virtual ~FFVideoStream();