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
d2264740
Commit
d2264740
authored
Mar 31, 2014
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VP3: K&R formatting cosmetics
parent
66d04c06
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
19 deletions
+21
-19
vp3.c
libavcodec/vp3.c
+0
-0
vp3_parser.c
libavcodec/vp3_parser.c
+7
-5
vp3data.h
libavcodec/vp3data.h
+14
-14
vp3dsp.c
libavcodec/vp3dsp.c
+0
-0
No files found.
libavcodec/vp3.c
View file @
d2264740
This diff is collapsed.
Click to expand it.
libavcodec/vp3_parser.c
View file @
d2264740
...
...
@@ -25,10 +25,10 @@ static int parse(AVCodecParserContext *s,
const
uint8_t
**
poutbuf
,
int
*
poutbuf_size
,
const
uint8_t
*
buf
,
int
buf_size
)
{
if
(
avctx
->
codec_id
==
AV_CODEC_ID_THEORA
)
s
->
pict_type
=
(
buf
[
0
]
&
0x40
)
?
AV_PICTURE_TYPE_P
:
AV_PICTURE_TYPE_I
;
if
(
avctx
->
codec_id
==
AV_CODEC_ID_THEORA
)
s
->
pict_type
=
(
buf
[
0
]
&
0x40
)
?
AV_PICTURE_TYPE_P
:
AV_PICTURE_TYPE_I
;
else
s
->
pict_type
=
(
buf
[
0
]
&
0x80
)
?
AV_PICTURE_TYPE_P
:
AV_PICTURE_TYPE_I
;
s
->
pict_type
=
(
buf
[
0
]
&
0x80
)
?
AV_PICTURE_TYPE_P
:
AV_PICTURE_TYPE_I
;
*
poutbuf
=
buf
;
*
poutbuf_size
=
buf_size
;
...
...
@@ -36,7 +36,9 @@ static int parse(AVCodecParserContext *s,
}
AVCodecParser
ff_vp3_parser
=
{
.
codec_ids
=
{
AV_CODEC_ID_THEORA
,
AV_CODEC_ID_VP3
,
AV_CODEC_ID_VP6
,
AV_CODEC_ID_VP6F
,
AV_CODEC_ID_VP6A
},
.
codec_ids
=
{
AV_CODEC_ID_THEORA
,
AV_CODEC_ID_VP3
,
AV_CODEC_ID_VP6
,
AV_CODEC_ID_VP6F
,
AV_CODEC_ID_VP6A
},
.
parser_parse
=
parse
,
};
libavcodec/vp3data.h
View file @
d2264740
...
...
@@ -26,8 +26,8 @@
/* these coefficients dequantize intraframe Y plane coefficients
* (note: same as JPEG) */
static
const
int16_t
vp31_intra_y_dequant
[
64
]
=
{
16
,
11
,
10
,
16
,
24
,
40
,
51
,
61
,
static
const
int16_t
vp31_intra_y_dequant
[
64
]
=
{
16
,
11
,
10
,
16
,
24
,
40
,
51
,
61
,
12
,
12
,
14
,
19
,
26
,
58
,
60
,
55
,
14
,
13
,
16
,
24
,
40
,
57
,
69
,
56
,
14
,
17
,
22
,
29
,
51
,
87
,
80
,
62
,
...
...
@@ -39,8 +39,8 @@ static const int16_t vp31_intra_y_dequant[64] =
/* these coefficients dequantize intraframe C plane coefficients
* (note: same as JPEG) */
static
const
int16_t
vp31_intra_c_dequant
[
64
]
=
{
17
,
18
,
24
,
47
,
99
,
99
,
99
,
99
,
static
const
int16_t
vp31_intra_c_dequant
[
64
]
=
{
17
,
18
,
24
,
47
,
99
,
99
,
99
,
99
,
18
,
21
,
26
,
66
,
99
,
99
,
99
,
99
,
24
,
26
,
56
,
99
,
99
,
99
,
99
,
99
,
47
,
66
,
99
,
99
,
99
,
99
,
99
,
99
,
...
...
@@ -51,8 +51,8 @@ static const int16_t vp31_intra_c_dequant[64] =
};
/* these coefficients dequantize interframe coefficients (all planes) */
static
const
int16_t
vp31_inter_dequant
[
64
]
=
{
16
,
16
,
16
,
20
,
24
,
28
,
32
,
40
,
static
const
int16_t
vp31_inter_dequant
[
64
]
=
{
16
,
16
,
16
,
20
,
24
,
28
,
32
,
40
,
16
,
16
,
20
,
24
,
28
,
32
,
40
,
48
,
16
,
20
,
24
,
28
,
32
,
40
,
48
,
64
,
20
,
24
,
28
,
32
,
40
,
48
,
64
,
64
,
...
...
@@ -62,8 +62,8 @@ static const int16_t vp31_inter_dequant[64] =
40
,
48
,
64
,
64
,
64
,
96
,
128
,
128
};
static
const
int16_t
vp31_dc_scale_factor
[
64
]
=
{
220
,
200
,
190
,
180
,
170
,
170
,
160
,
160
,
static
const
int16_t
vp31_dc_scale_factor
[
64
]
=
{
220
,
200
,
190
,
180
,
170
,
170
,
160
,
160
,
150
,
150
,
140
,
140
,
130
,
130
,
120
,
120
,
110
,
110
,
100
,
100
,
90
,
90
,
90
,
80
,
80
,
80
,
70
,
70
,
70
,
60
,
60
,
60
,
...
...
@@ -73,8 +73,8 @@ static const int16_t vp31_dc_scale_factor[64] =
20
,
10
,
10
,
10
,
10
,
10
,
10
,
10
};
static
const
uint32_t
vp31_ac_scale_factor
[
64
]
=
{
500
,
450
,
400
,
370
,
340
,
310
,
285
,
265
,
static
const
uint32_t
vp31_ac_scale_factor
[
64
]
=
{
500
,
450
,
400
,
370
,
340
,
310
,
285
,
265
,
245
,
225
,
210
,
195
,
185
,
180
,
170
,
160
,
150
,
145
,
135
,
130
,
125
,
115
,
110
,
107
,
100
,
96
,
93
,
89
,
85
,
82
,
75
,
74
,
...
...
@@ -84,8 +84,8 @@ static const uint32_t vp31_ac_scale_factor[64] =
21
,
19
,
18
,
17
,
15
,
13
,
12
,
10
};
static
const
uint8_t
vp31_filter_limit_values
[
64
]
=
{
30
,
25
,
20
,
20
,
15
,
15
,
14
,
14
,
static
const
uint8_t
vp31_filter_limit_values
[
64
]
=
{
30
,
25
,
20
,
20
,
15
,
15
,
14
,
14
,
13
,
13
,
12
,
12
,
11
,
11
,
10
,
10
,
9
,
9
,
8
,
8
,
7
,
7
,
7
,
7
,
6
,
6
,
6
,
6
,
5
,
5
,
5
,
5
,
...
...
@@ -113,7 +113,7 @@ static const uint16_t superblock_run_length_vlc_table[34][2] = {
{
0x3EC
,
10
},
{
0x3ED
,
10
},
{
0x3EE
,
10
},
{
0x3EF
,
10
},
{
0x3F
,
6
}
/* this last VLC is a special case for reading 12 more
bits from stream and adding the value 34 */
*
bits from stream and adding the value 34 */
};
static
const
uint16_t
fragment_run_length_vlc_table
[
30
][
2
]
=
{
...
...
@@ -224,7 +224,7 @@ static const int coeff_get_bits[32] = {
0
,
0
,
0
,
0
,
0
,
0
,
0
,
/* 0..6 are never used */
0
,
0
,
0
,
0
,
0
,
0
,
/* 7..12 use constant coeffs */
1
,
1
,
1
,
1
,
/* 13..16 are constants but still need sign bit */
2
,
3
,
4
,
5
,
6
,
10
,
/* 17..22, for reading large coeffs */
2
,
3
,
4
,
5
,
6
,
10
,
/* 17..22, for reading large coeffs */
1
,
1
,
1
,
1
,
1
,
1
,
1
,
/* 23..29 are constants but still need sign bit */
2
,
2
/* 30..31 */
};
...
...
libavcodec/vp3dsp.c
View file @
d2264740
This diff is collapsed.
Click to expand it.
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