Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
external
libvpx
Commits
10da24a4
Commit
10da24a4
authored
Aug 21, 2014
by
Dmitry Kovalev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removing last_source field from VP9_COMP.
Change-Id: I5d7cb0151d8495e5ecd073a98b73da65cc6e7274
parent
4d5c9148
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.c
+5
-6
vp9/encoder/vp9_encoder.h
vp9/encoder/vp9_encoder.h
+0
-1
No files found.
vp9/encoder/vp9_encoder.c
View file @
10da24a4
...
...
@@ -2461,6 +2461,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
RATE_CONTROL
*
const
rc
=
&
cpi
->
rc
;
struct
vpx_usec_timer
cmptimer
;
YV12_BUFFER_CONFIG
*
force_src_buffer
=
NULL
;
struct
lookahead_entry
*
last_source
=
NULL
;
MV_REFERENCE_FRAME
ref_frame
;
int
arf_src_index
;
...
...
@@ -2474,7 +2475,6 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
vpx_usec_timer_start
(
&
cmptimer
);
cpi
->
source
=
NULL
;
cpi
->
last_source
=
NULL
;
vp9_set_high_precision_mv
(
cpi
,
ALTREF_HIGH_PRECISION_MV
);
...
...
@@ -2537,11 +2537,11 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
if
(
cm
->
current_video_frame
>
0
)
{
#if CONFIG_SPATIAL_SVC
if
(
is_spatial_svc
(
cpi
))
cpi
->
last_source
=
vp9_svc_lookahead_peek
(
cpi
,
cpi
->
lookahead
,
-
1
,
0
);
last_source
=
vp9_svc_lookahead_peek
(
cpi
,
cpi
->
lookahead
,
-
1
,
0
);
else
#endif
cpi
->
last_source
=
vp9_lookahead_peek
(
cpi
->
lookahead
,
-
1
);
if
(
cpi
->
last_source
==
NULL
)
last_source
=
vp9_lookahead_peek
(
cpi
->
lookahead
,
-
1
);
if
(
last_source
==
NULL
)
return
-
1
;
}
...
...
@@ -2565,8 +2565,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
cpi
->
un_scaled_source
=
cpi
->
Source
=
force_src_buffer
?
force_src_buffer
:
&
cpi
->
source
->
img
;
cpi
->
unscaled_last_source
=
cpi
->
last_source
!=
NULL
?
&
cpi
->
last_source
->
img
:
NULL
;
cpi
->
unscaled_last_source
=
last_source
!=
NULL
?
&
last_source
->
img
:
NULL
;
*
time_stamp
=
cpi
->
source
->
ts_start
;
*
time_end
=
cpi
->
source
->
ts_end
;
...
...
vp9/encoder/vp9_encoder.h
View file @
10da24a4
...
...
@@ -235,7 +235,6 @@ typedef struct VP9_COMP {
struct
lookahead_ctx
*
lookahead
;
struct
lookahead_entry
*
source
;
struct
lookahead_entry
*
alt_ref_source
;
struct
lookahead_entry
*
last_source
;
YV12_BUFFER_CONFIG
*
Source
;
YV12_BUFFER_CONFIG
*
Last_Source
;
// NULL for first frame and alt_ref frames
...
...
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