Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
x264
Commits
cd707257
Commit
cd707257
authored
Jul 28, 2009
by
Fiona Glaser
Browse files
Update help and cleanup in ratecontrol.c
Deal with some out-of-date information.
parent
b8c7499d
Changes
2
Hide whitespace changes
Inline
Side-by-side
encoder/ratecontrol.c
View file @
cd707257
...
...
@@ -883,12 +883,7 @@ void x264_ratecontrol_start( x264_t *h, int i_force_qp )
if
(
rce
)
rce
->
new_qp
=
rc
->
qp
;
/* accum_p_qp needs to be here so that future frames can benefit from the
* data before this frame is done. but this only works because threading
* guarantees to not re-encode any frames. so the non-threaded case does
* accum_p_qp later. */
if
(
h
->
param
.
i_threads
>
1
)
accum_p_qp_update
(
h
,
rc
->
qp
);
accum_p_qp_update
(
h
,
rc
->
qp
);
if
(
h
->
sh
.
i_type
!=
SLICE_TYPE_B
)
rc
->
last_non_b_pict_type
=
h
->
sh
.
i_type
;
...
...
@@ -1142,9 +1137,6 @@ void x264_ratecontrol_end( x264_t *h, int bits )
rc
->
cplxr_sum
*=
rc
->
cbr_decay
;
rc
->
wanted_bits_window
+=
rc
->
bitrate
/
rc
->
fps
;
rc
->
wanted_bits_window
*=
rc
->
cbr_decay
;
if
(
h
->
param
.
i_threads
==
1
)
accum_p_qp_update
(
h
,
rc
->
qpa_rc
);
}
if
(
rc
->
b_2pass
)
...
...
x264.c
View file @
cd707257
...
...
@@ -204,8 +204,8 @@ static void Help( x264_param_t *defaults, int b_longhelp )
H0
(
" -q, --qp <integer> Set QP (0-51, 0=lossless)
\n
"
);
H0
(
" -B, --bitrate <integer> Set bitrate (kbit/s)
\n
"
);
H0
(
" --crf <float> Quality-based VBR (0-51, 0=lossless) [%.1f]
\n
"
,
defaults
->
rc
.
f_rf_constant
);
H
1
(
" --vbv-maxrate <integer> Max local bitrate (kbit/s) [%d]
\n
"
,
defaults
->
rc
.
i_vbv_max_bitrate
);
H0
(
" --vbv-bufsize <integer>
Enable CBR and s
et size of the VBV buffer (kbit) [%d]
\n
"
,
defaults
->
rc
.
i_vbv_buffer_size
);
H
0
(
" --vbv-maxrate <integer> Max local bitrate (kbit/s) [%d]
\n
"
,
defaults
->
rc
.
i_vbv_max_bitrate
);
H0
(
" --vbv-bufsize <integer>
S
et size of the VBV buffer (kbit) [%d]
\n
"
,
defaults
->
rc
.
i_vbv_buffer_size
);
H1
(
" --vbv-init <float> Initial VBV buffer occupancy [%.1f]
\n
"
,
defaults
->
rc
.
f_vbv_buffer_init
);
H1
(
" --qpmin <integer> Set min QP [%d]
\n
"
,
defaults
->
rc
.
i_qp_min
);
H1
(
" --qpmax <integer> Set max QP [%d]
\n
"
,
defaults
->
rc
.
i_qp_max
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment