mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "tests: simple-encoder: add an option to set ROI"

Browse source 
This reverts commit c21345c478.

https://bugzilla.gnome.org/show_bug.cgi?id=768248
This commit is contained in:
Víctor Manuel Jáquez Leal 2018-02-22 14:29:19 -06:00 committed by Nicolas Dufresne
parent 25c2a0d353
commit 35226dba88
1 changed files with 0 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
tests/simple-encoder.c
View file

@ -32,7 +32,6 @@ static guint g_bitrate = 0;
static gchar *g_codec_str; static gchar *g_codec_str;
static gchar *g_output_file_name; static gchar *g_output_file_name;
static char **g_input_files = NULL; static char **g_input_files = NULL;
static gboolean g_roi_enable = FALSE;
#define SURFACE_NUM 16 #define SURFACE_NUM 16
@ -43,8 +42,6 @@ static GOptionEntry g_options[] = {
"desired bitrate expressed in kbps", NULL}, "desired bitrate expressed in kbps", NULL},
{"output", 'o', 0, G_OPTION_ARG_FILENAME, &g_output_file_name, {"output", 'o', 0, G_OPTION_ARG_FILENAME, &g_output_file_name,
"output file name", NULL}, "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, {G_OPTION_REMAINING, ' ', 0, G_OPTION_ARG_FILENAME_ARRAY, &g_input_files,
"input file name", NULL}, "input file name", NULL},
{NULL} {NULL}
@ -61,7 +58,6 @@ typedef struct
FILE *output_file; FILE *output_file;
guint input_stopped:1; guint input_stopped:1;
guint encode_failed:1; guint encode_failed:1;
GstVaapiROI roi_region[2];
} App; } App;
static inline gchar * 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); 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 * static GstBuffer *
allocate_buffer (GstVaapiCodedBuffer * vbuf) allocate_buffer (GstVaapiCodedBuffer * vbuf)
{ {
@ -326,9 +293,6 @@ app_free (App * app)
{ {
g_return_if_fail (app); g_return_if_fail (app);
if (g_roi_enable)
del_roi (app);
if (app->parser) if (app->parser)
y4m_reader_close (app->parser); y4m_reader_close (app->parser);
@ -384,9 +348,6 @@ app_new (const gchar * input_fn, const gchar * output_fn)
goto error; goto error;
} }
if (g_roi_enable)
add_roi (app);
return app; return app;
error: error: