label edit deadlock, build openexr cfg option, code cleanup

[goodguy/history.git] / cinelerra-5.1 / cinelerra / ffmpeg.h

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index e70bcbfb266f404beba4ab9491d03a243d5c34f6..34bb736448ddc4384990abc6335857ece16e0d37 100644 (file)
--- 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);
@@ -168,6 +170,7 @@ public:
        int load(int64_t pos, int len);
        int audio_seek(int64_t pos);
        int encode(double **samples, int len);
+       int drain();
 
        int idx;
        int channel0, channels;
@@ -176,6 +179,7 @@ public:
        int64_t length;
 
        SwrContext *resample_context;
+       int swr_ichs, swr_ifmt, swr_irate;
        int aud_bfr_sz;
        float *aud_bfr;
 };
@@ -202,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();
@@ -217,6 +222,7 @@ public:
        int load(VFrame *vframe, int64_t pos);
        int video_seek(int64_t pos);
        int encode(VFrame *vframe);
+       int drain();
 
        int idx;
        double frame_rate;