diff options
author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2019-03-29 18:29:51 +0100 |
---|---|---|
committer | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2019-03-29 18:29:51 +0100 |
commit | 7dc77ebf60edc37bcf7c26e0fbeb6ec963df293e (patch) | |
tree | 503b39d60d20c81a7a1d53eb307f64b9f10f4df6 | |
parent | 6404bd399d7f322128f1dce2fa03f94764dfb5fe (diff) |
libs: encoder: h264: simplify the view-ids setting
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapiencoder_h264.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_h264.c b/gst-libs/gst/vaapi/gstvaapiencoder_h264.c index 928c1c3b..d3bda05b 100644 --- a/gst-libs/gst/vaapi/gstvaapiencoder_h264.c +++ b/gst-libs/gst/vaapi/gstvaapiencoder_h264.c @@ -3441,40 +3441,40 @@ static void set_view_ids (GstVaapiEncoderH264 * const encoder, const GValue * value) { guint i, j; - gboolean use_default = TRUE; guint len = gst_value_array_get_size (value); - /* Try the user set view IDs */ - if (len > 0) { - if (len != encoder->num_views) { - GST_WARNING ("The view number is %d, but %d view IDs are provided. Just " - "fallback to use default view IDs.", encoder->num_views, len); - goto set_default_ids; - } + if (len == 0) + goto set_default_ids; - for (i = 0; i < len; i++) { - const GValue *val = gst_value_array_get_value (value, i); - encoder->view_ids[i] = g_value_get_uint (val); - } + if (len != encoder->num_views) { + GST_WARNING ("The view number is %d, but %d view IDs are provided. Just " + "fallback to use default view IDs.", encoder->num_views, len); + goto set_default_ids; + } - /* check whether duplicated ID */ - for (i = 0; i < len; i++) { - for (j = i + 1; j < len; j++) { - if (encoder->view_ids[i] == encoder->view_ids[j]) { - GST_WARNING ("The view %d and view %d have same view ID %d. Just " - "fallback to use default view IDs.", i, j, encoder->view_ids[i]); - goto set_default_ids; - } + for (i = 0; i < len; i++) { + const GValue *val = gst_value_array_get_value (value, i); + encoder->view_ids[i] = g_value_get_uint (val); + } + + /* check whether duplicated ID */ + for (i = 0; i < len; i++) { + for (j = i + 1; j < len; j++) { + if (encoder->view_ids[i] == encoder->view_ids[j]) { + GST_WARNING ("The view %d and view %d have same view ID %d. Just " + "fallback to use default view IDs.", i, j, encoder->view_ids[i]); + goto set_default_ids; } } - - use_default = FALSE; } + return; + set_default_ids: - if (use_default) + { for (i = 0; i < encoder->num_views; i++) encoder->view_ids[i] = i; + } } static GstVaapiEncoderStatus |