mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 02:00:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

encoder: fix bitrate units to match kbps.

Browse source 
Bitrate is expressed in kilobits per second (kbps). So, this exactly
means in multiple of 1000 bits, not 1024 bits.

https://bugzilla.gnome.org/show_bug.cgi?id=722086
This commit is contained in:
Gwenole Beauchesne 2014-01-12 23:17:14 +01:00
parent 4a6fbddad6
commit 368caf22da
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst-libs/gst/vaapi/gstvaapiencoder_h264.c
View file

@ -564,9 +564,9 @@ gst_bit_writer_write_sps (GstBitWriter * bitwriter,
for (i = 0; i < 1; ++i) { for (i = 0; i < 1; ++i) {
/* bit_rate_value_minus1[0] */ /* bit_rate_value_minus1[0] */
gst_bit_writer_put_ue (bitwriter, seq->bits_per_second / 1024 - 1); gst_bit_writer_put_ue (bitwriter, seq->bits_per_second / 1000 - 1);
/* cpb_size_value_minus1[0] */ /* cpb_size_value_minus1[0] */
gst_bit_writer_put_ue (bitwriter, seq->bits_per_second / 1024 * 8 - 1); gst_bit_writer_put_ue (bitwriter, seq->bits_per_second / 1000 * 8 - 1);
/* cbr_flag[0] */ /* cbr_flag[0] */
gst_bit_writer_put_bits_uint32 (bitwriter, 1, 1); gst_bit_writer_put_bits_uint32 (bitwriter, 1, 1);
} }
@ -857,7 +857,7 @@ fill_va_sequence_param (GstVaapiEncoderH264 * encoder,
seq->intra_period = GST_VAAPI_ENCODER_KEYFRAME_PERIOD (encoder); seq->intra_period = GST_VAAPI_ENCODER_KEYFRAME_PERIOD (encoder);
seq->ip_period = 0; // ? seq->ip_period = 0; // ?
if (base_encoder->bitrate > 0) if (base_encoder->bitrate > 0)
seq->bits_per_second = base_encoder->bitrate * 1024; seq->bits_per_second = base_encoder->bitrate * 1000;
else else
seq->bits_per_second = 0; seq->bits_per_second = 0;
@ -1215,8 +1215,8 @@ ensure_misc (GstVaapiEncoderH264 * encoder, GstVaapiEncPicture * picture)
gst_vaapi_enc_picture_add_misc_buffer (picture, misc); gst_vaapi_enc_picture_add_misc_buffer (picture, misc);
hrd = misc->impl; hrd = misc->impl;
if (base_encoder->bitrate > 0) { if (base_encoder->bitrate > 0) {
hrd->initial_buffer_fullness = base_encoder->bitrate * 1024 * 4; hrd->initial_buffer_fullness = base_encoder->bitrate * 1000 * 4;
hrd->buffer_size = base_encoder->bitrate * 1024 * 8; hrd->buffer_size = base_encoder->bitrate * 1000 * 8;
} else { } else {
hrd->initial_buffer_fullness = 0; hrd->initial_buffer_fullness = 0;
hrd->buffer_size = 0; hrd->buffer_size = 0;
@ -1234,7 +1234,7 @@ ensure_misc (GstVaapiEncoderH264 * encoder, GstVaapiEncPicture * picture)
rate_control = misc->impl; rate_control = misc->impl;
memset (rate_control, 0, sizeof (VAEncMiscParameterRateControl)); memset (rate_control, 0, sizeof (VAEncMiscParameterRateControl));
if (base_encoder->bitrate) if (base_encoder->bitrate)
rate_control->bits_per_second = base_encoder->bitrate * 1024; rate_control->bits_per_second = base_encoder->bitrate * 1000;
else else
rate_control->bits_per_second = 0; rate_control->bits_per_second = 0;
rate_control->target_percentage = 70; rate_control->target_percentage = 70;
@ -1272,7 +1272,7 @@ ensure_bitrate (GstVaapiEncoderH264 * encoder)
base_encoder->bitrate = GST_VAAPI_ENCODER_WIDTH (encoder) * base_encoder->bitrate = GST_VAAPI_ENCODER_WIDTH (encoder) *
GST_VAAPI_ENCODER_HEIGHT (encoder) * GST_VAAPI_ENCODER_HEIGHT (encoder) *
GST_VAAPI_ENCODER_FPS_N (encoder) / GST_VAAPI_ENCODER_FPS_N (encoder) /
GST_VAAPI_ENCODER_FPS_D (encoder) / 4 / 1024; GST_VAAPI_ENCODER_FPS_D (encoder) / 4 / 1000;
break; break;
default: default:
base_encoder->bitrate = 0; base_encoder->bitrate = 0;

10
gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.c
View file

@ -126,7 +126,7 @@ ensure_bitrate (GstVaapiEncoderMpeg2 * encoder)
base_encoder->bitrate = GST_VAAPI_ENCODER_WIDTH (encoder) * base_encoder->bitrate = GST_VAAPI_ENCODER_WIDTH (encoder) *
GST_VAAPI_ENCODER_HEIGHT (encoder) * GST_VAAPI_ENCODER_HEIGHT (encoder) *
GST_VAAPI_ENCODER_FPS_N (encoder) / GST_VAAPI_ENCODER_FPS_N (encoder) /
GST_VAAPI_ENCODER_FPS_D (encoder) / 4 / 1024; GST_VAAPI_ENCODER_FPS_D (encoder) / 4 / 1000;
break; break;
default: default:
base_encoder->bitrate = 0; base_encoder->bitrate = 0;
@ -183,7 +183,7 @@ fill_sequence (GstVaapiEncoderMpeg2 * encoder, GstVaapiEncSequence * sequence)
seq->picture_height = GST_VAAPI_ENCODER_HEIGHT (encoder); seq->picture_height = GST_VAAPI_ENCODER_HEIGHT (encoder);
if (base_encoder->bitrate > 0) if (base_encoder->bitrate > 0)
seq->bits_per_second = base_encoder->bitrate * 1024; seq->bits_per_second = base_encoder->bitrate * 1000;
else else
seq->bits_per_second = 0; seq->bits_per_second = 0;
@ -428,8 +428,8 @@ set_misc_parameters (GstVaapiEncoderMpeg2 * encoder,
gst_vaapi_enc_picture_add_misc_buffer (picture, misc); gst_vaapi_enc_picture_add_misc_buffer (picture, misc);
hrd = misc->impl; hrd = misc->impl;
if (base_encoder->bitrate > 0) { if (base_encoder->bitrate > 0) {
hrd->initial_buffer_fullness = base_encoder->bitrate * 1024 * 4; hrd->initial_buffer_fullness = base_encoder->bitrate * 1000 * 4;
hrd->buffer_size = base_encoder->bitrate * 1024 * 8; hrd->buffer_size = base_encoder->bitrate * 1000 * 8;
} else { } else {
hrd->initial_buffer_fullness = 0; hrd->initial_buffer_fullness = 0;
hrd->buffer_size = 0; hrd->buffer_size = 0;
@ -446,7 +446,7 @@ set_misc_parameters (GstVaapiEncoderMpeg2 * encoder,
rate_control = misc->impl; rate_control = misc->impl;
memset (rate_control, 0, sizeof (VAEncMiscParameterRateControl)); memset (rate_control, 0, sizeof (VAEncMiscParameterRateControl));
if (base_encoder->bitrate) if (base_encoder->bitrate)
rate_control->bits_per_second = base_encoder->bitrate * 1024; rate_control->bits_per_second = base_encoder->bitrate * 1000;
else else
rate_control->bits_per_second = 0; rate_control->bits_per_second = 0;
rate_control->target_percentage = 70; rate_control->target_percentage = 70;