Skip to content

F
ffmpeg
Commit 17c8cc55 authored by Anton Khirnov's avatar Anton Khirnov
Browse files
Options

ffmpeg: drop AV prefixes from struct names. 

Those are reserved for the libs.
parent f5302e5d
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 54 deletions
ffmpeg.c
View file @ 17c8cc55
...@@ -78,26 +78,26 @@ const char program_name[] = "ffmpeg"; ...@@ -78,26 +78,26 @@ const char program_name[] = "ffmpeg";
const int program_birth_year = 2000; const int program_birth_year = 2000;
/* select an input stream for an output stream */ /* select an input stream for an output stream */
typedef struct AVStreamMap { typedef struct StreamMap {
int file_index; int file_index;
int stream_index; int stream_index;
int sync_file_index; int sync_file_index;
int sync_stream_index; int sync_stream_index;
} AVStreamMap; } StreamMap;
/** /**
* select an input file for an output file * select an input file for an output file
*/ */
typedef struct AVMetaDataMap { typedef struct MetadataMap {
int file; //< file index int file; //< file index
char type; //< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram char type; //< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram
int index; //< stream/chapter/program number int index; //< stream/chapter/program number
} AVMetaDataMap; } MetadataMap;
typedef struct AVChapterMap { typedef struct ChapterMap {
int in_file; int in_file;
int out_file; int out_file;
} AVChapterMap; } ChapterMap;
static const OptionDef options[]; static const OptionDef options[];
...@@ -117,17 +117,17 @@ static AVFormatContext *output_files[MAX_FILES]; ...@@ -117,17 +117,17 @@ static AVFormatContext *output_files[MAX_FILES];
static AVDictionary *output_opts[MAX_FILES]; static AVDictionary *output_opts[MAX_FILES];
static int nb_output_files = 0; static int nb_output_files = 0;
static AVStreamMap *stream_maps = NULL; static StreamMap *stream_maps = NULL;
static int nb_stream_maps; static int nb_stream_maps;
/* first item specifies output metadata, second is input */ /* first item specifies output metadata, second is input */
static AVMetaDataMap (*meta_data_maps)[2] = NULL; static MetadataMap (*meta_data_maps)[2] = NULL;
static int nb_meta_data_maps; static int nb_meta_data_maps;
static int metadata_global_autocopy = 1; static int metadata_global_autocopy = 1;
static int metadata_streams_autocopy = 1; static int metadata_streams_autocopy = 1;
static int metadata_chapters_autocopy = 1; static int metadata_chapters_autocopy = 1;
static AVChapterMap *chapter_maps = NULL; static ChapterMap *chapter_maps = NULL;
static int nb_chapter_maps; static int nb_chapter_maps;
/* indexed by output file stream index */ /* indexed by output file stream index */
...@@ -246,19 +246,19 @@ static AVBitStreamFilterContext *subtitle_bitstream_filters=NULL; ...@@ -246,19 +246,19 @@ static AVBitStreamFilterContext *subtitle_bitstream_filters=NULL;
#define DEFAULT_PASS_LOGFILENAME_PREFIX "ffmpeg2pass" #define DEFAULT_PASS_LOGFILENAME_PREFIX "ffmpeg2pass"
struct AVInputStream; struct InputStream;
typedef struct AVOutputStream { typedef struct OutputStream {
int file_index; /* file index */ int file_index; /* file index */
int index; /* stream index in the output file */ int index; /* stream index in the output file */
int source_index; /* AVInputStream index */ int source_index; /* InputStream index */
AVStream *st; /* stream in the output file */ AVStream *st; /* stream in the output file */
int encoding_needed; /* true if encoding needed for this stream */ int encoding_needed; /* true if encoding needed for this stream */
int frame_number; int frame_number;
/* input pts and corresponding output pts /* input pts and corresponding output pts
for A/V sync */ for A/V sync */
//double sync_ipts; /* dts from the AVPacket of the demuxer in second units */ //double sync_ipts; /* dts from the AVPacket of the demuxer in second units */
struct AVInputStream *sync_ist; /* input stream to sync against */ struct InputStream *sync_ist; /* input stream to sync against */
int64_t sync_opts; /* output frame counter, could be changed to some true timestamp */ //FIXME look at frame_number int64_t sync_opts; /* output frame counter, could be changed to some true timestamp */ //FIXME look at frame_number
AVBitStreamFilterContext *bitstream_filters; AVBitStreamFilterContext *bitstream_filters;
AVCodec *enc; AVCodec *enc;
...@@ -299,12 +299,12 @@ typedef struct AVOutputStream { ...@@ -299,12 +299,12 @@ typedef struct AVOutputStream {
#endif #endif
int sws_flags; int sws_flags;
} AVOutputStream; } OutputStream;
static AVOutputStream **output_streams_for_file[MAX_FILES] = { NULL }; static OutputStream **output_streams_for_file[MAX_FILES] = { NULL };
static int nb_output_streams_for_file[MAX_FILES] = { 0 }; static int nb_output_streams_for_file[MAX_FILES] = { 0 };
typedef struct AVInputStream { typedef struct InputStream {
int file_index; int file_index;
AVStream *st; AVStream *st;
int discard; /* true if stream data should be discarded */ int discard; /* true if stream data should be discarded */
...@@ -323,23 +323,23 @@ typedef struct AVInputStream { ...@@ -323,23 +323,23 @@ typedef struct AVInputStream {
AVFrame *filter_frame; AVFrame *filter_frame;
int has_filter_frame; int has_filter_frame;
#endif #endif
} AVInputStream; } InputStream;
typedef struct AVInputFile { typedef struct InputFile {
AVFormatContext *ctx; AVFormatContext *ctx;
int eof_reached; /* true if eof reached */ int eof_reached; /* true if eof reached */
int ist_index; /* index of first stream in ist_table */ int ist_index; /* index of first stream in ist_table */
int buffer_size; /* current total buffer size */ int buffer_size; /* current total buffer size */
} AVInputFile; } InputFile;
static AVInputStream *input_streams = NULL; static InputStream *input_streams = NULL;
static int nb_input_streams = 0; static int nb_input_streams = 0;
static AVInputFile *input_files = NULL; static InputFile *input_files = NULL;
static int nb_input_files = 0; static int nb_input_files = 0;
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost) static int configure_video_filters(InputStream *ist, OutputStream *ost)
{ {
AVFilterContext *last_filter, *filter; AVFilterContext *last_filter, *filter;
/** filter graph containing all filters including input & output */ /** filter graph containing all filters including input & output */
...@@ -647,10 +647,10 @@ static void choose_pixel_fmt(AVStream *st, AVCodec *codec) ...@@ -647,10 +647,10 @@ static void choose_pixel_fmt(AVStream *st, AVCodec *codec)
} }
} }
static AVOutputStream *new_output_stream(AVFormatContext *oc, int file_idx) static OutputStream *new_output_stream(AVFormatContext *oc, int file_idx)
{ {
int idx = oc->nb_streams - 1; int idx = oc->nb_streams - 1;
AVOutputStream *ost; OutputStream *ost;
output_streams_for_file[file_idx] = output_streams_for_file[file_idx] =
grow_array(output_streams_for_file[file_idx], grow_array(output_streams_for_file[file_idx],
...@@ -658,7 +658,7 @@ static AVOutputStream *new_output_stream(AVFormatContext *oc, int file_idx) ...@@ -658,7 +658,7 @@ static AVOutputStream *new_output_stream(AVFormatContext *oc, int file_idx)
&nb_output_streams_for_file[file_idx], &nb_output_streams_for_file[file_idx],
oc->nb_streams); oc->nb_streams);
ost = output_streams_for_file[file_idx][idx] = ost = output_streams_for_file[file_idx][idx] =
av_mallocz(sizeof(AVOutputStream)); av_mallocz(sizeof(OutputStream));
if (!ost) { if (!ost) {
fprintf(stderr, "Could not alloc output stream\n"); fprintf(stderr, "Could not alloc output stream\n");
ffmpeg_exit(1); ffmpeg_exit(1);
...@@ -727,9 +727,9 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename) ...@@ -727,9 +727,9 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
} }
static double static double
get_sync_ipts(const AVOutputStream *ost) get_sync_ipts(const OutputStream *ost)
{ {
const AVInputStream *ist = ost->sync_ist; const InputStream *ist = ost->sync_ist;
return (double)(ist->pts - start_time)/AV_TIME_BASE; return (double)(ist->pts - start_time)/AV_TIME_BASE;
} }
...@@ -768,8 +768,8 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx ...@@ -768,8 +768,8 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx
#define MAX_AUDIO_PACKET_SIZE (128 * 1024) #define MAX_AUDIO_PACKET_SIZE (128 * 1024)
static void do_audio_out(AVFormatContext *s, static void do_audio_out(AVFormatContext *s,
AVOutputStream *ost, OutputStream *ost,
AVInputStream *ist, InputStream *ist,
unsigned char *buf, int size) unsigned char *buf, int size)
{ {
uint8_t *buftmp; uint8_t *buftmp;
...@@ -1011,7 +1011,7 @@ need_realloc: ...@@ -1011,7 +1011,7 @@ need_realloc:
} }
} }
static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void **bufp) static void pre_process_video_frame(InputStream *ist, AVPicture *picture, void **bufp)
{ {
AVCodecContext *dec; AVCodecContext *dec;
AVPicture *picture2; AVPicture *picture2;
...@@ -1054,8 +1054,8 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void ...@@ -1054,8 +1054,8 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void
#define AV_DELAY_MAX 0.100 #define AV_DELAY_MAX 0.100
static void do_subtitle_out(AVFormatContext *s, static void do_subtitle_out(AVFormatContext *s,
AVOutputStream *ost, OutputStream *ost,
AVInputStream *ist, InputStream *ist,
AVSubtitle *sub, AVSubtitle *sub,
int64_t pts) int64_t pts)
{ {
...@@ -1120,8 +1120,8 @@ static int bit_buffer_size= 1024*256; ...@@ -1120,8 +1120,8 @@ static int bit_buffer_size= 1024*256;
static uint8_t *bit_buffer= NULL; static uint8_t *bit_buffer= NULL;
static void do_video_out(AVFormatContext *s, static void do_video_out(AVFormatContext *s,
AVOutputStream *ost, OutputStream *ost,
AVInputStream *ist, InputStream *ist,
AVFrame *in_picture, AVFrame *in_picture,
int *frame_size, float quality) int *frame_size, float quality)
{ {
...@@ -1296,7 +1296,7 @@ static double psnr(double d){ ...@@ -1296,7 +1296,7 @@ static double psnr(double d){
return -10.0*log(d)/log(10.0); return -10.0*log(d)/log(10.0);
} }
static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, static void do_video_stats(AVFormatContext *os, OutputStream *ost,
int frame_size) int frame_size)
{ {
AVCodecContext *enc; AVCodecContext *enc;
...@@ -1334,11 +1334,11 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, ...@@ -1334,11 +1334,11 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost,
} }
static void print_report(AVFormatContext **output_files, static void print_report(AVFormatContext **output_files,
AVOutputStream **ost_table, int nb_ostreams, OutputStream **ost_table, int nb_ostreams,
int is_last_report) int is_last_report)
{ {
char buf[1024]; char buf[1024];
AVOutputStream *ost; OutputStream *ost;
AVFormatContext *oc; AVFormatContext *oc;
int64_t total_size; int64_t total_size;
AVCodecContext *enc; AVCodecContext *enc;
...@@ -1464,12 +1464,12 @@ static void generate_silence(uint8_t* buf, enum AVSampleFormat sample_fmt, size_ ...@@ -1464,12 +1464,12 @@ static void generate_silence(uint8_t* buf, enum AVSampleFormat sample_fmt, size_
} }
/* pkt = NULL means EOF (needed to flush decoder buffers) */ /* pkt = NULL means EOF (needed to flush decoder buffers) */
static int output_packet(AVInputStream *ist, int ist_index, static int output_packet(InputStream *ist, int ist_index,
AVOutputStream **ost_table, int nb_ostreams, OutputStream **ost_table, int nb_ostreams,
const AVPacket *pkt) const AVPacket *pkt)
{ {
AVFormatContext *os; AVFormatContext *os;
AVOutputStream *ost; OutputStream *ost;
int ret, i; int ret, i;
int got_output; int got_output;
AVFrame picture; AVFrame picture;
...@@ -1916,7 +1916,7 @@ static int copy_chapters(int infile, int outfile) ...@@ -1916,7 +1916,7 @@ static int copy_chapters(int infile, int outfile)
return 0; return 0;
} }
static void parse_forced_key_frames(char *kf, AVOutputStream *ost, static void parse_forced_key_frames(char *kf, OutputStream *ost,
AVCodecContext *avctx) AVCodecContext *avctx)
{ {
char *p; char *p;
...@@ -1944,15 +1944,15 @@ static void parse_forced_key_frames(char *kf, AVOutputStream *ost, ...@@ -1944,15 +1944,15 @@ static void parse_forced_key_frames(char *kf, AVOutputStream *ost,
*/ */
static int transcode(AVFormatContext **output_files, static int transcode(AVFormatContext **output_files,
int nb_output_files, int nb_output_files,
AVInputFile *input_files, InputFile *input_files,
int nb_input_files, int nb_input_files,
AVStreamMap *stream_maps, int nb_stream_maps) StreamMap *stream_maps, int nb_stream_maps)
{ {
int ret = 0, i, j, k, n, nb_ostreams = 0; int ret = 0, i, j, k, n, nb_ostreams = 0;
AVFormatContext *is, *os; AVFormatContext *is, *os;
AVCodecContext *codec, *icodec; AVCodecContext *codec, *icodec;
AVOutputStream *ost, **ost_table = NULL; OutputStream *ost, **ost_table = NULL;
AVInputStream *ist; InputStream *ist;
char error[1024]; char error[1024];
int want_sdp = 1; int want_sdp = 1;
uint8_t no_packet[MAX_FILES]={0}; uint8_t no_packet[MAX_FILES]={0};
...@@ -2001,7 +2001,7 @@ static int transcode(AVFormatContext **output_files, ...@@ -2001,7 +2001,7 @@ static int transcode(AVFormatContext **output_files,
} }
} }
ost_table = av_mallocz(sizeof(AVOutputStream *) * nb_ostreams); ost_table = av_mallocz(sizeof(OutputStream *) * nb_ostreams);
if (!ost_table) if (!ost_table)
goto fail; goto fail;
n = 0; n = 0;
...@@ -2412,7 +2412,7 @@ static int transcode(AVFormatContext **output_files, ...@@ -2412,7 +2412,7 @@ static int transcode(AVFormatContext **output_files,
files[1] = input_files[in_file_index].ctx; files[1] = input_files[in_file_index].ctx;
for (j = 0; j < 2; j++) { for (j = 0; j < 2; j++) {
AVMetaDataMap *map = &meta_data_maps[i][j]; MetadataMap *map = &meta_data_maps[i][j];
switch (map->type) { switch (map->type) {
case 'g': case 'g':
...@@ -2984,7 +2984,7 @@ static int opt_codec_tag(const char *opt, const char *arg) ...@@ -2984,7 +2984,7 @@ static int opt_codec_tag(const char *opt, const char *arg)
static int opt_map(const char *opt, const char *arg) static int opt_map(const char *opt, const char *arg)
{ {
AVStreamMap *m; StreamMap *m;
char *p; char *p;
stream_maps = grow_array(stream_maps, sizeof(*stream_maps), &nb_stream_maps, nb_stream_maps + 1); stream_maps = grow_array(stream_maps, sizeof(*stream_maps), &nb_stream_maps, nb_stream_maps + 1);
...@@ -3031,7 +3031,7 @@ static void parse_meta_type(char *arg, char *type, int *index, char **endptr) ...@@ -3031,7 +3031,7 @@ static void parse_meta_type(char *arg, char *type, int *index, char **endptr)
static int opt_map_metadata(const char *opt, const char *arg) static int opt_map_metadata(const char *opt, const char *arg)
{ {
AVMetaDataMap *m, *m1; MetadataMap *m, *m1;
char *p; char *p;
meta_data_maps = grow_array(meta_data_maps, sizeof(*meta_data_maps), meta_data_maps = grow_array(meta_data_maps, sizeof(*meta_data_maps),
...@@ -3066,7 +3066,7 @@ static int opt_map_meta_data(const char *opt, const char *arg) ...@@ -3066,7 +3066,7 @@ static int opt_map_meta_data(const char *opt, const char *arg)
static int opt_map_chapters(const char *opt, const char *arg) static int opt_map_chapters(const char *opt, const char *arg)
{ {
AVChapterMap *c; ChapterMap *c;
char *p; char *p;
chapter_maps = grow_array(chapter_maps, sizeof(*chapter_maps), &nb_chapter_maps, chapter_maps = grow_array(chapter_maps, sizeof(*chapter_maps), &nb_chapter_maps,
...@@ -3298,7 +3298,7 @@ static int opt_input_file(const char *opt, const char *filename) ...@@ -3298,7 +3298,7 @@ static int opt_input_file(const char *opt, const char *filename)
for(i=0;i<ic->nb_streams;i++) { for(i=0;i<ic->nb_streams;i++) {
AVStream *st = ic->streams[i]; AVStream *st = ic->streams[i];
AVCodecContext *dec = st->codec; AVCodecContext *dec = st->codec;
AVInputStream *ist; InputStream *ist;
dec->thread_count = thread_count; dec->thread_count = thread_count;
input_codecs = grow_array(input_codecs, sizeof(*input_codecs), &nb_input_codecs, nb_input_codecs + 1); input_codecs = grow_array(input_codecs, sizeof(*input_codecs), &nb_input_codecs, nb_input_codecs + 1);
...@@ -3430,7 +3430,7 @@ static void check_inputs(int *has_video_ptr, ...@@ -3430,7 +3430,7 @@ static void check_inputs(int *has_video_ptr,
static void new_video_stream(AVFormatContext *oc, int file_idx) static void new_video_stream(AVFormatContext *oc, int file_idx)
{ {
AVStream *st; AVStream *st;
AVOutputStream *ost; OutputStream *ost;
AVCodecContext *video_enc; AVCodecContext *video_enc;
enum CodecID codec_id = CODEC_ID_NONE; enum CodecID codec_id = CODEC_ID_NONE;
AVCodec *codec= NULL; AVCodec *codec= NULL;
...@@ -3569,7 +3569,7 @@ static void new_video_stream(AVFormatContext *oc, int file_idx) ...@@ -3569,7 +3569,7 @@ static void new_video_stream(AVFormatContext *oc, int file_idx)
static void new_audio_stream(AVFormatContext *oc, int file_idx) static void new_audio_stream(AVFormatContext *oc, int file_idx)
{ {
AVStream *st; AVStream *st;
AVOutputStream *ost; OutputStream *ost;
AVCodec *codec= NULL; AVCodec *codec= NULL;
AVCodecContext *audio_enc; AVCodecContext *audio_enc;
enum CodecID codec_id = CODEC_ID_NONE; enum CodecID codec_id = CODEC_ID_NONE;
...@@ -3679,7 +3679,7 @@ static void new_data_stream(AVFormatContext *oc, int file_idx) ...@@ -3679,7 +3679,7 @@ static void new_data_stream(AVFormatContext *oc, int file_idx)
static void new_subtitle_stream(AVFormatContext *oc, int file_idx) static void new_subtitle_stream(AVFormatContext *oc, int file_idx)
{ {
AVStream *st; AVStream *st;
AVOutputStream *ost; OutputStream *ost;
AVCodec *codec=NULL; AVCodec *codec=NULL;
AVCodecContext *subtitle_enc; AVCodecContext *subtitle_enc;
enum CodecID codec_id = CODEC_ID_NONE; enum CodecID codec_id = CODEC_ID_NONE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment