diff options
| author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2018-02-22 14:29:19 -0600 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2018-02-27 17:51:02 -0500 |
| commit | 35226dba88a47a0fe235a28123438e9177eeada1 (patch) | |
| tree | d37edef2c3cf418a33c6f750af5bde59180ba1a8 | |
| parent | 25c2a0d35396a6b58847a83a8617ef87a3f6a899 (diff) | |
Revert "tests: simple-encoder: add an option to set ROI"
This reverts commit c21345c4787bb6342adddea1190f53fe62abff04.
https://bugzilla.gnome.org/show_bug.cgi?id=768248
| -rw-r--r-- | tests/simple-encoder.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/tests/simple-encoder.c b/tests/simple-encoder.c index a404e9a2..58b0e8c2 100644 --- a/tests/simple-encoder.c +++ b/tests/simple-encoder.c @@ -32,7 +32,6 @@ static guint g_bitrate = 0; static gchar *g_codec_str; static gchar *g_output_file_name; static char **g_input_files = NULL; -static gboolean g_roi_enable = FALSE; #define SURFACE_NUM 16 @@ -43,8 +42,6 @@ static GOptionEntry g_options[] = { "desired bitrate expressed in kbps", NULL}, {"output", 'o', 0, G_OPTION_ARG_FILENAME, &g_output_file_name, "output file name", NULL}, - {"roi", 'r', 0, G_OPTION_ARG_NONE, &g_roi_enable, - "enable region of interest", NULL}, {G_OPTION_REMAINING, ' ', 0, G_OPTION_ARG_FILENAME_ARRAY, &g_input_files, "input file name", NULL}, {NULL} @@ -61,7 +58,6 @@ typedef struct FILE *output_file; guint input_stopped:1; guint encode_failed:1; - GstVaapiROI roi_region[2]; } App; static inline gchar * @@ -184,35 +180,6 @@ set_format (GstVaapiEncoder * encoder, gint width, gint height, gint fps_n, return (status == GST_VAAPI_ENCODER_STATUS_SUCCESS); } -static void -add_roi (App * app) -{ - guint i; - gint width, height; - - width = app->parser->width; - height = app->parser->height; - - for (i = 0; i < 2; i++) { - app->roi_region[i].roi_value = 4; - app->roi_region[i].rect.x = i * width / 2; - app->roi_region[i].rect.y = i * height / 2; - app->roi_region[i].rect.width = width / 4; - app->roi_region[i].rect.height = height / 4; - - gst_vaapi_encoder_add_roi (app->encoder, &app->roi_region[i]); - } -} - -static void -del_roi (App * app) -{ - guint i; - - for (i = 0; i < 2; i++) - gst_vaapi_encoder_del_roi (app->encoder, &app->roi_region[i]); -} - static GstBuffer * allocate_buffer (GstVaapiCodedBuffer * vbuf) { @@ -326,9 +293,6 @@ app_free (App * app) { g_return_if_fail (app); - if (g_roi_enable) - del_roi (app); - if (app->parser) y4m_reader_close (app->parser); @@ -384,9 +348,6 @@ app_new (const gchar * input_fn, const gchar * output_fn) goto error; } - if (g_roi_enable) - add_roi (app); - return app; error: |