Commit e4cbf752 authored by Diego Biurrun's avatar Diego Biurrun

Give all anonymously typedeffed structs in headers a name

Anonymous structs cannot be forward declared and have no benefit.
parent 76f644d9
......@@ -121,7 +121,7 @@ typedef struct SpecifierOpt {
} u;
} SpecifierOpt;
typedef struct {
typedef struct OptionDef {
const char *name;
int flags;
#define HAS_ARG 0x0001
......@@ -356,7 +356,7 @@ int read_yesno(void);
*/
int cmdutils_read_file(const char *filename, char **bufptr, size_t *size);
typedef struct {
typedef struct PtsCorrectionContext {
int64_t num_faulty_pts; /// Number of incorrect PTS values so far
int64_t num_faulty_dts; /// Number of incorrect DTS values so far
int64_t last_pts; /// PTS of the last frame
......
......@@ -113,7 +113,7 @@ enum OCStatus {
OC_LOCKED, ///< Output configuration locked in place
};
typedef struct {
typedef struct OutputConfiguration {
MPEG4AudioConfig m4ac;
uint8_t layout_map[MAX_ELEM_ID*4][3];
int layout_map_tags;
......@@ -125,7 +125,7 @@ typedef struct {
/**
* Predictor State
*/
typedef struct {
typedef struct PredictorState {
float cor0;
float cor1;
float var0;
......@@ -146,7 +146,7 @@ typedef struct {
/**
* Long Term Prediction
*/
typedef struct {
typedef struct LongTermPrediction {
int8_t present;
int16_t lag;
float coef;
......@@ -156,7 +156,7 @@ typedef struct {
/**
* Individual Channel Stream
*/
typedef struct {
typedef struct IndividualChannelStream {
uint8_t max_sfb; ///< number of scalefactor bands per group
enum WindowSequence window_sequence[2];
uint8_t use_kb_window[2]; ///< If set, use Kaiser-Bessel window, otherwise use a sinus window.
......@@ -177,7 +177,7 @@ typedef struct {
/**
* Temporal Noise Shaping
*/
typedef struct {
typedef struct TemporalNoiseShaping {
int present;
int n_filt[8];
int length[8][4];
......@@ -189,7 +189,7 @@ typedef struct {
/**
* Dynamic Range Control - decoded from the bitstream but not processed further.
*/
typedef struct {
typedef struct DynamicRangeControl {
int pce_instance_tag; ///< Indicates with which program the DRC info is associated.
int dyn_rng_sgn[17]; ///< DRC sign information; 0 - positive, 1 - negative
int dyn_rng_ctl[17]; ///< DRC magnitude information
......@@ -202,7 +202,7 @@ typedef struct {
*/
} DynamicRangeControl;
typedef struct {
typedef struct Pulse {
int num_pulse;
int start;
int pos[4];
......@@ -212,7 +212,7 @@ typedef struct {
/**
* coupling parameters
*/
typedef struct {
typedef struct ChannelCoupling {
enum CouplingPoint coupling_point; ///< The point during decoding at which coupling is applied.
int num_coupled; ///< number of target elements
enum RawDataBlockType type[8]; ///< Type of channel element to be coupled - SCE or CPE.
......@@ -226,7 +226,7 @@ typedef struct {
/**
* Single Channel Element - used for both SCE and LFE elements.
*/
typedef struct {
typedef struct SingleChannelElement {
IndividualChannelStream ics;
TemporalNoiseShaping tns;
Pulse pulse;
......@@ -245,7 +245,7 @@ typedef struct {
/**
* channel element - generic struct for SCE/CPE/CCE/LFE
*/
typedef struct {
typedef struct ChannelElement {
// CPE specific
int common_window; ///< Set if channels share a common 'IndividualChannelStream' in bitstream.
int ms_mode; ///< Signals mid/side stereo flags coding mode (used by encoder)
......@@ -260,7 +260,7 @@ typedef struct {
/**
* main AAC context
*/
typedef struct {
typedef struct AACContext {
AVCodecContext *avctx;
AVFrame frame;
......
......@@ -28,7 +28,7 @@
#define AAC_ADTS_HEADER_SIZE 7
typedef struct {
typedef struct AACADTSHeaderInfo {
uint32_t sample_rate;
uint32_t samples;
uint32_t bit_rate;
......
......@@ -38,7 +38,7 @@
#define PS_AP_LINKS 3
#define PS_MAX_AP_DELAY 5
typedef struct {
typedef struct PSContext {
int start;
int enable_iid;
int iid_quant;
......
......@@ -91,7 +91,7 @@ typedef struct AC3BitAllocParameters {
* @struct AC3HeaderInfo
* Coded AC-3 header values up to the lfeon element, plus derived values.
*/
typedef struct {
typedef struct AC3HeaderInfo {
/** @name Coded elements
* @{
*/
......
......@@ -65,7 +65,7 @@
/** Large enough for maximum possible frame size when the specification limit is ignored */
#define AC3_FRAME_BUFFER_SIZE 32768
typedef struct {
typedef struct AC3DecodeContext {
AVClass *class; ///< class for AVOptions
AVCodecContext *avctx; ///< parent context
AVFrame frame; ///< AVFrame for decoded output
......
......@@ -26,7 +26,7 @@
#include <stdint.h>
/** Sparse representation for the algebraic codebook (fixed) vector */
typedef struct {
typedef struct AMRFixed {
int n;
int x[10];
float y[10];
......
......@@ -35,11 +35,11 @@
#include "avcodec.h"
typedef struct {
typedef struct ADXChannelState {
int s1,s2;
} ADXChannelState;
typedef struct {
typedef struct ADXContext {
AVFrame frame;
int channels;
ADXChannelState prev[2];
......
......@@ -55,7 +55,7 @@ enum Mode {
/**
* AMRNB unpacked data subframe
*/
typedef struct {
typedef struct AMRNBSubframe {
uint16_t p_lag; ///< index to decode the pitch lag
uint16_t p_gain; ///< index to decode the pitch gain
uint16_t fixed_gain; ///< index to decode the fixed gain factor, for MODE_12k2 and MODE_7k95
......@@ -65,7 +65,7 @@ typedef struct {
/**
* AMRNB unpacked data frame
*/
typedef struct {
typedef struct AMRNBFrame {
uint16_t lsf[5]; ///< lsf parameters: 5 parameters for MODE_12k2, only 3 for other modes
AMRNBSubframe subframe[4]; ///< unpacked data for each subframe
} AMRNBFrame;
......
......@@ -66,7 +66,7 @@ enum Mode {
/* All decoded parameters in these structs must be 2 bytes long
* because of the direct indexing at the frame parsing */
typedef struct {
typedef struct AMRWBSubFrame {
uint16_t adap; ///< adaptive codebook index
uint16_t ltp; ///< ltp-filtering flag
uint16_t vq_gain; ///< VQ adaptive and innovative gains
......@@ -75,7 +75,7 @@ typedef struct {
uint16_t pul_il[4]; ///< LSBs part of codebook index
} AMRWBSubFrame;
typedef struct {
typedef struct AMRWBFrame {
uint16_t vad; ///< voice activity detection flag
uint16_t isp_id[7]; ///< index of ISP subvectors
AMRWBSubFrame subframe[4]; ///< data for subframes
......
......@@ -29,11 +29,11 @@
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
typedef struct {
typedef struct GetByteContext {
const uint8_t *buffer, *buffer_end, *buffer_start;
} GetByteContext;
typedef struct {
typedef struct PutByteContext {
uint8_t *buffer, *buffer_end, *buffer_start;
int eof;
} PutByteContext;
......
......@@ -152,7 +152,7 @@ struct dec_2dvlc {
int8_t max_run;
};
typedef struct {
typedef struct AVSContext {
MpegEncContext s;
CAVSDSPContext cdsp;
Picture picture; ///< currently decoded frame
......
......@@ -31,7 +31,7 @@
#include "avcodec.h"
#include "get_bits.h"
typedef struct {
typedef struct dirac_source_params {
unsigned width;
unsigned height;
uint8_t chroma_format; ///< 0: 444 1: 422 2: 420
......
......@@ -25,7 +25,7 @@
#include <stdint.h>
#include "avcodec.h"
typedef struct {
typedef struct CIDEntry {
int cid;
unsigned int width, height;
int interlaced;
......
......@@ -29,12 +29,12 @@
#include "mpegvideo.h"
#include "dnxhddata.h"
typedef struct {
typedef struct RCCMPEntry {
uint16_t mb;
int value;
} RCCMPEntry;
typedef struct {
typedef struct RCEntry {
int ssd;
int bits;
} RCEntry;
......
......@@ -26,7 +26,7 @@
typedef int DWTELEM;
typedef short IDWTELEM;
typedef struct {
typedef struct DWTCompose {
IDWTELEM *b0;
IDWTELEM *b1;
IDWTELEM *b2;
......
......@@ -30,7 +30,7 @@
#define PREV_SAMPLES_BUF_SIZE 1024
typedef struct {
typedef struct G722Context {
const AVClass *class;
AVFrame frame;
int bits_per_codeword;
......
......@@ -25,7 +25,7 @@
#include <stdint.h>
#include "avcodec.h"
typedef struct {
typedef struct GSMContext {
AVFrame frame;
// Contains first 120 elements from the previous frame
// (used by long_term_synth according to the "lag"),
......
......@@ -29,7 +29,7 @@
#include "avcodec.h"
#include "get_bits.h"
typedef struct {
typedef struct Node {
int16_t sym;
int16_t n0;
uint32_t count;
......
......@@ -320,7 +320,7 @@ static const int32_t delta_tab_3_4_m10[79] = { TAB_3_4 };
static const int32_t delta_tab_3_5_m10[79] = { TAB_3_5 };
typedef struct {
typedef struct vqEntry {
const int16_t *deltas; ///< delta tables for 4x4 block modes
const int32_t *deltas_m10; ///< delta tables for 8x8 block modes
uint8_t num_dyads; ///< number of two-pixel deltas
......
......@@ -23,7 +23,7 @@
#include "mpegvideo.h"
#include "intrax8dsp.h"
typedef struct{
typedef struct IntraX8Context {
VLC * j_ac_vlc[4];//they point to the static j_mb_vlc
VLC * j_orient_vlc;
VLC * j_dc_vlc[3];
......
......@@ -40,7 +40,7 @@
/**
* huffman codebook descriptor
*/
typedef struct {
typedef struct IVIHuffDesc {
int32_t num_rows;
uint8_t xbits[16];
} IVIHuffDesc;
......@@ -48,7 +48,7 @@ typedef struct {
/**
* macroblock/block huffman table descriptor
*/
typedef struct {
typedef struct IVIHuffTab {
int32_t tab_sel; /// index of one of the predefined tables
/// or "7" for custom one
VLC *tab; /// pointer to the table associated with tab_sel
......@@ -85,7 +85,7 @@ typedef void (DCTransformPtr) (const int32_t *in, int16_t *out, uint32_t pitch,
/**
* run-value (RLE) table descriptor
*/
typedef struct {
typedef struct RVMapDesc {
uint8_t eob_sym; ///< end of block symbol
uint8_t esc_sym; ///< escape symbol
uint8_t runtab[256];
......@@ -98,7 +98,7 @@ extern const RVMapDesc ff_ivi_rvmap_tabs[9];
/**
* information for Indeo macroblock (16x16, 8x8 or 4x4)
*/
typedef struct {
typedef struct IVIMbInfo {
int16_t xpos;
int16_t ypos;
uint32_t buf_offs; ///< address in the output buffer for this mb
......@@ -113,7 +113,7 @@ typedef struct {
/**
* information for Indeo tile
*/
typedef struct {
typedef struct IVITile {
int xpos;
int ypos;
int width;
......@@ -130,7 +130,7 @@ typedef struct {
/**
* information for Indeo wavelet band
*/
typedef struct {
typedef struct IVIBandDesc {
int plane; ///< plane number this band belongs to
int band_num; ///< band number
int width;
......@@ -177,7 +177,7 @@ typedef struct {
/**
* color plane (luma or chroma) information
*/
typedef struct {
typedef struct IVIPlaneDesc {
uint16_t width;
uint16_t height;
uint8_t num_bands; ///< number of bands this plane subdivided into
......@@ -185,7 +185,7 @@ typedef struct {
} IVIPlaneDesc;
typedef struct {
typedef struct IVIPicConfig {
uint16_t pic_width;
uint16_t pic_height;
uint16_t chroma_width;
......
......@@ -31,7 +31,7 @@
#include "avcodec.h"
typedef struct {
typedef struct SchroVideoFormatInfo {
uint16_t width;
uint16_t height;
uint16_t frame_rate_num;
......
......@@ -71,7 +71,7 @@
#define IIR 1
/** filter data */
typedef struct {
typedef struct FilterParams {
uint8_t order; ///< number of taps in filter
uint8_t shift; ///< Right shift to apply to output of filter.
......@@ -79,7 +79,7 @@ typedef struct {
} FilterParams;
/** sample data coding information */
typedef struct {
typedef struct ChannelParams {
FilterParams filter_params[NUM_FILTERS];
int32_t coeff[NUM_FILTERS][MAX_FIR_ORDER];
......
......@@ -41,7 +41,7 @@
#define MPC_FRAME_SIZE (BANDS * SAMPLES_PER_BAND)
/** Subband structure - hold all variables for each subband */
typedef struct {
typedef struct Band {
int msf; ///< mid-stereo flag
int res[2];
int scfi[2];
......@@ -49,7 +49,7 @@ typedef struct {
int Q[2];
}Band;
typedef struct {
typedef struct MPCContext {
AVFrame frame;
DSPContext dsp;
MPADSPContext mpadsp;
......
......@@ -26,7 +26,7 @@
#include "get_bits.h"
#include "put_bits.h"
typedef struct {
typedef struct MPEG4AudioConfig {
int object_type;
int sampling_index;
int sample_rate;
......
......@@ -27,7 +27,7 @@
#define PRORES_BITS_PER_SAMPLE 10 ///< output precision of prores decoder
typedef struct {
typedef struct ProresDSPContext {
int idct_permutation_type;
uint8_t idct_permutation[64];
int dct_permutation_type;
......
......@@ -37,7 +37,7 @@
/**
* QCELP unpacked data frame
*/
typedef struct {
typedef struct QCELPFrame {
/// @name QCELP excitation codebook parameters
/// @{
uint8_t cbsign[16]; ///< sign of the codebook gain for each codebook subframe
......@@ -73,7 +73,7 @@ typedef struct {
*/
static const float qcelp_hammsinc_table[4] = { -0.006822, 0.041249, -0.143459, 0.588863};
typedef struct {
typedef struct QCELPBitmap {
uint8_t index; /**< index into the QCELPContext structure */
uint8_t bitpos; /**< position of the lowest bit in the value's byte */
uint8_t bitlen; /**< number of bits to read */
......
......@@ -33,7 +33,7 @@
#define FRAMESIZE 20 ///< size of encoded frame
#define LPC_ORDER 10 ///< order of LPC filter
typedef struct {
typedef struct RA144Context {
AVCodecContext *avctx;
AVFrame frame;
LPCContext lpc_ctx;
......
......@@ -27,16 +27,16 @@
#include "bytestream.h"
#include "dsputil.h"
typedef struct {
typedef struct roq_cell {
unsigned char y[4];
unsigned char u, v;
} roq_cell;
typedef struct {
typedef struct roq_qcell {
int idx[4];
} roq_qcell;
typedef struct {
typedef struct motion_vect {
int d[2];
} motion_vect;
......
......@@ -29,7 +29,7 @@
#define RTJPEG_FILE_VERSION 0
#define RTJPEG_HEADER_SIZE 12
typedef struct {
typedef struct RTJpegContext {
int w, h;
DSPContext *dsp;
uint8_t scan[64];
......
......@@ -37,7 +37,7 @@
/**
* Spectral Band Replication header - spectrum parameters that invoke a reset if they differ from the previous header.
*/
typedef struct {
typedef struct SpectrumParameters {
uint8_t bs_start_freq;
uint8_t bs_stop_freq;
uint8_t bs_xover_band;
......@@ -57,7 +57,7 @@ typedef struct {
/**
* Spectral Band Replication per channel data
*/
typedef struct {
typedef struct SBRData {
/**
* @name Main bitstream data variables
* @{
......@@ -111,7 +111,7 @@ typedef struct {
/**
* Spectral Band Replication
*/
typedef struct {
typedef struct SpectralBandReplication {
int sample_rate;
int start;
int reset;
......
......@@ -29,7 +29,7 @@ extern const uint8_t ff_vorbis_channel_layout_offsets[8][8];
extern const uint8_t ff_vorbis_encoding_channel_layout_offsets[8][8];
extern const uint64_t ff_vorbis_channel_layouts[9];
typedef struct {
typedef struct vorbis_floor1_entry {
uint16_t x;
uint16_t sort;
uint16_t low;
......
......@@ -35,7 +35,7 @@
typedef struct vp56_context VP56Context;
typedef struct {
typedef struct VP56mv {
DECLARE_ALIGNED(4, int16_t, x);
int16_t y;
} VP56mv;
......@@ -52,7 +52,7 @@ typedef int (*VP56ParseCoeffModels)(VP56Context *s);
typedef int (*VP56ParseHeader)(VP56Context *s, const uint8_t *buf,
int buf_size, int *golden_frame);
typedef struct {
typedef struct VP56RangeCoder {
int high;
int bits; /* stored negated (i.e. negative "bits" is a positive number of
bits left) in order to eliminate a negate in cache refilling */
......@@ -61,18 +61,18 @@ typedef struct {
unsigned int code_word;
} VP56RangeCoder;
typedef struct {
typedef struct VP56RefDc {
uint8_t not_null_dc;
VP56Frame ref_frame;
DCTELEM dc_coeff;
} VP56RefDc;
typedef struct {
typedef struct VP56Macroblock {
uint8_t type;
VP56mv mv;
} VP56Macroblock;
typedef struct {
typedef struct VP56Model {
uint8_t coeff_reorder[64]; /* used in vp6 only */
uint8_t coeff_index_to_pos[64]; /* used in vp6 only */
uint8_t vector_sig[2]; /* delta sign */
......
......@@ -51,7 +51,7 @@ typedef enum {
VP56_MB_INTER_V2_GF = 9, /**< Inter MB, second vector, from golden frame */
} VP56mb;
typedef struct {
typedef struct VP56Tree {
int8_t val;
int8_t prob_idx;
} VP56Tree;
......
......@@ -72,13 +72,13 @@ enum inter_splitmvmode {
VP8_SPLITMVMODE_NONE, ///< (only used in prediction) no split MVs
};
typedef struct {
typedef struct VP8FilterStrength {
uint8_t filter_level;
uint8_t inner_limit;
uint8_t inner_filter;
} VP8FilterStrength;
typedef struct {
typedef struct VP8Macroblock {
uint8_t skip;
// todo: make it possible to check for at least (i4x4 or split_mv)
// in one op. are others needed?
......@@ -93,7 +93,7 @@ typedef struct {
VP56mv bmv[16];
} VP8Macroblock;
typedef struct {
typedef struct VP8ThreadData {
DECLARE_ALIGNED(16, DCTELEM, block)[6][4][16];
DECLARE_ALIGNED(16, DCTELEM, block_dc)[16];
/**
......@@ -123,7 +123,7 @@ typedef struct {
} VP8ThreadData;
#define MAX_THREADS 8
typedef struct {
typedef struct VP8Context {
VP8ThreadData *thread_data;
AVCodecContext *avctx;
AVFrame *framep[4];
......
......@@ -42,7 +42,7 @@
#include "libavutil/internal.h"
#include "libavutil/mem.h"
typedef struct {
typedef struct pthread_t {
void *handle;
void *(*func)(void* arg);
void *arg;
......@@ -56,7 +56,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
/* This is the CONDITIONAL_VARIABLE typedef for using Window's native
* conditional variables on kernels 6.0+.
* MinGW does not currently have this typedef. */
typedef struct {
typedef struct pthread_cond_t {
void *ptr;
} pthread_cond_t;
......@@ -117,7 +117,7 @@ static inline int pthread_mutex_unlock(pthread_mutex_t *m)
/* for pre-Windows 6.0 platforms we need to define and use our own condition
* variable and api */
typedef struct {
typedef struct win32_cond_t {
pthread_mutex_t mtx_broadcast;
pthread_mutex_t mtx_waiter_count;
volatile int waiter_count;
......
......@@ -26,7 +26,7 @@
#include "libavcodec/dsputil.h"
#include "libavutil/x86/asm.h"
typedef struct { uint64_t a, b; } xmm_reg;
typedef struct xmm_reg { uint64_t a, b; } xmm_reg;
extern const uint64_t ff_bone;
extern const uint64_t ff_wtwo;
......
......@@ -42,7 +42,7 @@
#define ALSA_BUFFER_SIZE_MAX 32768
typedef struct {
typedef struct AlsaData {
AVClass *class;
snd_pcm_t *h;
int frame_size; ///< preferred size for reads and writes
......
......@@ -28,7 +28,7 @@
#include "libavformat/avformat.h"
#include "libavutil/log.h"
typedef struct {
typedef struct SndioData {
AVClass *class;
struct sio_hdl *hdl;
enum AVCodecID codec_id;
......
......@@ -25,7 +25,7 @@
#include "avfilter.h"
/// Holds instance-specific information for gradfun.
typedef struct {
typedef struct GradFunContext {
int thresh; ///< threshold for gradient algorithm
int radius; ///< blur radius
int chroma_w; ///< width of the chroma planes
......
......@@ -22,7 +22,7 @@
#include "libavutil/pixdesc.h"
#include "avfilter.h"
typedef struct {
typedef struct YADIFContext {
/**
* 0: send 1 frame for each frame
* 1: send 1 frame for each field
......
......@@ -27,7 +27,7 @@
#define PACKET_SIZE 3200
typedef struct {
typedef struct ASFStream {
int num;
unsigned char seq;
/* use for reading */
......@@ -50,7 +50,7 @@ typedef struct {
typedef uint8_t ff_asf_guid[16];
typedef struct {
typedef struct ASFMainHeader {
ff_asf_guid guid; ///< generated by client computer
uint64_t file_size; /**< in bytes
* invalid if broadcasting */
......@@ -76,7 +76,7 @@ typedef struct {
} ASFMainHeader;
typedef struct {
typedef struct ASFIndex {
uint32_t packet_number;
uint16_t packet_count;
} ASFIndex;
......
......@@ -26,7 +26,7 @@
#include "libavutil/fifo.h"
#include "avformat.h"
typedef struct {