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
c8e1b2fb
Commit
c8e1b2fb
authored
Feb 15, 2012
by
Martin Storsjö
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libavcodec: Add ff_ prefix to j_rev_dct*
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
873c89e2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
19 deletions
+19
-19
dct-test.c
libavcodec/dct-test.c
+1
-1
dsputil.c
libavcodec/dsputil.c
+10
-10
dsputil.h
libavcodec/dsputil.h
+4
-4
jrevdct.c
libavcodec/jrevdct.c
+4
-4
No files found.
libavcodec/dct-test.c
View file @
c8e1b2fb
...
@@ -110,7 +110,7 @@ static const struct algo fdct_tab[] = {
...
@@ -110,7 +110,7 @@ static const struct algo fdct_tab[] = {
static
const
struct
algo
idct_tab
[]
=
{
static
const
struct
algo
idct_tab
[]
=
{
{
"FAANI"
,
ff_faanidct
,
NO_PERM
},
{
"FAANI"
,
ff_faanidct
,
NO_PERM
},
{
"REF-DBL"
,
ff_ref_idct
,
NO_PERM
},
{
"REF-DBL"
,
ff_ref_idct
,
NO_PERM
},
{
"INT"
,
j_rev_dct
,
MMX_PERM
},
{
"INT"
,
ff_j_rev_dct
,
MMX_PERM
},
{
"SIMPLE-C"
,
ff_simple_idct_8
,
NO_PERM
},
{
"SIMPLE-C"
,
ff_simple_idct_8
,
NO_PERM
},
#if HAVE_MMX
#if HAVE_MMX
...
...
libavcodec/dsputil.c
View file @
c8e1b2fb
...
@@ -2700,34 +2700,34 @@ static void ff_wmv2_idct_add_c(uint8_t *dest, int line_size, DCTELEM *block)
...
@@ -2700,34 +2700,34 @@ static void ff_wmv2_idct_add_c(uint8_t *dest, int line_size, DCTELEM *block)
}
}
static
void
ff_jref_idct_put
(
uint8_t
*
dest
,
int
line_size
,
DCTELEM
*
block
)
static
void
ff_jref_idct_put
(
uint8_t
*
dest
,
int
line_size
,
DCTELEM
*
block
)
{
{
j_rev_dct
(
block
);
ff_
j_rev_dct
(
block
);
ff_put_pixels_clamped_c
(
block
,
dest
,
line_size
);
ff_put_pixels_clamped_c
(
block
,
dest
,
line_size
);
}
}
static
void
ff_jref_idct_add
(
uint8_t
*
dest
,
int
line_size
,
DCTELEM
*
block
)
static
void
ff_jref_idct_add
(
uint8_t
*
dest
,
int
line_size
,
DCTELEM
*
block
)
{
{
j_rev_dct
(
block
);
ff_
j_rev_dct
(
block
);
ff_add_pixels_clamped_c
(
block
,
dest
,
line_size
);
ff_add_pixels_clamped_c
(
block
,
dest
,
line_size
);
}
}
static
void
ff_jref_idct4_put
(
uint8_t
*
dest
,
int
line_size
,
DCTELEM
*
block
)
static
void
ff_jref_idct4_put
(
uint8_t
*
dest
,
int
line_size
,
DCTELEM
*
block
)
{
{
j_rev_dct4
(
block
);
ff_
j_rev_dct4
(
block
);
put_pixels_clamped4_c
(
block
,
dest
,
line_size
);
put_pixels_clamped4_c
(
block
,
dest
,
line_size
);
}
}
static
void
ff_jref_idct4_add
(
uint8_t
*
dest
,
int
line_size
,
DCTELEM
*
block
)
static
void
ff_jref_idct4_add
(
uint8_t
*
dest
,
int
line_size
,
DCTELEM
*
block
)
{
{
j_rev_dct4
(
block
);
ff_
j_rev_dct4
(
block
);
add_pixels_clamped4_c
(
block
,
dest
,
line_size
);
add_pixels_clamped4_c
(
block
,
dest
,
line_size
);
}
}
static
void
ff_jref_idct2_put
(
uint8_t
*
dest
,
int
line_size
,
DCTELEM
*
block
)
static
void
ff_jref_idct2_put
(
uint8_t
*
dest
,
int
line_size
,
DCTELEM
*
block
)
{
{
j_rev_dct2
(
block
);
ff_
j_rev_dct2
(
block
);
put_pixels_clamped2_c
(
block
,
dest
,
line_size
);
put_pixels_clamped2_c
(
block
,
dest
,
line_size
);
}
}
static
void
ff_jref_idct2_add
(
uint8_t
*
dest
,
int
line_size
,
DCTELEM
*
block
)
static
void
ff_jref_idct2_add
(
uint8_t
*
dest
,
int
line_size
,
DCTELEM
*
block
)
{
{
j_rev_dct2
(
block
);
ff_
j_rev_dct2
(
block
);
add_pixels_clamped2_c
(
block
,
dest
,
line_size
);
add_pixels_clamped2_c
(
block
,
dest
,
line_size
);
}
}
...
@@ -2813,17 +2813,17 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
...
@@ -2813,17 +2813,17 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
if
(
avctx
->
lowres
==
1
){
if
(
avctx
->
lowres
==
1
){
c
->
idct_put
=
ff_jref_idct4_put
;
c
->
idct_put
=
ff_jref_idct4_put
;
c
->
idct_add
=
ff_jref_idct4_add
;
c
->
idct_add
=
ff_jref_idct4_add
;
c
->
idct
=
j_rev_dct4
;
c
->
idct
=
ff_
j_rev_dct4
;
c
->
idct_permutation_type
=
FF_NO_IDCT_PERM
;
c
->
idct_permutation_type
=
FF_NO_IDCT_PERM
;
}
else
if
(
avctx
->
lowres
==
2
){
}
else
if
(
avctx
->
lowres
==
2
){
c
->
idct_put
=
ff_jref_idct2_put
;
c
->
idct_put
=
ff_jref_idct2_put
;
c
->
idct_add
=
ff_jref_idct2_add
;
c
->
idct_add
=
ff_jref_idct2_add
;
c
->
idct
=
j_rev_dct2
;
c
->
idct
=
ff_
j_rev_dct2
;
c
->
idct_permutation_type
=
FF_NO_IDCT_PERM
;
c
->
idct_permutation_type
=
FF_NO_IDCT_PERM
;
}
else
if
(
avctx
->
lowres
==
3
){
}
else
if
(
avctx
->
lowres
==
3
){
c
->
idct_put
=
ff_jref_idct1_put
;
c
->
idct_put
=
ff_jref_idct1_put
;
c
->
idct_add
=
ff_jref_idct1_add
;
c
->
idct_add
=
ff_jref_idct1_add
;
c
->
idct
=
j_rev_dct1
;
c
->
idct
=
ff_
j_rev_dct1
;
c
->
idct_permutation_type
=
FF_NO_IDCT_PERM
;
c
->
idct_permutation_type
=
FF_NO_IDCT_PERM
;
}
else
{
}
else
{
if
(
avctx
->
bits_per_raw_sample
==
10
)
{
if
(
avctx
->
bits_per_raw_sample
==
10
)
{
...
@@ -2835,7 +2835,7 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
...
@@ -2835,7 +2835,7 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
if
(
avctx
->
idct_algo
==
FF_IDCT_INT
){
if
(
avctx
->
idct_algo
==
FF_IDCT_INT
){
c
->
idct_put
=
ff_jref_idct_put
;
c
->
idct_put
=
ff_jref_idct_put
;
c
->
idct_add
=
ff_jref_idct_add
;
c
->
idct_add
=
ff_jref_idct_add
;
c
->
idct
=
j_rev_dct
;
c
->
idct
=
ff_
j_rev_dct
;
c
->
idct_permutation_type
=
FF_LIBMPEG2_IDCT_PERM
;
c
->
idct_permutation_type
=
FF_LIBMPEG2_IDCT_PERM
;
}
else
if
((
CONFIG_VP3_DECODER
||
CONFIG_VP5_DECODER
||
CONFIG_VP6_DECODER
)
&&
}
else
if
((
CONFIG_VP3_DECODER
||
CONFIG_VP5_DECODER
||
CONFIG_VP6_DECODER
)
&&
avctx
->
idct_algo
==
FF_IDCT_VP3
){
avctx
->
idct_algo
==
FF_IDCT_VP3
){
...
...
libavcodec/dsputil.h
View file @
c8e1b2fb
...
@@ -45,10 +45,10 @@ void ff_jpeg_fdct_islow_10(DCTELEM *data);
...
@@ -45,10 +45,10 @@ void ff_jpeg_fdct_islow_10(DCTELEM *data);
void
ff_fdct248_islow_8
(
DCTELEM
*
data
);
void
ff_fdct248_islow_8
(
DCTELEM
*
data
);
void
ff_fdct248_islow_10
(
DCTELEM
*
data
);
void
ff_fdct248_islow_10
(
DCTELEM
*
data
);
void
j_rev_dct
(
DCTELEM
*
data
);
void
ff_
j_rev_dct
(
DCTELEM
*
data
);
void
j_rev_dct4
(
DCTELEM
*
data
);
void
ff_
j_rev_dct4
(
DCTELEM
*
data
);
void
j_rev_dct2
(
DCTELEM
*
data
);
void
ff_
j_rev_dct2
(
DCTELEM
*
data
);
void
j_rev_dct1
(
DCTELEM
*
data
);
void
ff_
j_rev_dct1
(
DCTELEM
*
data
);
void
ff_wmv2_idct_c
(
DCTELEM
*
data
);
void
ff_wmv2_idct_c
(
DCTELEM
*
data
);
void
ff_fdct_mmx
(
DCTELEM
*
block
);
void
ff_fdct_mmx
(
DCTELEM
*
block
);
...
...
libavcodec/jrevdct.c
View file @
c8e1b2fb
...
@@ -207,7 +207,7 @@ ones here or successive P-frames will drift too much with Reference frame coding
...
@@ -207,7 +207,7 @@ ones here or successive P-frames will drift too much with Reference frame coding
* Perform the inverse DCT on one block of coefficients.
* Perform the inverse DCT on one block of coefficients.
*/
*/
void
j_rev_dct
(
DCTBLOCK
data
)
void
ff_
j_rev_dct
(
DCTBLOCK
data
)
{
{
int32_t
tmp0
,
tmp1
,
tmp2
,
tmp3
;
int32_t
tmp0
,
tmp1
,
tmp2
,
tmp3
;
int32_t
tmp10
,
tmp11
,
tmp12
,
tmp13
;
int32_t
tmp10
,
tmp11
,
tmp12
,
tmp13
;
...
@@ -945,7 +945,7 @@ void j_rev_dct(DCTBLOCK data)
...
@@ -945,7 +945,7 @@ void j_rev_dct(DCTBLOCK data)
#define DCTSIZE 4
#define DCTSIZE 4
#define DCTSTRIDE 8
#define DCTSTRIDE 8
void
j_rev_dct4
(
DCTBLOCK
data
)
void
ff_
j_rev_dct4
(
DCTBLOCK
data
)
{
{
int32_t
tmp0
,
tmp1
,
tmp2
,
tmp3
;
int32_t
tmp0
,
tmp1
,
tmp2
,
tmp3
;
int32_t
tmp10
,
tmp11
,
tmp12
,
tmp13
;
int32_t
tmp10
,
tmp11
,
tmp12
,
tmp13
;
...
@@ -1132,7 +1132,7 @@ void j_rev_dct4(DCTBLOCK data)
...
@@ -1132,7 +1132,7 @@ void j_rev_dct4(DCTBLOCK data)
}
}
}
}
void
j_rev_dct2
(
DCTBLOCK
data
){
void
ff_
j_rev_dct2
(
DCTBLOCK
data
){
int
d00
,
d01
,
d10
,
d11
;
int
d00
,
d01
,
d10
,
d11
;
data
[
0
]
+=
4
;
data
[
0
]
+=
4
;
...
@@ -1147,7 +1147,7 @@ void j_rev_dct2(DCTBLOCK data){
...
@@ -1147,7 +1147,7 @@ void j_rev_dct2(DCTBLOCK data){
data
[
1
+
1
*
DCTSTRIDE
]
=
(
d01
-
d11
)
>>
3
;
data
[
1
+
1
*
DCTSTRIDE
]
=
(
d01
-
d11
)
>>
3
;
}
}
void
j_rev_dct1
(
DCTBLOCK
data
){
void
ff_
j_rev_dct1
(
DCTBLOCK
data
){
data
[
0
]
=
(
data
[
0
]
+
4
)
>>
3
;
data
[
0
]
=
(
data
[
0
]
+
4
)
>>
3
;
}
}
...
...
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