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
c72f0ee3
Commit
c72f0ee3
authored
Aug 19, 2014
by
Dmitry Kovalev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removing output_pkt_list and pkt_list from config structs.
Change-Id: Id21f1e77f1d030fbe3f5f30486d2a7ecb2bccdf5
parent
df083b26
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.c
+0
-2
vp9/vp9_cx_iface.c
vp9/vp9_cx_iface.c
+4
-6
No files found.
vp9/encoder/vp9_encoder.c
View file @
c72f0ee3
...
...
@@ -840,8 +840,6 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf) {
kf_list = fopen("kf_list.stt", "w");
#endif
cpi
->
output_pkt_list
=
oxcf
->
output_pkt_list
;
cpi
->
allow_encode_breakout
=
ENCODE_BREAKOUT_ENABLED
;
if
(
oxcf
->
pass
==
1
)
{
...
...
vp9/vp9_cx_iface.c
View file @
c72f0ee3
...
...
@@ -21,7 +21,6 @@
#include "vp9/vp9_iface_common.h"
struct
vp9_extracfg
{
struct
vpx_codec_pkt_list
*
pkt_list
;
int
cpu_used
;
// available cpu percentage in 1/16
unsigned
int
enable_auto_alt_ref
;
unsigned
int
noise_sensitivity
;
...
...
@@ -44,7 +43,6 @@ struct vp9_extracfg {
};
static
struct
vp9_extracfg
default_extra_cfg
=
{
NULL
,
0
,
// cpu_used
1
,
// enable_auto_alt_ref
0
,
// noise_sensitivity
...
...
@@ -383,7 +381,6 @@ static vpx_codec_err_t set_encoder_config(
oxcf
->
sharpness
=
extra_cfg
->
sharpness
;
oxcf
->
two_pass_stats_in
=
cfg
->
rc_twopass_stats_in
;
oxcf
->
output_pkt_list
=
extra_cfg
->
pkt_list
;
#if CONFIG_FP_MB_STATS
oxcf
->
firstpass_mb_stats_in
=
cfg
->
rc_firstpass_mb_stats_in
;
...
...
@@ -667,7 +664,6 @@ static vpx_codec_err_t encoder_init(vpx_codec_ctx_t *ctx,
}
priv
->
extra_cfg
=
default_extra_cfg
;
priv
->
extra_cfg
.
pkt_list
=
&
priv
->
pkt_list
.
head
;
vp9_initialize_enc
();
...
...
@@ -679,10 +675,12 @@ static vpx_codec_err_t encoder_init(vpx_codec_ctx_t *ctx,
&
ctx
->
priv
->
alg_priv
->
cfg
,
&
ctx
->
priv
->
alg_priv
->
extra_cfg
);
cpi
=
vp9_create_compressor
(
&
ctx
->
priv
->
alg_priv
->
oxcf
);
if
(
cpi
==
NULL
)
if
(
cpi
==
NULL
)
{
res
=
VPX_CODEC_MEM_ERROR
;
else
}
else
{
cpi
->
output_pkt_list
=
&
priv
->
pkt_list
.
head
;
ctx
->
priv
->
alg_priv
->
cpi
=
cpi
;
}
}
}
...
...
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