doxygen: fix wrong comment syntax, //< vs. ///<

pull/2/head
Diego Biurrun 14 years ago
parent 0138a8dead
commit 0249478756
  1. 6
      avconv.c
  2. 6
      ffmpeg.c
  3. 10
      libavcodec/aac.h
  4. 8
      libavcodec/aacps.c
  5. 8
      libavcodec/aacps.h
  6. 2
      libavcodec/aacps_tablegen.h
  7. 4
      libavcodec/avcodec.h
  8. 4
      libavcodec/mpeg4audio.h
  9. 2
      libavcodec/mpegvideo.h
  10. 2
      libavcodec/snow.c
  11. 14
      libavcodec/truespeech.c
  12. 2
      libavcodec/vp3.c
  13. 2
      libavfilter/vf_drawbox.c

@ -90,9 +90,9 @@ typedef struct StreamMap {
* select an input file for an output file * select an input file for an output file
*/ */
typedef struct MetadataMap { 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
} MetadataMap; } MetadataMap;
static const OptionDef options[]; static const OptionDef options[];

@ -89,9 +89,9 @@ typedef struct StreamMap {
* select an input file for an output file * select an input file for an output file
*/ */
typedef struct MetadataMap { 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
} MetadataMap; } MetadataMap;
typedef struct ChapterMap { typedef struct ChapterMap {

@ -104,11 +104,11 @@ enum CouplingPoint {
* Output configuration status * Output configuration status
*/ */
enum OCStatus { enum OCStatus {
OC_NONE, //< Output unconfigured OC_NONE, ///< Output unconfigured
OC_TRIAL_PCE, //< Output configuration under trial specified by an inband PCE OC_TRIAL_PCE, ///< Output configuration under trial specified by an inband PCE
OC_TRIAL_FRAME, //< Output configuration under trial specified by a frame header OC_TRIAL_FRAME, ///< Output configuration under trial specified by a frame header
OC_GLOBAL_HDR, //< Output configuration set in a global header but not yet locked OC_GLOBAL_HDR, ///< Output configuration set in a global header but not yet locked
OC_LOCKED, //< Output configuration locked in place OC_LOCKED, ///< Output configuration locked in place
}; };
/** /**

@ -28,9 +28,9 @@
#include "aacps_tablegen.h" #include "aacps_tablegen.h"
#include "aacpsdata.c" #include "aacpsdata.c"
#define PS_BASELINE 0 //< Operate in Baseline PS mode #define PS_BASELINE 0 ///< Operate in Baseline PS mode
//< Baseline implies 10 or 20 stereo bands, ///< Baseline implies 10 or 20 stereo bands,
//< mixing mode A, and no ipd/opd ///< mixing mode A, and no ipd/opd
#define numQMFSlots 32 //numTimeSlots * RATE #define numQMFSlots 32 //numTimeSlots * RATE
@ -654,7 +654,7 @@ static void decorrelation(PSContext *ps, float (*out)[32][2], const float (*s)[3
const int8_t *k_to_i = is34 ? k_to_i_34 : k_to_i_20; const int8_t *k_to_i = is34 ? k_to_i_34 : k_to_i_20;
const float peak_decay_factor = 0.76592833836465f; const float peak_decay_factor = 0.76592833836465f;
const float transient_impact = 1.5f; const float transient_impact = 1.5f;
const float a_smooth = 0.25f; //< Smoothing coefficient const float a_smooth = 0.25f; ///< Smoothing coefficient
int i, k, m, n; int i, k, m, n;
int n0 = 0, nL = 32; int n0 = 0, nL = 32;
static const int link_delay[] = { 3, 4, 5 }; static const int link_delay[] = { 3, 4, 5 };

@ -52,11 +52,11 @@ typedef struct {
int num_env; int num_env;
int enable_ipdopd; int enable_ipdopd;
int border_position[PS_MAX_NUM_ENV+1]; int border_position[PS_MAX_NUM_ENV+1];
int8_t iid_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; //<Inter-channel Intensity Difference Parameters int8_t iid_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; ///< Inter-channel Intensity Difference Parameters
int8_t icc_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; //<Inter-Channel Coherence Parameters int8_t icc_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; ///< Inter-Channel Coherence Parameters
/* ipd/opd is iid/icc sized so that the same functions can handle both */ /* ipd/opd is iid/icc sized so that the same functions can handle both */
int8_t ipd_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; //<Inter-channel Phase Difference Parameters int8_t ipd_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; ///< Inter-channel Phase Difference Parameters
int8_t opd_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; //<Overall Phase Difference Parameters int8_t opd_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; ///< Overall Phase Difference Parameters
int is34bands; int is34bands;
int is34bands_old; int is34bands_old;

@ -139,7 +139,7 @@ static void ps_tableinit(void)
} }
for (iid = 0; iid < 46; iid++) { for (iid = 0; iid < 46; iid++) {
float c = iid_par_dequant[iid]; //<Linear Inter-channel Intensity Difference float c = iid_par_dequant[iid]; ///< Linear Inter-channel Intensity Difference
float c1 = (float)M_SQRT2 / sqrtf(1.0f + c*c); float c1 = (float)M_SQRT2 / sqrtf(1.0f + c*c);
float c2 = c * c1; float c2 = c * c1;
for (icc = 0; icc < 8; icc++) { for (icc = 0; icc < 8; icc++) {

@ -2840,8 +2840,8 @@ typedef struct AVCodecContext {
* - decoding: Set by user, otherwise the default is used. * - decoding: Set by user, otherwise the default is used.
*/ */
int thread_type; int thread_type;
#define FF_THREAD_FRAME 1 //< Decode more than one frame at once #define FF_THREAD_FRAME 1 ///< Decode more than one frame at once
#define FF_THREAD_SLICE 2 //< Decode more than one part of a single frame at once #define FF_THREAD_SLICE 2 ///< Decode more than one part of a single frame at once
/** /**
* Which multithreading methods are in use by the codec. * Which multithreading methods are in use by the codec.

@ -31,13 +31,13 @@ typedef struct {
int sampling_index; int sampling_index;
int sample_rate; int sample_rate;
int chan_config; int chan_config;
int sbr; //< -1 implicit, 1 presence int sbr; ///< -1 implicit, 1 presence
int ext_object_type; int ext_object_type;
int ext_sampling_index; int ext_sampling_index;
int ext_sample_rate; int ext_sample_rate;
int ext_chan_config; int ext_chan_config;
int channels; int channels;
int ps; //< -1 implicit, 1 presence int ps; ///< -1 implicit, 1 presence
} MPEG4AudioConfig; } MPEG4AudioConfig;
extern const int ff_mpeg4audio_sample_rates[16]; extern const int ff_mpeg4audio_sample_rates[16];

@ -298,7 +298,7 @@ typedef struct MpegEncContext {
Picture *current_picture_ptr; ///< pointer to the current picture Picture *current_picture_ptr; ///< pointer to the current picture
int picture_count; ///< number of allocated pictures (MAX_PICTURE_COUNT * avctx->thread_count) int picture_count; ///< number of allocated pictures (MAX_PICTURE_COUNT * avctx->thread_count)
int picture_range_start, picture_range_end; ///< the part of picture that this context can allocate in int picture_range_start, picture_range_end; ///< the part of picture that this context can allocate in
uint8_t *visualization_buffer[3]; //< temporary buffer vor MV visualization uint8_t *visualization_buffer[3]; ///< temporary buffer vor MV visualization
int last_dc[3]; ///< last DC values for MPEG1 int last_dc[3]; ///< last DC values for MPEG1
int16_t *dc_val_base; int16_t *dc_val_base;
int16_t *dc_val[3]; ///< used for mpeg4 DC prediction, all 3 arrays must be continuous int16_t *dc_val[3]; ///< used for mpeg4 DC prediction, all 3 arrays must be continuous

@ -3306,7 +3306,7 @@ static void update_last_header_values(SnowContext *s){
static int qscale2qlog(int qscale){ static int qscale2qlog(int qscale){
return rint(QROOT*log(qscale / (float)FF_QP2LAMBDA)/log(2)) return rint(QROOT*log(qscale / (float)FF_QP2LAMBDA)/log(2))
+ 61*QROOT/8; //<64 >60 + 61*QROOT/8; ///< 64 > 60
} }
static int ratecontrol_1pass(SnowContext *s, AVFrame *pict) static int ratecontrol_1pass(SnowContext *s, AVFrame *pict)

@ -33,13 +33,13 @@
*/ */
typedef struct { typedef struct {
/* input data */ /* input data */
int16_t vector[8]; //< input vector: 5/5/4/4/4/3/3/3 int16_t vector[8]; ///< input vector: 5/5/4/4/4/3/3/3
int offset1[2]; //< 8-bit value, used in one copying offset int offset1[2]; ///< 8-bit value, used in one copying offset
int offset2[4]; //< 7-bit value, encodes offsets for copying and for two-point filter int offset2[4]; ///< 7-bit value, encodes offsets for copying and for two-point filter
int pulseoff[4]; //< 4-bit offset of pulse values block int pulseoff[4]; ///< 4-bit offset of pulse values block
int pulsepos[4]; //< 27-bit variable, encodes 7 pulse positions int pulsepos[4]; ///< 27-bit variable, encodes 7 pulse positions
int pulseval[4]; //< 7x2-bit pulse values int pulseval[4]; ///< 7x2-bit pulse values
int flag; //< 1-bit flag, shows how to choose filters int flag; ///< 1-bit flag, shows how to choose filters
/* temporary data */ /* temporary data */
int filtbuf[146]; // some big vector used for storing filters int filtbuf[146]; // some big vector used for storing filters
int prevfilt[8]; // filter from previous frame int prevfilt[8]; // filter from previous frame

@ -225,7 +225,7 @@ typedef struct Vp3DecodeContext {
/* these arrays need to be on 16-byte boundaries since SSE2 operations /* these arrays need to be on 16-byte boundaries since SSE2 operations
* index into them */ * index into them */
DECLARE_ALIGNED(16, int16_t, qmat)[3][2][3][64]; //<qmat[qpi][is_inter][plane] DECLARE_ALIGNED(16, int16_t, qmat)[3][2][3][64]; ///< qmat[qpi][is_inter][plane]
/* This table contains superblock_count * 16 entries. Each set of 16 /* This table contains superblock_count * 16 entries. Each set of 16
* numbers corresponds to the fragment indexes 0..15 of the superblock. * numbers corresponds to the fragment indexes 0..15 of the superblock.

@ -34,7 +34,7 @@ enum { Y, U, V, A };
typedef struct { typedef struct {
int x, y, w, h; int x, y, w, h;
unsigned char yuv_color[4]; unsigned char yuv_color[4];
int vsub, hsub; //< chroma subsampling int vsub, hsub; ///< chroma subsampling
} DrawBoxContext; } DrawBoxContext;
static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)

Loading…
Cancel
Save