Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
845c2c14
Commit
845c2c14
authored
8 years ago
by
Mark Thompson
Browse files
Options
Downloads
Patches
Plain Diff
vaapi_vc1: Constify pointers
(cherry picked from commit
01d6f84f
)
parent
6bc2808c
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavcodec/vaapi_vc1.c
+16
-16
16 additions, 16 deletions
libavcodec/vaapi_vc1.c
with
16 additions
and
16 deletions
libavcodec/vaapi_vc1.c
+
16
−
16
View file @
845c2c14
...
...
@@ -39,7 +39,7 @@ static int get_VAMvModeVC1(enum MVModes mv_mode)
}
/** Check whether the MVTYPEMB bitplane is present */
static
inline
int
vc1_has_MVTYPEMB_bitplane
(
VC1Context
*
v
)
static
inline
int
vc1_has_MVTYPEMB_bitplane
(
const
VC1Context
*
v
)
{
if
(
v
->
mv_type_is_raw
)
return
0
;
...
...
@@ -50,7 +50,7 @@ static inline int vc1_has_MVTYPEMB_bitplane(VC1Context *v)
}
/** Check whether the SKIPMB bitplane is present */
static
inline
int
vc1_has_SKIPMB_bitplane
(
VC1Context
*
v
)
static
inline
int
vc1_has_SKIPMB_bitplane
(
const
VC1Context
*
v
)
{
if
(
v
->
skip_is_raw
)
return
0
;
...
...
@@ -59,7 +59,7 @@ static inline int vc1_has_SKIPMB_bitplane(VC1Context *v)
}
/** Check whether the DIRECTMB bitplane is present */
static
inline
int
vc1_has_DIRECTMB_bitplane
(
VC1Context
*
v
)
static
inline
int
vc1_has_DIRECTMB_bitplane
(
const
VC1Context
*
v
)
{
if
(
v
->
dmb_is_raw
)
return
0
;
...
...
@@ -67,7 +67,7 @@ static inline int vc1_has_DIRECTMB_bitplane(VC1Context *v)
}
/** Check whether the ACPRED bitplane is present */
static
inline
int
vc1_has_ACPRED_bitplane
(
VC1Context
*
v
)
static
inline
int
vc1_has_ACPRED_bitplane
(
const
VC1Context
*
v
)
{
if
(
v
->
acpred_is_raw
)
return
0
;
...
...
@@ -77,7 +77,7 @@ static inline int vc1_has_ACPRED_bitplane(VC1Context *v)
}
/** Check whether the OVERFLAGS bitplane is present */
static
inline
int
vc1_has_OVERFLAGS_bitplane
(
VC1Context
*
v
)
static
inline
int
vc1_has_OVERFLAGS_bitplane
(
const
VC1Context
*
v
)
{
if
(
v
->
overflg_is_raw
)
return
0
;
...
...
@@ -89,9 +89,9 @@ static inline int vc1_has_OVERFLAGS_bitplane(VC1Context *v)
}
/** Reconstruct bitstream PTYPE (7.1.1.4, index into Table-35) */
static
int
vc1_get_PTYPE
(
VC1Context
*
v
)
static
int
vc1_get_PTYPE
(
const
VC1Context
*
v
)
{
MpegEncContext
*
const
s
=
&
v
->
s
;
const
MpegEncContext
*
s
=
&
v
->
s
;
switch
(
s
->
pict_type
)
{
case
AV_PICTURE_TYPE_I
:
return
0
;
case
AV_PICTURE_TYPE_P
:
return
v
->
p_frame_skipped
?
4
:
1
;
...
...
@@ -101,7 +101,7 @@ static int vc1_get_PTYPE(VC1Context *v)
}
/** Reconstruct bitstream MVMODE (7.1.1.32) */
static
inline
VAMvModeVC1
vc1_get_MVMODE
(
VC1Context
*
v
)
static
inline
VAMvModeVC1
vc1_get_MVMODE
(
const
VC1Context
*
v
)
{
if
(
v
->
s
.
pict_type
==
AV_PICTURE_TYPE_P
||
(
v
->
s
.
pict_type
==
AV_PICTURE_TYPE_B
&&
!
v
->
bi_type
))
...
...
@@ -110,7 +110,7 @@ static inline VAMvModeVC1 vc1_get_MVMODE(VC1Context *v)
}
/** Reconstruct bitstream MVMODE2 (7.1.1.33) */
static
inline
VAMvModeVC1
vc1_get_MVMODE2
(
VC1Context
*
v
)
static
inline
VAMvModeVC1
vc1_get_MVMODE2
(
const
VC1Context
*
v
)
{
if
(
v
->
s
.
pict_type
==
AV_PICTURE_TYPE_P
&&
v
->
mv_mode
==
MV_PMODE_INTENSITY_COMP
)
return
get_VAMvModeVC1
(
v
->
mv_mode2
);
...
...
@@ -118,7 +118,7 @@ static inline VAMvModeVC1 vc1_get_MVMODE2(VC1Context *v)
}
/** Reconstruct bitstream TTFRM (7.1.1.41, Table-53) */
static
inline
int
vc1_get_TTFRM
(
VC1Context
*
v
)
static
inline
int
vc1_get_TTFRM
(
const
VC1Context
*
v
)
{
switch
(
v
->
ttfrm
)
{
case
TT_8X8
:
return
0
;
...
...
@@ -146,9 +146,9 @@ static inline void vc1_pack_bitplanes(uint8_t *bitplane, int n, const uint8_t *f
static
int
vaapi_vc1_start_frame
(
AVCodecContext
*
avctx
,
av_unused
const
uint8_t
*
buffer
,
av_unused
uint32_t
size
)
{
VC1Context
*
const
v
=
avctx
->
priv_data
;
MpegEncContext
*
const
s
=
&
v
->
s
;
FFVAContext
*
const
vactx
=
ff_vaapi_get_context
(
avctx
);
const
VC1Context
*
v
=
avctx
->
priv_data
;
const
MpegEncContext
*
s
=
&
v
->
s
;
FFVAContext
*
vactx
=
ff_vaapi_get_context
(
avctx
);
VAPictureParameterBufferVC1
*
pic_param
;
vactx
->
slice_param_size
=
sizeof
(
VASliceParameterBufferVC1
);
...
...
@@ -311,9 +311,9 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
static
int
vaapi_vc1_decode_slice
(
AVCodecContext
*
avctx
,
const
uint8_t
*
buffer
,
uint32_t
size
)
{
VC1Context
*
const
v
=
avctx
->
priv_data
;
MpegEncContext
*
const
s
=
&
v
->
s
;
FFVAContext
*
const
vactx
=
ff_vaapi_get_context
(
avctx
);
const
VC1Context
*
v
=
avctx
->
priv_data
;
const
MpegEncContext
*
s
=
&
v
->
s
;
FFVAContext
*
vactx
=
ff_vaapi_get_context
(
avctx
);
VASliceParameterBufferVC1
*
slice_param
;
/* Current bit buffer is beyond any marker for VC-1, so skip it */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment