From bb2248ab663ea3e9a2bd124416a9d98548b09e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Wed, 3 Feb 2016 12:17:59 +0100 Subject: plugins: fix code style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Minor code style changes by executing gst-indent in gst/vaapi directory. Signed-off-by: Víctor Manuel Jáquez Leal --- gst/vaapi/gstvaapidecode.c | 11 ++++++----- gst/vaapi/gstvaapidecodebin.c | 8 ++++---- gst/vaapi/gstvaapipluginutil.c | 9 ++++----- gst/vaapi/gstvaapisink.c | 6 ++++-- gst/vaapi/gstvaapivideomemory.c | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c index d7ed728a..de61d14c 100644 --- a/gst/vaapi/gstvaapidecode.c +++ b/gst/vaapi/gstvaapidecode.c @@ -123,8 +123,7 @@ static gboolean gst_vaapidecode_sink_query (GstVideoDecoder * vdec, GstQuery * query); static gboolean gst_vaapidecode_src_query (GstVideoDecoder * vdec, GstQuery * query); -static gboolean -gst_vaapidecode_negotiate (GstVaapiDecode * decode); +static gboolean gst_vaapidecode_negotiate (GstVaapiDecode * decode); static void gst_vaapi_decoder_state_changed (GstVaapiDecoder * decoder, @@ -275,14 +274,15 @@ gst_vaapidecode_release (GstVaapiDecode * decode) } static gboolean -is_surface_resolution_changed (GstVideoDecoder *vdec, GstVaapiSurface *surface) +is_surface_resolution_changed (GstVideoDecoder * vdec, + GstVaapiSurface * surface) { guint surface_width, surface_height; guint configured_width, configured_height; GstVideoCodecState *state; gboolean ret = FALSE; - gst_vaapi_surface_get_size(surface, &surface_width, &surface_height); + gst_vaapi_surface_get_size (surface, &surface_width, &surface_height); state = gst_video_decoder_get_output_state (vdec); configured_width = GST_VIDEO_INFO_WIDTH (&state->info); @@ -310,7 +310,8 @@ gst_vaapidecode_push_decoded_frame (GstVideoDecoder * vdec, proxy = gst_video_codec_frame_get_user_data (out_frame); /* reconfigure if un-cropped surface resolution changed */ - if (is_surface_resolution_changed (vdec, GST_VAAPI_SURFACE_PROXY_SURFACE (proxy))) + if (is_surface_resolution_changed (vdec, + GST_VAAPI_SURFACE_PROXY_SURFACE (proxy))) gst_vaapidecode_negotiate (decode); gst_vaapi_surface_proxy_set_destroy_notify (proxy, diff --git a/gst/vaapi/gstvaapidecodebin.c b/gst/vaapi/gstvaapidecodebin.c index 98aaed4b..9ab354f9 100644 --- a/gst/vaapi/gstvaapidecodebin.c +++ b/gst/vaapi/gstvaapidecodebin.c @@ -211,7 +211,7 @@ ensure_vpp (GstVaapiDecodeBin * vaapidecbin) return FALSE; vaapidecbin->has_vpp = gst_vaapi_display_has_video_processing (display) ? - HAS_VPP_YES : HAS_VPP_NO; + HAS_VPP_YES : HAS_VPP_NO; gst_vaapi_display_unref (display); @@ -219,7 +219,7 @@ ensure_vpp (GstVaapiDecodeBin * vaapidecbin) } static gboolean -gst_vaapi_decode_bin_reconfigure (GstVaapiDecodeBin* vaapidecbin) +gst_vaapi_decode_bin_reconfigure (GstVaapiDecodeBin * vaapidecbin) { if (!ensure_vpp (vaapidecbin)) return FALSE; @@ -325,7 +325,7 @@ gst_vaapi_decode_bin_handle_message (GstBin * bin, GstMessage * message) goto bail; vaapidecbin->has_vpp = gst_vaapi_display_has_video_processing (display) ? - HAS_VPP_YES : HAS_VPP_NO; + HAS_VPP_YES : HAS_VPP_NO; /* the underlying VA driver implementation doesn't support video * post-processing, hence we have to disable it */ @@ -362,7 +362,7 @@ gst_vaapi_decode_bin_change_state (GstElement * element, } ret = GST_ELEMENT_CLASS (gst_vaapi_decode_bin_parent_class)->change_state - (element, transition); + (element, transition); if (ret == GST_STATE_CHANGE_FAILURE) return ret; diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c index 7f628d8c..5293c874 100644 --- a/gst/vaapi/gstvaapipluginutil.c +++ b/gst/vaapi/gstvaapipluginutil.c @@ -609,7 +609,8 @@ _gst_caps_has_feature (const GstCaps * caps, const gchar * feature) } gboolean -gst_vaapi_caps_feature_contains (const GstCaps * caps, GstVaapiCapsFeature feature) +gst_vaapi_caps_feature_contains (const GstCaps * caps, + GstVaapiCapsFeature feature) { const gchar *feature_str; @@ -647,10 +648,8 @@ gst_video_info_change_format (GstVideoInfo * vip, GstVideoFormat format, vip->fps_n = vi.fps_n; vip->fps_d = vi.fps_d; - GST_VIDEO_INFO_MULTIVIEW_MODE (vip) = - GST_VIDEO_INFO_MULTIVIEW_MODE (&vi); - GST_VIDEO_INFO_MULTIVIEW_FLAGS (vip) = - GST_VIDEO_INFO_MULTIVIEW_FLAGS (&vi); + GST_VIDEO_INFO_MULTIVIEW_MODE (vip) = GST_VIDEO_INFO_MULTIVIEW_MODE (&vi); + GST_VIDEO_INFO_MULTIVIEW_FLAGS (vip) = GST_VIDEO_INFO_MULTIVIEW_FLAGS (&vi); } /** diff --git a/gst/vaapi/gstvaapisink.c b/gst/vaapi/gstvaapisink.c index 75c588bf..f7fb5a2f 100644 --- a/gst/vaapi/gstvaapisink.c +++ b/gst/vaapi/gstvaapisink.c @@ -1205,7 +1205,9 @@ gst_vaapisink_get_caps_impl (GstBaseSink * base_sink) return NULL; if (GST_VAAPI_PLUGIN_BASE_DISPLAY (sink)) { - raw_caps = gst_vaapi_plugin_base_get_allowed_raw_caps (GST_VAAPI_PLUGIN_BASE (sink)); + raw_caps = + gst_vaapi_plugin_base_get_allowed_raw_caps (GST_VAAPI_PLUGIN_BASE + (sink)); if (raw_caps) { out_caps = gst_caps_make_writable (out_caps); gst_caps_append (out_caps, gst_caps_copy (raw_caps)); @@ -1332,7 +1334,7 @@ gst_vaapisink_show_frame_unlocked (GstVaapiSink * sink, GstBuffer * src_buffer) ret = gst_vaapi_plugin_base_get_input_buffer (GST_VAAPI_PLUGIN_BASE (sink), src_buffer, &buffer); if (ret == GST_FLOW_NOT_SUPPORTED) - return GST_FLOW_OK; /* let's ignore the frame if it couldn't be uploaded */ + return GST_FLOW_OK; /* let's ignore the frame if it couldn't be uploaded */ if (ret != GST_FLOW_OK) return ret; diff --git a/gst/vaapi/gstvaapivideomemory.c b/gst/vaapi/gstvaapivideomemory.c index de4e092e..3cf4746b 100644 --- a/gst/vaapi/gstvaapivideomemory.c +++ b/gst/vaapi/gstvaapivideomemory.c @@ -717,7 +717,7 @@ allocator_configure_image_info (GstVaapiDisplay * display, gst_video_info_set_format (&allocator->image_info, GST_VIDEO_FORMAT_I420, GST_VIDEO_INFO_WIDTH (vinfo), GST_VIDEO_INFO_HEIGHT (vinfo)); else - allocator->image_info = *vinfo; + allocator->image_info = *vinfo; image = new_image (display, &allocator->image_info); if (!image) -- cgit v1.2.1