Attachment 128354 Details for Bug 98005 – fix ntsc rates avoiding pointless division in last version

[patch] fix ntsc rates avoiding pointless division in last version

vce-ntsc-rate-control-v4-diff (text/plain), 2.68 KB, created by Andy Furniss on 2016-12-06 15:23:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Furniss

Created: 2016-12-06 15:23:04 UTC

Size: 2.68 KB

patch

obsolete

>diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c
>index b5b9a83..9f2b38f 100644
>--- a/src/gallium/state_trackers/va/picture.c
>+++ b/src/gallium/state_trackers/va/picture.c
>@@ -119,14 +119,30 @@ getEncParamPreset(vlVaContext *context)
>    context->desc.h264enc.rate_ctrl.fill_data_enable = 1;
>    context->desc.h264enc.rate_ctrl.enforce_hrd = 1;
>    context->desc.h264enc.enable_vui = false;
>-   if (context->desc.h264enc.rate_ctrl.frame_rate_num == 0)
>-      context->desc.h264enc.rate_ctrl.frame_rate_num = 30;
>-   context->desc.h264enc.rate_ctrl.target_bits_picture =
>-      context->desc.h264enc.rate_ctrl.target_bitrate / context->desc.h264enc.rate_ctrl.frame_rate_num;
>-   context->desc.h264enc.rate_ctrl.peak_bits_picture_integer =
>-      context->desc.h264enc.rate_ctrl.peak_bitrate / context->desc.h264enc.rate_ctrl.frame_rate_num;
>-   context->desc.h264enc.rate_ctrl.peak_bits_picture_fraction = 0;
>+   if (context->desc.h264enc.rate_ctrl.frame_rate_num == 0 ||
>+       context->desc.h264enc.rate_ctrl.frame_rate_den == 0) {
>+         context->desc.h264enc.rate_ctrl.frame_rate_num = 30;
>+         context->desc.h264enc.rate_ctrl.frame_rate_den = 1;
>+   }
>+   if (context->desc.h264enc.rate_ctrl.frame_rate_den > 1) {
>+      context->desc.h264enc.rate_ctrl.target_bits_picture =
>+         context->desc.h264enc.rate_ctrl.target_bitrate /
>+         (context->desc.h264enc.rate_ctrl.frame_rate_num /
>+         context->desc.h264enc.rate_ctrl.frame_rate_den + 1);
>+      context->desc.h264enc.rate_ctrl.peak_bits_picture_integer =
>+         context->desc.h264enc.rate_ctrl.peak_bitrate /
>+         (context->desc.h264enc.rate_ctrl.frame_rate_num /
>+         context->desc.h264enc.rate_ctrl.frame_rate_den + 1);
>+   } else {
>+      context->desc.h264enc.rate_ctrl.target_bits_picture =
>+         context->desc.h264enc.rate_ctrl.target_bitrate /
>+         context->desc.h264enc.rate_ctrl.frame_rate_num;
>+      context->desc.h264enc.rate_ctrl.peak_bits_picture_integer =
>+         context->desc.h264enc.rate_ctrl.peak_bitrate /
>+         context->desc.h264enc.rate_ctrl.frame_rate_num;
>+   }
> 
>+   context->desc.h264enc.rate_ctrl.peak_bits_picture_fraction = 0;
>    context->desc.h264enc.ref_pic_mode = 0x00000201;
> }
> 
>@@ -357,7 +373,7 @@ handleVAEncSequenceParameterBufferType(vlVaDriver *drv, vlVaContext *context, vl
>       context->gop_coeff = VL_VA_ENC_GOP_COEFF;
>    context->desc.h264enc.gop_size = h264->intra_idr_period * context->gop_coeff;
>    context->desc.h264enc.rate_ctrl.frame_rate_num = h264->time_scale / 2;
>-   context->desc.h264enc.rate_ctrl.frame_rate_den = 1;
>+   context->desc.h264enc.rate_ctrl.frame_rate_den = h264->num_units_in_tick;
>    return VA_STATUS_SUCCESS;
> }
>

Actions: View | Splinter Review

Attachments on bug 98005: 127943 | 128084 | 128354

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.