mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: encoder: h265: 16 bit rounding of picture width and height

Browse source 
pic_width_in_luma_samples/pic_height_in_luma_samples can be 16-bit rounded
instead of 32-bit.

In addition, codedbuf_size must be calculated according to this change.

https://bugzilla.gnome.org/show_bug.cgi?id=753229
This commit is contained in:
Hyunjun Ko 2017-10-16 12:09:08 +09:00 committed by Víctor Manuel Jáquez Leal
parent 7fa706f05a
commit e19570a8b6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst-libs/gst/vaapi/gstvaapiencoder_h265.c
View file

@ -2437,8 +2437,8 @@ set_context_info (GstVaapiEncoder * base_encoder)
+ (encoder->num_bframes > 0 ? 1 : 0) + DEFAULT_SURFACES_COUNT); + (encoder->num_bframes > 0 ? 1 : 0) + DEFAULT_SURFACES_COUNT);
/* Only YUV 4:2:0 formats are supported for now. */ /* Only YUV 4:2:0 formats are supported for now. */
base_encoder->codedbuf_size += GST_ROUND_UP_32 (vip->width) * base_encoder->codedbuf_size += GST_ROUND_UP_16 (vip->width) *
GST_ROUND_UP_32 (vip->height) * 3 / 2; GST_ROUND_UP_16 (vip->height) * 3 / 2;
return GST_VAAPI_ENCODER_STATUS_SUCCESS; return GST_VAAPI_ENCODER_STATUS_SUCCESS;
} }
@ -2456,15 +2456,15 @@ gst_vaapi_encoder_h265_reconfigure (GstVaapiEncoder * base_encoder)
if (luma_width != encoder->luma_width || luma_height != encoder->luma_height) { if (luma_width != encoder->luma_width || luma_height != encoder->luma_height) {
GST_DEBUG ("resolution: %d %d", GST_VAAPI_ENCODER_WIDTH (encoder), GST_DEBUG ("resolution: %d %d", GST_VAAPI_ENCODER_WIDTH (encoder),
GST_VAAPI_ENCODER_HEIGHT (encoder)); GST_VAAPI_ENCODER_HEIGHT (encoder));
encoder->luma_width = GST_ROUND_UP_32 (luma_width); encoder->luma_width = GST_ROUND_UP_16 (luma_width);
encoder->luma_height = GST_ROUND_UP_32 (luma_height); encoder->luma_height = GST_ROUND_UP_16 (luma_height);
encoder->ctu_width = (encoder->luma_width + 31) / 32; encoder->ctu_width = (encoder->luma_width + 31) / 32;
encoder->ctu_height = (encoder->luma_height + 31) / 32; encoder->ctu_height = (encoder->luma_height + 31) / 32;
encoder->config_changed = TRUE; encoder->config_changed = TRUE;
/* Frame Cropping */ /* Frame Cropping */
if ((GST_VAAPI_ENCODER_WIDTH (encoder) & 31) || if ((GST_VAAPI_ENCODER_WIDTH (encoder) & 15) ||
(GST_VAAPI_ENCODER_HEIGHT (encoder) & 31)) { (GST_VAAPI_ENCODER_HEIGHT (encoder) & 15)) {
static const guint SubWidthC[] = { 1, 2, 2, 1 }; static const guint SubWidthC[] = { 1, 2, 2, 1 };
static const guint SubHeightC[] = { 1, 2, 1, 1 }; static const guint SubHeightC[] = { 1, 2, 1, 1 };
encoder->conformance_window_flag = 1; encoder->conformance_window_flag = 1;