avcodec: Don't anonymously typedef structs

This commit is contained in:
Diego Biurrun 2014-09-22 11:01:31 +02:00
parent daf8cf358a
commit 7f9f771eac
51 changed files with 79 additions and 86 deletions

View File

@ -160,7 +160,7 @@ typedef struct AacPsyContext{
/**
* LAME psy model preset struct
*/
typedef struct {
typedef struct PsyLamePreset {
int quality; ///< Quality to map the rest of the vaules to.
/* This is overloaded to be both kbps per channel in ABR mode, and
* requested quality in constant quality mode.

View File

@ -452,7 +452,7 @@ static void calc_transform_coeffs_cpl(AC3DecodeContext *s)
/**
* Grouped mantissas for 3-level 5-level and 11-level quantization
*/
typedef struct {
typedef struct mant_groups {
int b1_mant[2];
int b2_mant[2];
int b4_mant;

View File

@ -58,7 +58,7 @@
#define ALAC_EXTRADATA_SIZE 36
typedef struct {
typedef struct ALACContext {
AVCodecContext *avctx;
GetBitContext gb;
int channels;

View File

@ -152,7 +152,7 @@ enum RA_Flag {
};
typedef struct {
typedef struct ALSSpecificConfig {
uint32_t samples; ///< number of samples, 0xFFFFFFFF if unknown
int resolution; ///< 000 = 8-bit; 001 = 16-bit; 010 = 24-bit; 011 = 32-bit
int floating; ///< 1 = IEEE 32-bit floating-point, 0 = integer
@ -178,7 +178,7 @@ typedef struct {
} ALSSpecificConfig;
typedef struct {
typedef struct ALSChannelData {
int stop_flag;
int master_channel;
int time_diff_flag;
@ -188,7 +188,7 @@ typedef struct {
} ALSChannelData;
typedef struct {
typedef struct ALSDecContext {
AVCodecContext *avctx;
ALSSpecificConfig sconf;
GetBitContext gb;
@ -227,7 +227,7 @@ typedef struct {
} ALSDecContext;
typedef struct {
typedef struct ALSBlockData {
unsigned int block_length; ///< number of samples within the block
unsigned int ra_block; ///< if true, this is a random access block
int *const_block; ///< if true, this is a constant value block

View File

@ -42,7 +42,7 @@
#include "amrwbdata.h"
typedef struct {
typedef struct AMRWBContext {
AMRWBFrame frame; ///< AMRWB parameters decoded from bitstream
enum Mode fr_cur_mode; ///< mode index of current frame
uint8_t fr_quality; ///< frame quality index (FQI)

View File

@ -49,7 +49,7 @@ static const uint8_t ansi_to_cga[16] = {
0, 4, 2, 6, 1, 5, 3, 7, 8, 12, 10, 14, 9, 13, 11, 15
};
typedef struct {
typedef struct AnsiContext {
AVFrame *frame;
int x; /**< x cursor position (pixels) */
int y; /**< y cursor position (pixels) */

View File

@ -57,7 +57,7 @@
/**
* Sound unit struct, one unit is used per channel
*/
typedef struct {
typedef struct AT1SUCtx {
int log2_block_count[AT1_QMF_BANDS]; ///< log2 number of blocks in a band
int num_bfus; ///< number of Block Floating Units
float* spectrum[2];
@ -71,7 +71,7 @@ typedef struct {
/**
* The atrac1 context, holds all needed parameters for decoding
*/
typedef struct {
typedef struct AT1Ctx {
AT1SUCtx SUs[AT1_MAX_CHANNELS]; ///< channel sound unit
DECLARE_ALIGNED(32, float, spec)[AT1_SU_SAMPLES]; ///< the mdct spectrum buffer

View File

@ -23,8 +23,7 @@
#include "get_bits.h"
#include "internal.h"
typedef struct {
typedef struct AvsContext {
AVFrame *frame;
} AvsContext;

View File

@ -44,7 +44,7 @@ static float quant_table[96];
#define MAX_CHANNELS 2
#define BINK_BLOCK_MAX_SIZE (MAX_CHANNELS << 11)
typedef struct {
typedef struct BinkAudioContext {
GetBitContext gb;
int version_b; ///< Bink version 'b'
int first;

View File

@ -129,7 +129,7 @@ static av_always_inline uint32_t bitswap_32(uint32_t x)
(uint32_t)ff_reverse[ x >> 24];
}
typedef struct {
typedef struct VLCcode {
uint8_t bits;
uint16_t symbol;
/** codeword, with the first bit-to-be-read in the msb

View File

@ -23,7 +23,7 @@
#include "bytestream.h"
#include "internal.h"
typedef struct {
typedef struct C93DecoderContext {
AVFrame *pictures[2];
int currentpic;
} C93DecoderContext;

View File

@ -31,7 +31,7 @@
#define BIT_LINE 0x80
#define BYTE_LINE 0xC0
typedef struct {
typedef struct CDXLVideoContext {
AVCodecContext *avctx;
int bpp;
int format;

View File

@ -40,14 +40,14 @@
#include "internal.h"
typedef struct {
typedef struct cvid_codebook {
uint8_t y0, y1, y2, y3;
uint8_t u, v;
} cvid_codebook;
#define MAX_STRIPS 32
typedef struct {
typedef struct cvid_strip {
uint16_t id;
uint16_t x1, y1;
uint16_t x2, y2;

View File

@ -64,12 +64,12 @@
#define SUBBAND_SIZE 20
#define MAX_SUBPACKETS 5
typedef struct {
typedef struct cook_gains {
int *now;
int *previous;
} cook_gains;
typedef struct {
typedef struct COOKSubpacket {
int ch_idx;
int size;
int num_channels;

View File

@ -30,7 +30,7 @@
#endif
#include "libavutil/lzo.h"
typedef struct {
typedef struct CamStudioContext {
int linelen, height, bpp;
unsigned int decomp_size;
unsigned char* decomp_buf;

View File

@ -266,7 +266,7 @@ static const int8_t dca_channel_reorder_nolfe_xch[][9] = {
#define DCA_NSYNCAUX 0x9A1105A0
/** Bit allocation */
typedef struct {
typedef struct BitAlloc {
int offset; ///< code values offset
int maxbits[8]; ///< max bits in VLC
int wrap; ///< wrap for get_vlc2()
@ -285,7 +285,7 @@ static av_always_inline int get_bitalloc(GetBitContext *gb, BitAlloc *ba,
ba->offset;
}
typedef struct {
typedef struct DCAContext {
AVClass *class; ///< class for AVOptions
AVCodecContext *avctx;
/* Frame header */

View File

@ -43,7 +43,7 @@ typedef struct cell_s {
/**
* ELBG internal data
*/
typedef struct{
typedef struct elbg_data {
int error;
int dim;
int numCB;

View File

@ -55,7 +55,7 @@ enum Rate {
/**
* G723.1 unpacked data subframe
*/
typedef struct {
typedef struct G723_1_Subframe {
int ad_cb_lag; ///< adaptive codebook lag
int ad_cb_gain;
int dirac_train;
@ -68,7 +68,7 @@ typedef struct {
/**
* Pitch postfilter parameters
*/
typedef struct {
typedef struct PPFParam {
int index; ///< postfilter backward/forward lag
int16_t opt_gain; ///< optimal gain
int16_t sc_gain; ///< scaling gain

View File

@ -52,7 +52,7 @@
#include "put_bits.h"
typedef struct {
typedef struct GIFContext {
LZWState *lzw;
uint8_t *buf;
} GIFContext;

View File

@ -33,7 +33,7 @@
/* symbol for Huffman tree node */
#define HNODE -1
typedef struct {
typedef struct HeapElem {
uint64_t val;
int name;
} HeapElem;

View File

@ -56,8 +56,7 @@
#define HUF_TOKENS 256
#define PALETTE_COUNT 256
typedef struct
{
typedef struct hnode {
int count;
unsigned char used;
int children[2];

View File

@ -33,7 +33,7 @@
#include "get_bits.h"
#include "internal.h"
typedef struct {
typedef struct IffContext {
AVFrame *frame;
int planesize;
uint8_t * planebuf;

View File

@ -79,7 +79,7 @@ typedef struct IMCChannel {
int decoder_reset;
} IMCChannel;
typedef struct {
typedef struct IMCContext {
IMCChannel chctx[2];
/** MDCT tables */

View File

@ -30,7 +30,7 @@
#include "avcodec.h"
#include "internal.h"
typedef struct {
typedef struct KgvContext {
AVCodecContext *avctx;
uint16_t *frame_buffer;
uint16_t *last_frame_buffer;

View File

@ -74,7 +74,7 @@ static const enum AVPixelFormat any_pix_fmts[] = {
RGB_PIXEL_FORMATS, GRAY_PIXEL_FORMATS, YUV_PIXEL_FORMATS, XYZ_PIXEL_FORMATS
};
typedef struct {
typedef struct LibOpenJPEGContext {
AVClass *class;
opj_dparameters_t dec_params;
int lowres;

View File

@ -34,7 +34,7 @@
#include "avcodec.h"
#include "internal.h"
typedef struct {
typedef struct LibOpenJPEGContext {
AVClass *avclass;
opj_image_t *image;
opj_cparameters_t enc_params;

View File

@ -28,7 +28,7 @@
#include "avcodec.h"
#include "internal.h"
typedef struct {
typedef struct LibSpeexContext {
SpeexBits bits;
SpeexStereoState stereo;
void *dec_state;

View File

@ -92,7 +92,7 @@
#include "internal.h"
#include "audio_frame_queue.h"
typedef struct {
typedef struct LibSpeexEncContext {
AVClass *class; ///< AVClass for private options
SpeexBits bits; ///< libspeex bitwriter context
SpeexHeader header; ///< libspeex header struct

View File

@ -35,7 +35,7 @@
#define MIMIC_HEADER_SIZE 20
typedef struct {
typedef struct MimicContext {
AVCodecContext *avctx;
int num_vblocks[3];

View File

@ -32,7 +32,7 @@
#include "internal.h"
#include "rtjpeg.h"
typedef struct {
typedef struct NuvContext {
AVFrame *pic;
int codec_frameheader;
int quality;

View File

@ -40,7 +40,7 @@
#include "proresdsp.h"
#include "get_bits.h"
typedef struct {
typedef struct ProresThreadData {
const uint8_t *index; ///< pointers to the data of this slice
int slice_num;
int x_pos, y_pos;
@ -51,7 +51,7 @@ typedef struct {
DECLARE_ALIGNED(16, int16_t, qmat_chroma_scaled)[64];
} ProresThreadData;
typedef struct {
typedef struct ProresContext {
ProresDSPContext dsp;
AVFrame *frame;
ScanTable scantable;

View File

@ -52,7 +52,7 @@ typedef enum {
RATE_FULL
} qcelp_packet_rate;
typedef struct {
typedef struct QCELPContext {
GetBitContext gb;
qcelp_packet_rate bitrate;
QCELPFrame frame; /**< unpacked data frame */

View File

@ -83,7 +83,7 @@ typedef int8_t sb_int8_array[2][30][64];
/**
* Subpacket
*/
typedef struct {
typedef struct QDM2SubPacket {
int type; ///< subpacket type
unsigned int size; ///< subpacket size
const uint8_t *data; ///< pointer to subpacket data (points to input data buffer, it's not a private copy)
@ -97,12 +97,12 @@ typedef struct QDM2SubPNode {
struct QDM2SubPNode *next; ///< pointer to next packet in the list, NULL if leaf node
} QDM2SubPNode;
typedef struct {
typedef struct QDM2Complex {
float re;
float im;
} QDM2Complex;
typedef struct {
typedef struct FFTTone {
float level;
QDM2Complex *complex;
const float *table;
@ -113,7 +113,7 @@ typedef struct {
short cutoff;
} FFTTone;
typedef struct {
typedef struct FFTCoefficient {
int16_t sub_packet;
uint8_t channel;
int16_t offset;
@ -121,14 +121,14 @@ typedef struct {
uint8_t phase;
} FFTCoefficient;
typedef struct {
typedef struct QDM2FFT {
DECLARE_ALIGNED(32, QDM2Complex, complex)[MPA_MAX_CHANNELS][256];
} QDM2FFT;
/**
* QDM2 decoder context
*/
typedef struct {
typedef struct QDM2Context {
/// Parameters from codec header, do not change during playback
int nb_channels; ///< number of channels
int channels; ///< number of channels

View File

@ -37,7 +37,7 @@
#define RA288_BLOCK_SIZE 5
#define RA288_BLOCKS_PER_FRAME 32
typedef struct {
typedef struct RA288Context {
AVFloatDSPContext fdsp;
DECLARE_ALIGNED(32, float, sp_lpc)[FFALIGN(36, 16)]; ///< LPC coefficients for speech data (spec: A)
DECLARE_ALIGNED(32, float, gain_lpc)[FFALIGN(10, 16)]; ///< LPC coefficients for gain (spec: GB)

View File

@ -32,8 +32,7 @@
#define MAX_DPCM (127*127)
typedef struct
{
typedef struct ROQDPCMContext {
short lastSample[2];
int input_frames;
int buffered_samples;

View File

@ -183,8 +183,7 @@ static inline int squared_diff_macroblock(uint8_t a[], uint8_t b[], int size)
return sdiff;
}
typedef struct
{
typedef struct SubcelEvaluation {
int eval_dist[4];
int best_bit_use;
int best_coding;
@ -194,8 +193,7 @@ typedef struct
int cbEntry;
} SubcelEvaluation;
typedef struct
{
typedef struct CelEvaluation {
int eval_dist[4];
int best_coding;
@ -207,8 +205,7 @@ typedef struct
int sourceX, sourceY;
} CelEvaluation;
typedef struct
{
typedef struct RoqCodebooks {
int numCB4;
int numCB2;
int usedCB2[MAX_CBS_2x2];
@ -602,8 +599,7 @@ static inline uint8_t motion_arg(motion_vect mot)
return ((ax&15)<<4) | (ay&15);
}
typedef struct
{
typedef struct CodingSpool {
int typeSpool;
int typeSpoolLength;
uint8_t argumentSpool[64];

View File

@ -27,7 +27,7 @@
#include "parser.h"
#include "libavutil/intreadwrite.h"
typedef struct {
typedef struct RV34ParseContext {
ParseContext pc;
int64_t key_dts;
int key_pts;

View File

@ -44,7 +44,7 @@
#include "sipr.h"
#include "siprdata.h"
typedef struct {
typedef struct SiprModeParam {
const char *mode_name;
uint16_t bits_per_frame;
uint8_t subframe_count;

View File

@ -41,7 +41,7 @@ enum {
PARAM_NUMBER
};
typedef struct {
typedef struct SrtStack {
char tag[128];
char param[PARAM_NUMBER][128];
} SrtStack;

View File

@ -68,7 +68,7 @@
* svq3 decoder.
*/
typedef struct {
typedef struct SVQ3Context {
H264Context h;
HpelDSPContext hdsp;
TpelDSPContext tdsp;

View File

@ -35,7 +35,7 @@
/**
* TrueSpeech decoder context
*/
typedef struct {
typedef struct TSContext {
BswapDSPContext bdsp;
/* input data */
DECLARE_ALIGNED(16, uint8_t, buffer)[32];

View File

@ -23,7 +23,7 @@
#include "libavutil/opt.h"
#include "libavutil/pixfmt.h"
typedef struct {
typedef struct V210EncContext {
void (*pack_line_8)(const uint8_t *y, const uint8_t *u,
const uint8_t *v, uint8_t *dst, ptrdiff_t width);
void (*pack_line_10)(const uint16_t *y, const uint16_t *u,

View File

@ -32,7 +32,7 @@
#include "internal.h"
#include "mathops.h"
typedef struct {
typedef struct VBLEContext {
AVCodecContext *avctx;
HuffYUVDSPContext hdsp;

View File

@ -47,7 +47,7 @@ typedef enum {
ONE
} VC1ParseSearchState;
typedef struct {
typedef struct VC1ParseContext {
ParseContext pc;
VC1Context v;
uint8_t prev_start_code;

View File

@ -38,7 +38,7 @@
#if CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER
typedef struct {
typedef struct SpriteData {
/**
* Transform coefficients for both sprites in 16.16 fixed point format,
* in the order they appear in the bitstream:

View File

@ -42,7 +42,7 @@
#define V_MAX_VLCS (1 << 16)
#define V_MAX_PARTITIONS (1 << 20)
typedef struct {
typedef struct vorbis_codebook {
uint8_t dimensions;
uint8_t lookup_type;
uint8_t maxdepth;
@ -58,7 +58,7 @@ struct vorbis_context_s;
typedef
int (* vorbis_floor_decode_func)
(struct vorbis_context_s *, vorbis_floor_data *, float *);
typedef struct {
typedef struct vorbis_floor {
uint8_t floor_type;
vorbis_floor_decode_func decode;
union vorbis_floor_u {
@ -88,7 +88,7 @@ typedef struct {
} data;
} vorbis_floor;
typedef struct {
typedef struct vorbis_residue {
uint16_t type;
uint32_t begin;
uint32_t end;
@ -101,7 +101,7 @@ typedef struct {
uint8_t *classifs;
} vorbis_residue;
typedef struct {
typedef struct vorbis_mapping {
uint8_t submaps;
uint16_t coupling_steps;
uint8_t *magnitude;
@ -111,7 +111,7 @@ typedef struct {
uint8_t submap_residue[16];
} vorbis_mapping;
typedef struct {
typedef struct vorbis_mode {
uint8_t blockflag;
uint16_t windowtype;
uint16_t transformtype;

View File

@ -39,7 +39,7 @@
#undef NDEBUG
#include <assert.h>
typedef struct {
typedef struct vorbis_enc_codebook {
int nentries;
uint8_t *lens;
uint32_t *codewords;
@ -53,14 +53,14 @@ typedef struct {
float *pow2;
} vorbis_enc_codebook;
typedef struct {
typedef struct vorbis_enc_floor_class {
int dim;
int subclass;
int masterbook;
int *books;
} vorbis_enc_floor_class;
typedef struct {
typedef struct vorbis_enc_floor {
int partitions;
int *partition_to_class;
int nclasses;
@ -71,7 +71,7 @@ typedef struct {
vorbis_floor1_entry *list;
} vorbis_enc_floor;
typedef struct {
typedef struct vorbis_enc_residue {
int type;
int begin;
int end;
@ -82,7 +82,7 @@ typedef struct {
float (*maxes)[2];
} vorbis_enc_residue;
typedef struct {
typedef struct vorbis_enc_mapping {
int submaps;
int *mux;
int *floor;
@ -92,12 +92,12 @@ typedef struct {
int *angle;
} vorbis_enc_mapping;
typedef struct {
typedef struct vorbis_enc_mode {
int blockflag;
int mapping;
} vorbis_enc_mode;
typedef struct {
typedef struct vorbis_enc_context {
int channels;
int sample_rate;
int log2_blocksize[2];

View File

@ -50,7 +50,7 @@
/**
* @brief frame-specific decoder context for a single channel
*/
typedef struct {
typedef struct WmallChannelCtx {
int16_t prev_block_len; ///< length of the previous block
uint8_t transmit_coefs;
uint8_t num_subframes;

View File

@ -132,7 +132,7 @@ static float sin64[33]; ///< sine table for decorrelation
/**
* @brief frame specific decoder context for a single channel
*/
typedef struct {
typedef struct WMAProChannelCtx {
int16_t prev_block_len; ///< length of the previous block
uint8_t transmit_coefs;
uint8_t num_subframes;
@ -157,7 +157,7 @@ typedef struct {
/**
* @brief channel group for channel transformations
*/
typedef struct {
typedef struct WMAProChannelGrp {
uint8_t num_channels; ///< number of channels in the group
int8_t transform; ///< transform on / off
int8_t transform_band[MAX_BANDS]; ///< controls if the transform is enabled for a certain band

View File

@ -131,7 +131,7 @@ static const struct frame_type_desc {
/**
* WMA Voice decoding context.
*/
typedef struct {
typedef struct WMAVoiceContext {
/**
* @name Global values specified in the stream header / extradata or used all over.
* @{

View File

@ -22,7 +22,7 @@
#include "internal.h"
#include "libavutil/common.h"
typedef struct {
typedef struct ZeroCodecContext {
AVFrame *previous_frame;
z_stream zstream;
} ZeroCodecContext;