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
2b7da70a
Commit
2b7da70a
authored
Aug 30, 2017
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
postproc: remove usage of deprecated QP_STORE_T define
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
f7d4c60a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
postprocess.c
libpostproc/postprocess.c
+6
-6
postprocess_internal.h
libpostproc/postprocess_internal.h
+3
-3
postprocess_template.c
libpostproc/postprocess_template.c
+2
-2
No files found.
libpostproc/postprocess.c
View file @
2b7da70a
...
@@ -558,10 +558,10 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step,
...
@@ -558,10 +558,10 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step,
#endif
#endif
typedef
void
(
*
pp_fn
)(
const
uint8_t
src
[],
int
srcStride
,
uint8_t
dst
[],
int
dstStride
,
int
width
,
int
height
,
typedef
void
(
*
pp_fn
)(
const
uint8_t
src
[],
int
srcStride
,
uint8_t
dst
[],
int
dstStride
,
int
width
,
int
height
,
const
QP_STORE_T
QPs
[],
int
QPStride
,
int
isColor
,
PPContext
*
c2
);
const
int8_t
QPs
[],
int
QPStride
,
int
isColor
,
PPContext
*
c2
);
static
inline
void
postProcess
(
const
uint8_t
src
[],
int
srcStride
,
uint8_t
dst
[],
int
dstStride
,
int
width
,
int
height
,
static
inline
void
postProcess
(
const
uint8_t
src
[],
int
srcStride
,
uint8_t
dst
[],
int
dstStride
,
int
width
,
int
height
,
const
QP_STORE_T
QPs
[],
int
QPStride
,
int
isColor
,
pp_mode
*
vm
,
pp_context
*
vc
)
const
int8_t
QPs
[],
int
QPStride
,
int
isColor
,
pp_mode
*
vm
,
pp_context
*
vc
)
{
{
pp_fn
pp
=
postProcess_C
;
pp_fn
pp
=
postProcess_C
;
PPContext
*
c
=
(
PPContext
*
)
vc
;
PPContext
*
c
=
(
PPContext
*
)
vc
;
...
@@ -870,9 +870,9 @@ static void reallocBuffers(PPContext *c, int width, int height, int stride, int
...
@@ -870,9 +870,9 @@ static void reallocBuffers(PPContext *c, int width, int height, int stride, int
}
}
reallocAlign
((
void
**
)
&
c
->
deintTemp
,
2
*
width
+
32
);
reallocAlign
((
void
**
)
&
c
->
deintTemp
,
2
*
width
+
32
);
reallocAlign
((
void
**
)
&
c
->
nonBQPTable
,
qpStride
*
mbHeight
*
sizeof
(
QP_STORE_T
));
reallocAlign
((
void
**
)
&
c
->
nonBQPTable
,
qpStride
*
mbHeight
*
sizeof
(
int8_t
));
reallocAlign
((
void
**
)
&
c
->
stdQPTable
,
qpStride
*
mbHeight
*
sizeof
(
QP_STORE_T
));
reallocAlign
((
void
**
)
&
c
->
stdQPTable
,
qpStride
*
mbHeight
*
sizeof
(
int8_t
));
reallocAlign
((
void
**
)
&
c
->
forcedQPTable
,
mbWidth
*
sizeof
(
QP_STORE_T
));
reallocAlign
((
void
**
)
&
c
->
forcedQPTable
,
mbWidth
*
sizeof
(
int8_t
));
}
}
static
const
char
*
context_to_name
(
void
*
ptr
)
{
static
const
char
*
context_to_name
(
void
*
ptr
)
{
...
@@ -940,7 +940,7 @@ av_cold void pp_free_context(void *vc){
...
@@ -940,7 +940,7 @@ av_cold void pp_free_context(void *vc){
void
pp_postprocess
(
const
uint8_t
*
src
[
3
],
const
int
srcStride
[
3
],
void
pp_postprocess
(
const
uint8_t
*
src
[
3
],
const
int
srcStride
[
3
],
uint8_t
*
dst
[
3
],
const
int
dstStride
[
3
],
uint8_t
*
dst
[
3
],
const
int
dstStride
[
3
],
int
width
,
int
height
,
int
width
,
int
height
,
const
QP_STORE_T
*
QP_store
,
int
QPStride
,
const
int8_t
*
QP_store
,
int
QPStride
,
pp_mode
*
vm
,
void
*
vc
,
int
pict_type
)
pp_mode
*
vm
,
void
*
vc
,
int
pict_type
)
{
{
int
mbWidth
=
(
width
+
15
)
>>
4
;
int
mbWidth
=
(
width
+
15
)
>>
4
;
...
...
libpostproc/postprocess_internal.h
View file @
2b7da70a
...
@@ -149,9 +149,9 @@ typedef struct PPContext{
...
@@ -149,9 +149,9 @@ typedef struct PPContext{
DECLARE_ALIGNED
(
32
,
uint64_t
,
mmxDcOffset
)[
64
];
DECLARE_ALIGNED
(
32
,
uint64_t
,
mmxDcOffset
)[
64
];
DECLARE_ALIGNED
(
32
,
uint64_t
,
mmxDcThreshold
)[
64
];
DECLARE_ALIGNED
(
32
,
uint64_t
,
mmxDcThreshold
)[
64
];
QP_STORE_T
*
stdQPTable
;
///< used to fix MPEG2 style qscale
int8_t
*
stdQPTable
;
///< used to fix MPEG2 style qscale
QP_STORE_T
*
nonBQPTable
;
int8_t
*
nonBQPTable
;
QP_STORE_T
*
forcedQPTable
;
int8_t
*
forcedQPTable
;
int
QP
;
int
QP
;
int
nonBQP
;
int
nonBQP
;
...
...
libpostproc/postprocess_template.c
View file @
2b7da70a
...
@@ -3081,7 +3081,7 @@ static av_always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int st
...
@@ -3081,7 +3081,7 @@ static av_always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int st
#endif //TEMPLATE_PP_MMX
#endif //TEMPLATE_PP_MMX
static
void
RENAME
(
postProcess
)(
const
uint8_t
src
[],
int
srcStride
,
uint8_t
dst
[],
int
dstStride
,
int
width
,
int
height
,
static
void
RENAME
(
postProcess
)(
const
uint8_t
src
[],
int
srcStride
,
uint8_t
dst
[],
int
dstStride
,
int
width
,
int
height
,
const
QP_STORE_T
QPs
[],
int
QPStride
,
int
isColor
,
PPContext
*
c
);
const
int8_t
QPs
[],
int
QPStride
,
int
isColor
,
PPContext
*
c
);
/**
/**
* Copy a block from src to dst and fixes the blacklevel.
* Copy a block from src to dst and fixes the blacklevel.
...
@@ -3309,7 +3309,7 @@ static inline void RENAME(prefetcht2)(const void *p)
...
@@ -3309,7 +3309,7 @@ static inline void RENAME(prefetcht2)(const void *p)
* Filter array of bytes (Y or U or V values)
* Filter array of bytes (Y or U or V values)
*/
*/
static
void
RENAME
(
postProcess
)(
const
uint8_t
src
[],
int
srcStride
,
uint8_t
dst
[],
int
dstStride
,
int
width
,
int
height
,
static
void
RENAME
(
postProcess
)(
const
uint8_t
src
[],
int
srcStride
,
uint8_t
dst
[],
int
dstStride
,
int
width
,
int
height
,
const
QP_STORE_T
QPs
[],
int
QPStride
,
int
isColor
,
PPContext
*
c2
)
const
int8_t
QPs
[],
int
QPStride
,
int
isColor
,
PPContext
*
c2
)
{
{
DECLARE_ALIGNED
(
8
,
PPContext
,
c
)
=
*
c2
;
//copy to stack for faster access
DECLARE_ALIGNED
(
8
,
PPContext
,
c
)
=
*
c2
;
//copy to stack for faster access
int
x
,
y
;
int
x
,
y
;
...
...
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