X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fffmpeg.h;h=8400751bc5f63329f8c6271c2d509f88e7675b79;hb=5aad2133f228b736f033d6c48e1629078b858286;hp=210e2171481bbea5920b30d77600dde1db57111b;hpb=2d99bb8ce591f05a31464b517d85dc2bc35b2abe;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.0/cinelerra/ffmpeg.h b/cinelerra-5.0/cinelerra/ffmpeg.h index 210e2171..8400751b 100644 --- a/cinelerra-5.0/cinelerra/ffmpeg.h +++ b/cinelerra-5.0/cinelerra/ffmpeg.h @@ -8,13 +8,17 @@ #include #include "arraylist.h" -#include "linklist.h" #include "asset.inc" #include "bccmodels.h" +#include "bcwindowbase.inc" +#include "condition.h" #include "cstrdup.h" +#include "linklist.h" #include "ffmpeg.inc" #include "filebase.inc" #include "fileffmpeg.inc" +#include "mutex.h" +#include "thread.h" #include "vframe.inc" extern "C" { @@ -61,29 +65,6 @@ public: void dequeue(); }; -class FFAudioHistory { -public: - float *inp, *outp, *bfr, *lmt; - long sz, bsz; - int nch; - - FFAudioHistory(); - ~FFAudioHistory(); - void reserve(long sz, int nch); - void realloc(long sz, int nch); - long used(); - long avail(); - void reset(); - void iseek(int64_t ofs); - float *get_outp(int len); - int64_t get_inp(int len); - int write(const float *fp, long len); - int copy(float *fp, long len); - int zero(long len); - int read(double *dp, long len, int ch); - int write(const double *dp, long len, int ch); -}; - class FFStream { public: FFStream(FFMPEG *ffmpeg, AVStream *st, int idx); @@ -96,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; @@ -145,33 +129,42 @@ 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 { + float *inp, *outp, *bfr, *lmt; + long sz; + int nch; + + int read(float *fp, long len); + void realloc(long sz, int nch, long len); + void realloc(long sz, int nch); + void reserve(long sz, int nch); + long used(); + long avail(); + void reset(); + void iseek(int64_t ofs); + float *get_outp(int len); + int64_t put_inp(int len); + int write(const float *fp, long len); + int zero(long len); + int write(const double *dp, long len, int ch); public: FFAudioStream(FFMPEG *ffmpeg, AVStream *strm, int idx); virtual ~FFAudioStream(); - int load_history(float *&bfr, int len); + 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); int encode_activate(); int nb_samples(); - void alloc_history(int len); - void reserve_history(int len); - void append_history(const float *fp, int len); - void zero_history(int len); int64_t load_buffer(double ** const sp, int len); - float *get_history(int len); int in_history(int64_t pos); + int read(double *dp, long len, int ch); int init_frame(AVFrame *frame); int load(int64_t pos, int len); @@ -184,7 +177,6 @@ public: int64_t seek_pos, curr_pos; int64_t length; - FFAudioHistory history; SwrContext *resample_context; int aud_bfr_sz; float *aud_bfr; @@ -195,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); @@ -234,21 +227,23 @@ 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 check_option(const char *path, char *spec); - const char *get_file_format(); - int scan_option_line(char *cp,char *tag,char *val); - int read_options(const char *options, char *format, char *codec, - char *bsfilter, char *bsargs, AVDictionary *&opts); - int read_options(FILE *fp, const char *options, - char *format, char *codec, AVDictionary *&opts); + 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 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 read_options(FILE *fp, const char *options, AVDictionary *&opts, int no=0); + 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); void set_loglevel(const char *ap); static double to_secs(int64_t time, AVRational time_base); int info(char *text, int len); @@ -256,7 +251,7 @@ public: int init_decoder(const char *filename); int open_decoder(); int init_encoder(const char *filename); - int open_encoder(const char *path, const char *spec); + int open_encoder(const char *type, const char *spec); int close_encoder(); int total_audio_channels();