Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
02494787
Commit
02494787
authored
Aug 05, 2011
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
doxygen: fix wrong comment syntax, //< vs. ///<
parent
0138a8de
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
35 additions
and
35 deletions
+35
-35
avconv.c
avconv.c
+3
-3
ffmpeg.c
ffmpeg.c
+3
-3
aac.h
libavcodec/aac.h
+5
-5
aacps.c
libavcodec/aacps.c
+4
-4
aacps.h
libavcodec/aacps.h
+4
-4
aacps_tablegen.h
libavcodec/aacps_tablegen.h
+1
-1
avcodec.h
libavcodec/avcodec.h
+2
-2
mpeg4audio.h
libavcodec/mpeg4audio.h
+2
-2
mpegvideo.h
libavcodec/mpegvideo.h
+1
-1
snow.c
libavcodec/snow.c
+1
-1
truespeech.c
libavcodec/truespeech.c
+7
-7
vp3.c
libavcodec/vp3.c
+1
-1
vf_drawbox.c
libavfilter/vf_drawbox.c
+1
-1
No files found.
avconv.c
View file @
02494787
...
...
@@ -90,9 +90,9 @@ typedef struct StreamMap {
* select an input file for an output file
*/
typedef
struct
MetadataMap
{
int
file
;
//< file index
char
type
;
//< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram
int
index
;
//< stream/chapter/program number
int
file
;
//
/
< file index
char
type
;
//
/
< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram
int
index
;
//
/
< stream/chapter/program number
}
MetadataMap
;
static
const
OptionDef
options
[];
...
...
ffmpeg.c
View file @
02494787
...
...
@@ -89,9 +89,9 @@ typedef struct StreamMap {
* select an input file for an output file
*/
typedef
struct
MetadataMap
{
int
file
;
//< file index
char
type
;
//< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram
int
index
;
//< stream/chapter/program number
int
file
;
//
/
< file index
char
type
;
//
/
< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram
int
index
;
//
/
< stream/chapter/program number
}
MetadataMap
;
typedef
struct
ChapterMap
{
...
...
libavcodec/aac.h
View file @
02494787
...
...
@@ -104,11 +104,11 @@ enum CouplingPoint {
* Output configuration status
*/
enum
OCStatus
{
OC_NONE
,
//< Output unconfigured
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_GLOBAL_HDR
,
//< Output configuration set in a global header but not yet locked
OC_LOCKED
,
//< Output configuration locked in place
OC_NONE
,
//
/
< Output unconfigured
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_GLOBAL_HDR
,
//
/
< Output configuration set in a global header but not yet locked
OC_LOCKED
,
//
/
< Output configuration locked in place
};
/**
...
...
libavcodec/aacps.c
View file @
02494787
...
...
@@ -28,9 +28,9 @@
#include "aacps_tablegen.h"
#include "aacpsdata.c"
#define PS_BASELINE 0 //< Operate in Baseline PS mode
//< Baseline implies 10 or 20 stereo bands,
//< mixing mode A, and no ipd/opd
#define PS_BASELINE 0 //
/
< Operate in Baseline PS mode
//
/
< Baseline implies 10 or 20 stereo bands,
//
/
< mixing mode A, and no ipd/opd
#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
float
peak_decay_factor
=
0
.
76592833836465
f
;
const
float
transient_impact
=
1
.
5
f
;
const
float
a_smooth
=
0
.
25
f
;
//< Smoothing coefficient
const
float
a_smooth
=
0
.
25
f
;
//
/
< Smoothing coefficient
int
i
,
k
,
m
,
n
;
int
n0
=
0
,
nL
=
32
;
static
const
int
link_delay
[]
=
{
3
,
4
,
5
};
...
...
libavcodec/aacps.h
View file @
02494787
...
...
@@ -52,11 +52,11 @@ typedef struct {
int
num_env
;
int
enable_ipdopd
;
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
icc_par
[
PS_MAX_NUM_ENV
][
PS_MAX_NR_IIDICC
];
//
<
Inter-Channel Coherence 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
/* 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
opd_par
[
PS_MAX_NUM_ENV
][
PS_MAX_NR_IIDICC
];
//
<
Overall 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
int
is34bands
;
int
is34bands_old
;
...
...
libavcodec/aacps_tablegen.h
View file @
02494787
...
...
@@ -139,7 +139,7 @@ static void ps_tableinit(void)
}
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
.
0
f
+
c
*
c
);
float
c2
=
c
*
c1
;
for
(
icc
=
0
;
icc
<
8
;
icc
++
)
{
...
...
libavcodec/avcodec.h
View file @
02494787
...
...
@@ -2840,8 +2840,8 @@ typedef struct AVCodecContext {
* - decoding: Set by user, otherwise the default is used.
*/
int
thread_type
;
#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_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
/**
* Which multithreading methods are in use by the codec.
...
...
libavcodec/mpeg4audio.h
View file @
02494787
...
...
@@ -31,13 +31,13 @@ typedef struct {
int
sampling_index
;
int
sample_rate
;
int
chan_config
;
int
sbr
;
//< -1 implicit, 1 presence
int
sbr
;
//
/
< -1 implicit, 1 presence
int
ext_object_type
;
int
ext_sampling_index
;
int
ext_sample_rate
;
int
ext_chan_config
;
int
channels
;
int
ps
;
//< -1 implicit, 1 presence
int
ps
;
//
/
< -1 implicit, 1 presence
}
MPEG4AudioConfig
;
extern
const
int
ff_mpeg4audio_sample_rates
[
16
];
...
...
libavcodec/mpegvideo.h
View file @
02494787
...
...
@@ -298,7 +298,7 @@ typedef struct MpegEncContext {
Picture
*
current_picture_ptr
;
///< pointer to the current picture
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
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
int16_t
*
dc_val_base
;
int16_t
*
dc_val
[
3
];
///< used for mpeg4 DC prediction, all 3 arrays must be continuous
...
...
libavcodec/snow.c
View file @
02494787
...
...
@@ -3306,7 +3306,7 @@ static void update_last_header_values(SnowContext *s){
static
int
qscale2qlog
(
int
qscale
){
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
)
...
...
libavcodec/truespeech.c
View file @
02494787
...
...
@@ -33,13 +33,13 @@
*/
typedef
struct
{
/* input data */
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
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
pulsepos
[
4
];
//< 27-bit variable, encodes 7 pulse positions
int
pulseval
[
4
];
//< 7x2-bit pulse values
int
flag
;
//< 1-bit flag, shows how to choose filters
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
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
pulsepos
[
4
];
//
/
< 27-bit variable, encodes 7 pulse positions
int
pulseval
[
4
];
//
/
< 7x2-bit pulse values
int
flag
;
//
/
< 1-bit flag, shows how to choose filters
/* temporary data */
int
filtbuf
[
146
];
// some big vector used for storing filters
int
prevfilt
[
8
];
// filter from previous frame
...
...
libavcodec/vp3.c
View file @
02494787
...
...
@@ -225,7 +225,7 @@ typedef struct Vp3DecodeContext {
/* these arrays need to be on 16-byte boundaries since SSE2 operations
* 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
* numbers corresponds to the fragment indexes 0..15 of the superblock.
...
...
libavfilter/vf_drawbox.c
View file @
02494787
...
...
@@ -34,7 +34,7 @@ enum { Y, U, V, A };
typedef
struct
{
int
x
,
y
,
w
,
h
;
unsigned
char
yuv_color
[
4
];
int
vsub
,
hsub
;
//< chroma subsampling
int
vsub
,
hsub
;
//
/
< chroma subsampling
}
DrawBoxContext
;
static
av_cold
int
init
(
AVFilterContext
*
ctx
,
const
char
*
args
,
void
*
opaque
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment