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
5f922043
Commit
5f922043
authored
Mar 26, 2014
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dsputil: Move DV-specific ff_zigzag248_direct table to dvdata
parent
57b5b84e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
16 deletions
+17
-16
dsputil.c
libavcodec/dsputil.c
+0
-13
dsputil.h
libavcodec/dsputil.h
+0
-1
dv.c
libavcodec/dv.c
+1
-1
dvdata.c
libavcodec/dvdata.c
+13
-0
dvdata.h
libavcodec/dvdata.h
+2
-0
dvenc.c
libavcodec/dvenc.c
+1
-1
No files found.
libavcodec/dsputil.c
View file @
5f922043
...
...
@@ -57,19 +57,6 @@ uint32_t ff_square_tab[512] = { 0, };
#define pb_7f (~0UL / 255 * 0x7f)
#define pb_80 (~0UL / 255 * 0x80)
/* Specific zigzag scan for 248 idct. NOTE that unlike the
* specification, we interleave the fields */
const
uint8_t
ff_zigzag248_direct
[
64
]
=
{
0
,
8
,
1
,
9
,
16
,
24
,
2
,
10
,
17
,
25
,
32
,
40
,
48
,
56
,
33
,
41
,
18
,
26
,
3
,
11
,
4
,
12
,
19
,
27
,
34
,
42
,
49
,
57
,
50
,
58
,
35
,
43
,
20
,
28
,
5
,
13
,
6
,
14
,
21
,
29
,
36
,
44
,
51
,
59
,
52
,
60
,
37
,
45
,
22
,
30
,
7
,
15
,
23
,
31
,
38
,
46
,
53
,
61
,
54
,
62
,
39
,
47
,
55
,
63
,
};
const
uint8_t
ff_alternate_horizontal_scan
[
64
]
=
{
0
,
1
,
2
,
3
,
8
,
9
,
16
,
17
,
10
,
11
,
4
,
5
,
6
,
7
,
15
,
14
,
...
...
libavcodec/dsputil.h
View file @
5f922043
...
...
@@ -35,7 +35,6 @@
/* encoding scans */
extern
const
uint8_t
ff_alternate_horizontal_scan
[
64
];
extern
const
uint8_t
ff_alternate_vertical_scan
[
64
];
extern
const
uint8_t
ff_zigzag248_direct
[
64
];
extern
uint32_t
ff_square_tab
[
512
];
...
...
libavcodec/dv.c
View file @
5f922043
...
...
@@ -311,7 +311,7 @@ av_cold int ff_dvvideo_init(AVCodecContext *avctx)
/* 248DCT setup */
s
->
fdct
[
1
]
=
dsp
.
fdct248
;
s
->
idct_put
[
1
]
=
ff_simple_idct248_put
;
// FIXME: need to add it to DSP
memcpy
(
s
->
dv_zigzag
[
1
],
ff_zigzag248_direct
,
64
);
memcpy
(
s
->
dv_zigzag
[
1
],
ff_
dv_
zigzag248_direct
,
64
);
s
->
avctx
=
avctx
;
avctx
->
chroma_sample_location
=
AVCHROMA_LOC_TOPLEFT
;
...
...
libavcodec/dvdata.c
View file @
5f922043
...
...
@@ -28,6 +28,19 @@
#include "dvdata.h"
/* Specific zigzag scan for 248 idct. NOTE that unlike the
* specification, we interleave the fields */
const
uint8_t
ff_dv_zigzag248_direct
[
64
]
=
{
0
,
8
,
1
,
9
,
16
,
24
,
2
,
10
,
17
,
25
,
32
,
40
,
48
,
56
,
33
,
41
,
18
,
26
,
3
,
11
,
4
,
12
,
19
,
27
,
34
,
42
,
49
,
57
,
50
,
58
,
35
,
43
,
20
,
28
,
5
,
13
,
6
,
14
,
21
,
29
,
36
,
44
,
51
,
59
,
52
,
60
,
37
,
45
,
22
,
30
,
7
,
15
,
23
,
31
,
38
,
46
,
53
,
61
,
54
,
62
,
39
,
47
,
55
,
63
,
};
/* unquant tables (not used directly) */
const
uint8_t
ff_dv_quant_shifts
[
22
][
4
]
=
{
{
3
,
3
,
4
,
4
},
...
...
libavcodec/dvdata.h
View file @
5f922043
...
...
@@ -21,6 +21,8 @@
#include <stdint.h>
extern
const
uint8_t
ff_dv_zigzag248_direct
[
64
];
extern
const
uint8_t
ff_dv_quant_shifts
[
22
][
4
];
extern
const
uint8_t
ff_dv_quant_offset
[
4
];
...
...
libavcodec/dvenc.c
View file @
5f922043
...
...
@@ -245,7 +245,7 @@ static av_always_inline int dv_init_enc_block(EncBlockInfo* bi, uint8_t *data, i
}
bi
->
mb
[
0
]
=
blk
[
0
];
zigzag_scan
=
bi
->
dct_mode
?
ff_zigzag248_direct
:
ff_zigzag_direct
;
zigzag_scan
=
bi
->
dct_mode
?
ff_
dv_
zigzag248_direct
:
ff_zigzag_direct
;
weight
=
bi
->
dct_mode
?
dv_weight_248
:
dv_weight_88
;
for
(
area
=
0
;
area
<
4
;
area
++
)
{
...
...
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