Commit daf8cf35 authored by Diego Biurrun's avatar Diego Biurrun

avformat: Don't anonymously typedef structs

parent 7769be59
......@@ -28,7 +28,7 @@
#define ADTS_HEADER_SIZE 7
typedef struct {
typedef struct ADTSContext {
int write_adts;
int objecttype;
int sample_rate_index;
......
......@@ -29,7 +29,7 @@
#define AIFF 0
#define AIFF_C_VERSION1 0xA2805140
typedef struct {
typedef struct AIFFInputContext {
int64_t data_end;
int block_duration;
} AIFFInputContext;
......
......@@ -27,7 +27,7 @@
#include "aiff.h"
#include "avio_internal.h"
typedef struct {
typedef struct AIFFOutputContext {
int64_t form;
int64_t frames;
int64_t ssnd;
......
......@@ -28,13 +28,13 @@
#include "avformat.h"
#include "internal.h"
typedef struct {
typedef struct Page {
int base_record;
unsigned int nb_records;
int size;
} Page;
typedef struct {
typedef struct AnmDemuxContext {
unsigned int nb_pages; /**< total pages in file */
unsigned int nb_records; /**< total records in file */
int page_table_offset;
......
......@@ -42,7 +42,7 @@
#define APE_EXTRADATA_SIZE 6
typedef struct {
typedef struct APEFrame {
int64_t pos;
int nblocks;
int size;
......@@ -50,7 +50,7 @@ typedef struct {
int64_t pts;
} APEFrame;
typedef struct {
typedef struct APEContext {
/* Derived fields */
uint32_t junklength;
uint32_t firstframe;
......
......@@ -39,7 +39,7 @@
#include "asf.h"
#include "asfcrypt.h"
typedef struct {
typedef struct ASFContext {
const AVClass *class;
int asfid2avid[128]; ///< conversion table from asf ID 2 AVStream ID
ASFStream streams[128]; ///< it's max number and it's not that big
......
......@@ -185,7 +185,7 @@
#define DATA_HEADER_SIZE 50
typedef struct {
typedef struct ASFContext {
uint32_t seqno;
int is_streamed;
ASFStream streams[128]; ///< it's max number and it's not that big
......
......@@ -61,7 +61,7 @@ typedef struct AVIStream {
uint8_t *sub_buffer;
} AVIStream;
typedef struct {
typedef struct AVIContext {
int64_t riff_end;
int64_t movi_end;
int64_t fsize;
......
......@@ -44,13 +44,13 @@ typedef struct AVIIndex {
AVIIentry** cluster;
} AVIIndex;
typedef struct {
typedef struct AVIContext {
int64_t riff_start, movi_list, odml_list;
int64_t frames_hdr_all;
int riff_id;
} AVIContext;
typedef struct {
typedef struct AVIStream {
int64_t frames_hdr_strm;
int audio_strm_length;
int packet_count;
......
......@@ -46,7 +46,7 @@ enum BinkAudFlags {
#define BINK_MAX_WIDTH 7680
#define BINK_MAX_HEIGHT 4800
typedef struct {
typedef struct BinkDemuxContext {
uint32_t file_size;
uint32_t num_audio_tracks;
......
......@@ -24,13 +24,13 @@
#include "voc.h"
#include "libavutil/intreadwrite.h"
typedef struct {
typedef struct C93BlockRecord {
uint16_t index;
uint8_t length;
uint8_t frames;
} C93BlockRecord;
typedef struct {
typedef struct C93DemuxContext {
VocDecContext voc;
C93BlockRecord block_records[512];
......
......@@ -36,7 +36,7 @@
#include "libavutil/dict.h"
#include "caf.h"
typedef struct {
typedef struct CafContext {
int bytes_per_packet; ///< bytes in a packet, or 0 if variable
int frames_per_packet; ///< frames in a packet, or 0 if variable
int64_t num_bytes; ///< total number of bytes in stream
......
......@@ -29,7 +29,7 @@
#define MAX_BUFFER_BLOCKS 150
#define BLOCKSIZE 16
typedef struct {
typedef struct CryptoContext {
const AVClass *class;
URLContext *hd;
uint8_t inbuffer [BLOCKSIZE*MAX_BUFFER_BLOCKS],
......
......@@ -28,7 +28,7 @@
#define DXA_EXTRA_SIZE 9
typedef struct{
typedef struct DXAContext {
int frames;
int has_sound;
int bpc;
......
......@@ -31,7 +31,7 @@
#include "avformat.h"
#include "internal.h"
typedef struct {
typedef struct CdataDemuxContext {
unsigned int channels;
unsigned int audio_pts;
} CdataDemuxContext;
......
......@@ -30,7 +30,7 @@
#define RAND_TAG MKBETAG('R','a','n','d')
typedef struct {
typedef struct FilmstripDemuxContext {
int leading;
} FilmstripDemuxContext;
......
......@@ -29,7 +29,7 @@
#define RAND_TAG MKBETAG('R','a','n','d')
typedef struct {
typedef struct FilmstripMuxContext {
int nb_frames;
} FilmstripMuxContext;
......
......@@ -43,7 +43,7 @@
#define VALIDATE_INDEX_TS_THRESH 2500
typedef struct {
typedef struct FLVContext {
const AVClass *class; ///< Class for private options.
int trust_metadata; ///< configure streams according onMetaData
int wrong_dts; ///< wrong dts due to negative cts
......
......@@ -58,7 +58,7 @@
* (byte 19) in the app_header */
#define GIF_ADD_APP_HEADER // required to enable looping of animated gif
typedef struct {
typedef struct rgb_triplet {
unsigned char r;
unsigned char g;
unsigned char b;
......@@ -253,7 +253,7 @@ static int gif_image_write_image(AVIOContext *pb,
return 0;
}
typedef struct {
typedef struct GIFContext {
AVClass *class; /** Class for private options. */
int64_t time, file_time;
uint8_t buffer[100]; /* data chunks */
......
......@@ -28,7 +28,7 @@
#include "network.h"
#include "url.h"
typedef struct {
typedef struct GopherContext {
URLContext *hd;
} GopherContext;
......
......@@ -29,7 +29,7 @@
#define GSM_BLOCK_SAMPLES 160
#define GSM_SAMPLE_RATE 8000
typedef struct {
typedef struct GSMDemuxerContext {
AVClass *class;
int sample_rate;
} GSMDemuxerContext;
......
......@@ -45,7 +45,7 @@
#define BUFFER_SIZE MAX_URL_SIZE
#define MAX_REDIRECTS 8
typedef struct {
typedef struct HTTPContext {
const AVClass *class;
URLContext *hd;
unsigned char buffer[BUFFER_SIZE], *buf_ptr, *buf_end;
......
......@@ -74,7 +74,7 @@ typedef enum {
BITMAP_BYTERUN1
} bitmap_compression_type;
typedef struct {
typedef struct IffDemuxContext {
uint64_t body_pos;
uint32_t body_size;
uint32_t sent_bytes;
......
......@@ -23,7 +23,7 @@
#include "libavutil/avstring.h"
#include "internal.h"
typedef struct {
typedef struct IdStrMap {
enum AVCodecID id;
const char *str;
} IdStrMap;
......
......@@ -28,7 +28,7 @@
#include "avformat.h"
#include "internal.h"
typedef struct {
typedef struct VideoDemuxData {
const AVClass *class; /**< Class for private options. */
int img_first;
int img_last;
......
......@@ -28,7 +28,7 @@
#include "internal.h"
#include "libavutil/opt.h"
typedef struct {
typedef struct VideoMuxData {
const AVClass *class; /**< Class for private options. */
int img_number;
int is_pipe;
......
......@@ -35,7 +35,7 @@
#define ISS_SIG_LEN 15
#define MAX_TOKEN_SIZE 20
typedef struct {
typedef struct IssDemuxContext {
int packet_size;
int sample_start_pos;
} IssDemuxContext;
......
......@@ -33,14 +33,14 @@
#define JV_PREAMBLE_SIZE 5
typedef struct {
typedef struct JVFrame {
int audio_size; /** audio packet size (bytes) */
int video_size; /** video packet size (bytes) */
int palette_size; /** palette size (bytes) */
int video_type; /** per-frame video compression type */
} JVFrame;
typedef struct {
typedef struct JVDemuxContext {
JVFrame *frames;
enum {
JV_AUDIO = 0,
......
......@@ -26,7 +26,7 @@
#include "libavutil/opt.h"
#include "avformat.h"
typedef struct {
typedef struct LATMContext {
AVClass *av_class;
int off;
int channel_conf;
......
......@@ -46,7 +46,7 @@ static const AVCodecTag lxf_tags[] = {
{ AV_CODEC_ID_NONE, 0 },
};
typedef struct {
typedef struct LXFDemuxContext {
int channels; ///< number of audio channels. zero means no audio
int frame_number; ///< current video frame
uint32_t video_format, packet_type, extended_size;
......
......@@ -86,18 +86,18 @@ typedef const struct EbmlSyntax {
} def;
} EbmlSyntax;
typedef struct {
typedef struct EbmlList {
int nb_elem;
void *elem;
} EbmlList;
typedef struct {
typedef struct EbmlBin {
int size;
uint8_t *data;
int64_t pos;
} EbmlBin;
typedef struct {
typedef struct Ebml {
uint64_t version;
uint64_t max_size;
uint64_t id_length;
......@@ -105,18 +105,18 @@ typedef struct {
uint64_t doctype_version;
} Ebml;
typedef struct {
typedef struct MatroskaTrackCompression {
uint64_t algo;
EbmlBin settings;
} MatroskaTrackCompression;
typedef struct {
typedef struct MatroskaTrackEncoding {
uint64_t scope;
uint64_t type;
MatroskaTrackCompression compression;
} MatroskaTrackEncoding;
typedef struct {
typedef struct MatroskaTrackVideo {
double frame_rate;
uint64_t display_width;
uint64_t display_height;
......@@ -126,7 +126,7 @@ typedef struct {
uint64_t stereo_mode;
} MatroskaTrackVideo;
typedef struct {
typedef struct MatroskaTrackAudio {
double samplerate;
double out_samplerate;
uint64_t bitdepth;
......@@ -143,7 +143,7 @@ typedef struct {
uint8_t *buf;
} MatroskaTrackAudio;
typedef struct {
typedef struct MatroskaTrack {
uint64_t num;
uint64_t uid;
uint64_t type;
......@@ -165,7 +165,7 @@ typedef struct {
int ms_compat;
} MatroskaTrack;
typedef struct {
typedef struct MatroskaAttachment {
uint64_t uid;
char *filename;
char *mime;
......@@ -174,7 +174,7 @@ typedef struct {
AVStream *stream;
} MatroskaAttachment;
typedef struct {
typedef struct MatroskaChapter {
uint64_t start;
uint64_t end;
uint64_t uid;
......@@ -183,17 +183,17 @@ typedef struct {
AVChapter *chapter;
} MatroskaChapter;
typedef struct {
typedef struct MatroskaIndexPos {
uint64_t track;
uint64_t pos;
} MatroskaIndexPos;
typedef struct {
typedef struct MatroskaIndex {
uint64_t time;
EbmlList pos;
} MatroskaIndex;
typedef struct {
typedef struct MatroskaTag {
char *name;
char *string;
char *lang;
......@@ -201,7 +201,7 @@ typedef struct {
EbmlList sub;
} MatroskaTag;
typedef struct {
typedef struct MatroskaTagTarget {
char *type;
uint64_t typevalue;
uint64_t trackuid;
......@@ -209,27 +209,27 @@ typedef struct {
uint64_t attachuid;
} MatroskaTagTarget;
typedef struct {
typedef struct MatroskaTags {
MatroskaTagTarget target;
EbmlList tag;
} MatroskaTags;
typedef struct {
typedef struct MatroskaSeekhead {
uint64_t id;
uint64_t pos;
} MatroskaSeekhead;
typedef struct {
typedef struct MatroskaLevel {
uint64_t start;
uint64_t length;
} MatroskaLevel;
typedef struct {
typedef struct MatroskaCluster {
uint64_t timecode;
EbmlList blocks;
} MatroskaCluster;
typedef struct {
typedef struct MatroskaDemuxContext {
AVFormatContext *ctx;
/* EBML stuff */
......@@ -273,7 +273,7 @@ typedef struct {
int contains_ssa;
} MatroskaDemuxContext;
typedef struct {
typedef struct MatroskaBlock {
uint64_t duration;
int64_t reference;
uint64_t non_simple;
......
......@@ -67,19 +67,19 @@ typedef struct mkv_seekhead {
int num_entries;
} mkv_seekhead;
typedef struct {
typedef struct mkv_cuepoint {
uint64_t pts;
int tracknum;
int64_t cluster_pos; ///< file offset of the cluster containing the block
} mkv_cuepoint;
typedef struct {
typedef struct mkv_cues {
int64_t segment_offset;
mkv_cuepoint *entries;
int num_entries;
} mkv_cues;
typedef struct {
typedef struct mkv_track {
int write_dts;
int64_t ts_offset;
} mkv_track;
......
......@@ -54,7 +54,7 @@
#define MM_PALETTE_COUNT 128
#define MM_PALETTE_SIZE (MM_PALETTE_COUNT*3)
typedef struct {
typedef struct MmDemuxContext {
unsigned int audio_pts, video_pts;
} MmDemuxContext;
......
......@@ -26,7 +26,7 @@
#include "pcm.h"
#include "riff.h"
typedef struct {
typedef struct MMFContext {
int64_t atrpos, atsqpos, awapos;
int64_t data_size;
} MMFContext;
......
......@@ -54,7 +54,7 @@ typedef enum {
CHUNK_TYPE_STREAM_CHANGE = 0x4324,
} ChunkType;
typedef struct {
typedef struct MMSHContext {
MMSContext mms;
int request_seq; ///< request packet sequence
int chunk_seq; ///< data packet sequence
......
......@@ -85,7 +85,7 @@ typedef enum {
/*@}*/
} MMSSCPacketType;
typedef struct {
typedef struct MMSTContext {
MMSContext mms;
int outgoing_packet_seq; ///< Outgoing packet sequence number.
char path[256]; ///< Path of the resource being asked for.
......
......@@ -31,12 +31,12 @@
#define DELAY_FRAMES 32
static const int mpc_rate[4] = { 44100, 48000, 37800, 32000 };
typedef struct {
typedef struct MPCFrame {
int64_t pos;
int size, skip;
}MPCFrame;
typedef struct {
typedef struct MPCContext {
int ver;
uint32_t curframe, lastframe;
uint32_t fcount;
......
......@@ -47,7 +47,7 @@ enum MPCPacketTags{
static const int mpc8_rate[8] = { 44100, 48000, 37800, 32000, -1, -1, -1, -1 };
typedef struct {
typedef struct MPCContext {
int ver;
int64_t header_pos;
int64_t samples;
......
......@@ -46,7 +46,7 @@ typedef struct PacketDesc {
struct PacketDesc *next;
} PacketDesc;
typedef struct {
typedef struct StreamInfo {
AVFifoBuffer *fifo;
uint8_t id;
int max_buffer_size; /* in bytes */
......@@ -62,7 +62,7 @@ typedef struct {
int64_t vobu_start_pts;
} StreamInfo;
typedef struct {
typedef struct MpegMuxContext {
const AVClass *class;
int packet_size; /* required packet size */
int packet_number;
......
......@@ -565,7 +565,7 @@ static int parse_section_header(SectionHeader *h,
return 0;
}
typedef struct {
typedef struct StreamType {
uint32_t stream_type;
enum AVMediaType codec_type;
enum AVCodecID codec_id;
......@@ -1026,7 +1026,7 @@ static PESContext *add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid)
}
#define MAX_LEVEL 4
typedef struct {
typedef struct MP4DescrParseContext {
AVFormatContext *s;
AVIOContext pb;
Mp4Descr *descr;
......
......@@ -72,7 +72,7 @@ typedef enum {
OPSonyOpt, /* FATE sample, violates the spec in places */
} MXFOP;
typedef struct {
typedef struct MXFPartition {
int closed;
int complete;
MXFPartitionType type;
......@@ -88,13 +88,13 @@ typedef struct {
int pack_length;
} MXFPartition;
typedef struct {
typedef struct MXFCryptoContext {
UID uid;
enum MXFMetadataSetType type;
UID source_container_ul;
} MXFCryptoContext;
typedef struct {
typedef struct MXFStructuralComponent {
UID uid;
enum MXFMetadataSetType type;
UID source_package_uid;
......@@ -104,7 +104,7 @@ typedef struct {
int source_track_id;
} MXFStructuralComponent;
typedef struct {
typedef struct MXFSequence {
UID uid;
enum MXFMetadataSetType type;
UID data_definition_ul;
......@@ -114,7 +114,7 @@ typedef struct {
uint8_t origin;
} MXFSequence;
typedef struct {
typedef struct MXFTrack {
UID uid;
enum MXFMetadataSetType type;
MXFSequence *sequence; /* mandatory, and only one */
......@@ -127,7 +127,7 @@ typedef struct {
int64_t original_duration; /* st->duration in SampleRate/EditRate units */
} MXFTrack;
typedef struct {
typedef struct MXFDescriptor {
UID uid;
enum MXFMetadataSetType type;
UID essence_container_ul;
......@@ -153,7 +153,7 @@ typedef struct {
enum AVPixelFormat pix_fmt;
} MXFDescriptor;
typedef struct {
typedef struct MXFIndexTableSegment {
UID uid;
enum MXFMetadataSetType type;
int edit_unit_byte_count;
......@@ -168,7 +168,7 @@ typedef struct {
int nb_index_entries;
} MXFIndexTableSegment;
typedef struct {
typedef struct MXFPackage {
UID uid;
enum MXFMetadataSetType type;
UID package_uid;
......@@ -178,13 +178,13 @@ typedef struct {
UID descriptor_ref;
} MXFPackage;
typedef struct {
typedef struct MXFMetadataSet {
UID uid;
enum MXFMetadataSetType type;
} MXFMetadataSet;
/* decoded index table */
typedef struct {
typedef struct MXFIndexTable {
int index_sid;
int body_sid;
int nb_ptses; /* number of PTSes or total duration of index */
......@@ -195,7 +195,7 @@ typedef struct {
AVIndexEntry *fake_index; /* used for calling ff_index_search_timestamp() */
} MXFIndexTable;
typedef struct {
typedef struct MXFContext {
MXFPartition *partitions;
unsigned partitions_count;
MXFOP op;
......@@ -230,7 +230,7 @@ enum MXFWrappingScheme {
/* NOTE: klv_offset is not set (-1) for local keys */
typedef int MXFMetadataReadFunc(void *arg, AVIOContext *pb, int tag, int size, UID uid, int64_t klv_offset);
typedef struct {
typedef struct MXFMetadataReadTableEntry {
const UID key;
MXFMetadataReadFunc *read;
int ctx_size;
......
......@@ -50,19 +50,19 @@ extern AVOutputFormat ff_mxf_d10_muxer;
#define EDIT_UNITS_PER_BODY 250
#define KAG_SIZE 512
typedef struct {
typedef struct MXFLocalTagPair {
int local_tag;
UID uid;
} MXFLocalTagPair;
typedef struct {
typedef struct MXFIndexEntry {
uint8_t flags;
uint64_t offset;
unsigned slice_offset; ///< offset of audio slice
uint16_t temporal_ref;
} MXFIndexEntry;
typedef struct {
typedef struct MXFStreamContext {
AudioInterleaveContext aic;
UID track_essence_element_key;
int index; ///< index in mxf_essence_container_uls table
......@@ -74,7 +74,7 @@ typedef struct {
int closed_gop; ///< gop is closed, used in mpeg-2 frame parsing
} MXFStreamContext;
typedef struct {
typedef struct MXFContainerEssenceEntry {
UID container_ul;
UID element_ul;
UID codec_ul;
......
......@@ -165,7 +165,7 @@ typedef struct NSVStream {
int cum_len; /* temporary storage (used during seek) */
} NSVStream;