Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
9ba3fc3e
Commit
9ba3fc3e
authored
Nov 26, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext
parent
58c120a9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
mpeg4video.h
libavcodec/mpeg4video.h
+1
-0
mpeg4videodec.c
libavcodec/mpeg4videodec.c
+2
-2
mpegvideo.h
libavcodec/mpegvideo.h
+0
-1
No files found.
libavcodec/mpeg4video.h
View file @
9ba3fc3e
...
...
@@ -66,6 +66,7 @@ typedef struct Mpeg4DecContext {
int
time_increment_bits
;
int
shape
;
int
vol_sprite_usage
;
int
sprite_brightness_change
;
// reversible vlc
int
rvlc
;
///< could this stream contain resync markers
...
...
libavcodec/mpeg4videodec.c
View file @
9ba3fc3e
...
...
@@ -1789,7 +1789,7 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
return
-
1
;
}
s
->
sprite_warping_accuracy
=
get_bits
(
gb
,
2
);
s
->
sprite_brightness_change
=
get_bits1
(
gb
);
ctx
->
sprite_brightness_change
=
get_bits1
(
gb
);
if
(
ctx
->
vol_sprite_usage
==
STATIC_SPRITE
)
skip_bits1
(
gb
);
// low_latency_sprite
}
...
...
@@ -2204,7 +2204,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
ctx
->
vol_sprite_usage
==
GMC_SPRITE
))
{
if
(
mpeg4_decode_sprite_trajectory
(
ctx
,
gb
)
<
0
)
return
AVERROR_INVALIDDATA
;
if
(
s
->
sprite_brightness_change
)
if
(
ctx
->
sprite_brightness_change
)
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"sprite_brightness_change not supported
\n
"
);
if
(
ctx
->
vol_sprite_usage
==
STATIC_SPRITE
)
...
...
libavcodec/mpegvideo.h
View file @
9ba3fc3e
...
...
@@ -579,7 +579,6 @@ typedef struct MpegEncContext {
uint16_t
pb_time
;
///< time distance between the last b and p,s,i frame
uint16_t
pp_field_time
;
uint16_t
pb_field_time
;
///< like above, just for interlaced
int
sprite_brightness_change
;
int
num_sprite_warping_points
;
int
real_sprite_warping_points
;
uint16_t
sprite_traj
[
4
][
2
];
///< sprite trajectory points
...
...
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