mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

filter: fix semantics of deinterlacing flags.

Browse source 
Fix deinterlacing flags to make more sense. The TFF (top-field-first)
flag is meant to specify the organization of reference frames used in
advanced deinterlacing modes. Introduce the more explicit flag TOPFIELD
to specify that the top-field of the supplied input surface is to be
used for deinterlacing. Conversely, if not set, this means that the
bottom field of the supplied input surface will be used instead.
This commit is contained in:
Gwenole Beauchesne 2013-11-21 18:44:46 +01:00
parent 152ffb52d2
commit 06c7fde8e0
5 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/vaapi/gstvaapifilter.c
View file

@ -112,6 +112,8 @@ gst_vaapi_deinterlace_flags_get_type(void)
"Top-field first", "top-field-first" },
{ GST_VAAPI_DEINTERLACE_FLAG_ONEFIELD,
"One field", "one-field" },
{ GST_VAAPI_DEINTERLACE_FLAG_TOPFIELD,
"Top field", "top-field" },
{ 0, NULL, NULL }
};

11
gst-libs/gst/vaapi/gstvaapifilter.h
View file

@ -109,16 +109,23 @@ typedef enum {
/**
* GstVaapiDeinterlaceFlags:
* @GST_VAAPI_DEINTERLACE_FLAG_TFF: Top-field first. If this flag is
* not set, then bottom-field first order is assumed.
* not set, then bottom-field first order is assumed. Note: this
* only affects the way reference frames are organized for advanced
* deinterlacing modes.
* @GST_VAAPI_DEINTERLACE_FLAG_ONEFIELD: The input frame represents a
* single field. If this flag is not set, then the whole frame holds
* two fields.
* two interleaved fields.
* @GST_VAAPI_DEINTERLACE_FLAG_TOPFIELD: The top field of the input
* frame is to be used for deinterlacing. Otherwise, if this flag is
* not set, then the bottom field of the input frame will be used
* for deinterlacing.
*
* The set of gst_vaapi_filter_set_deinterlacing() flags.
*/
typedef enum {
GST_VAAPI_DEINTERLACE_FLAG_TFF = 1 << 31,
GST_VAAPI_DEINTERLACE_FLAG_ONEFIELD = 1 << 30,
GST_VAAPI_DEINTERLACE_FLAG_TOPFIELD = 1 << 29,
} GstVaapiDeinterlaceFlags;
#define GST_VAAPI_TYPE_DEINTERLACE_METHOD \

8
gst-libs/gst/vaapi/gstvaapiutils.c
View file

@ -471,11 +471,11 @@ from_GstVaapiDeinterlaceFlags(guint flags)
if (!(flags & GST_VAAPI_DEINTERLACE_FLAG_TFF))
va_flags |= VA_DEINTERLACING_BOTTOM_FIELD_FIRST;
if (flags & GST_VAAPI_DEINTERLACE_FLAG_ONEFIELD) {
if (flags & GST_VAAPI_DEINTERLACE_FLAG_ONEFIELD)
va_flags |= VA_DEINTERLACING_ONE_FIELD;
if (!(flags & GST_VAAPI_DEINTERLACE_FLAG_TFF))
va_flags |= VA_DEINTERLACING_BOTTOM_FIELD;
}
if (!(flags & GST_VAAPI_DEINTERLACE_FLAG_TOPFIELD))
va_flags |= VA_DEINTERLACING_BOTTOM_FIELD;
#endif
return va_flags;
}

4
gst/vaapi/gstvaapipostproc.c
View file

@ -449,7 +449,7 @@ gst_vaapipostproc_process_vpp(GstBaseTransform *trans, GstBuffer *inbuf,
if (deint) {
GstVaapiDeinterlaceMethod deint_method;
deint_flags = (tff ? GST_VAAPI_DEINTERLACE_FLAG_TFF : 0);
deint_flags = (tff ? GST_VAAPI_DEINTERLACE_FLAG_TOPFIELD : 0);
if (!set_best_deint_method(postproc, flags, &deint_method))
goto error_op_deinterlace;
if (deint_method != postproc->deinterlace_method) {
@ -482,7 +482,7 @@ gst_vaapipostproc_process_vpp(GstBaseTransform *trans, GstBuffer *inbuf,
outbuf_surface = gst_vaapi_video_meta_get_surface(outbuf_meta);
if (deint) {
deint_flags = (tff ? 0 : GST_VAAPI_DEINTERLACE_FLAG_TFF);
deint_flags = (tff ? 0 : GST_VAAPI_DEINTERLACE_FLAG_TOPFIELD);
if (!gst_vaapi_filter_set_deinterlacing(postproc->filter,
postproc->deinterlace_method, deint_flags))
goto error_op_deinterlace;

8
tests/test-filter.c
View file

@ -291,7 +291,9 @@ end:
static inline gboolean
parse_deinterlace(const gchar *str, GstVaapiDeinterlaceMethod *deinterlace_ptr)
{
return parse_enum(str, GST_VAAPI_TYPE_DEINTERLACE_METHOD,
g_return_val_if_fail(deinterlace_ptr != NULL, FALSE);
return str && parse_enum(str, GST_VAAPI_TYPE_DEINTERLACE_METHOD,
GST_VAAPI_DEINTERLACE_METHOD_NONE, (gint *)deinterlace_ptr);
}
@ -390,7 +392,7 @@ main(int argc, char *argv[])
g_error("failed to set deinterlacing method");
}
else if (deinterlace_flags) {
if (deinterlace_flags & GST_VAAPI_DEINTERLACE_FLAG_TFF)
if (deinterlace_flags & GST_VAAPI_DEINTERLACE_FLAG_TOPFIELD)
filter_flags = GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD;
else
filter_flags = GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD;
@ -401,7 +403,7 @@ main(int argc, char *argv[])
if (!(deinterlace_flags & GST_VAAPI_DEINTERLACE_FLAG_ONEFIELD))
surface_flags = GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD |
GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD;
else if (deinterlace_flags & GST_VAAPI_DEINTERLACE_FLAG_TFF)
else if (deinterlace_flags & GST_VAAPI_DEINTERLACE_FLAG_TOPFIELD)
surface_flags = GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD;
else
surface_flags = GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD;