From: Seungha Yang <seungha@centricular.com>
Date: Tue, 28 Jun 2022 08:40:56 +0000 (+0900)
Subject: d3d11videosink: Fix for force-aspect-ratio setting when rendering on shared texture
X-Git-Tag: 1.22.0~1362
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1043481247e9a75ba2c1e9be474dbb8a497535fb;p=platform%2Fupstream%2Fgstreamer.git

d3d11videosink: Fix for force-aspect-ratio setting when rendering on shared texture

Set specified force-aspect-ratio value on window object
in case of shared texture rendering as well

Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1304
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2671>
---

diff --git a/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11videosink.cpp b/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11videosink.cpp
index d20abcd..2fe593d 100644
--- a/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11videosink.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11videosink.cpp
@@ -760,7 +760,7 @@ gst_d3d11_video_sink_prepare_window (GstD3D11VideoSink * self)
     GST_INFO_OBJECT (self,
         "Create dummy window for rendering on shared texture");
     self->window = gst_d3d11_window_dummy_new (self->device);
-    return TRUE;
+    goto done;
   }
 
   if (!self->window_id)
@@ -809,6 +809,7 @@ gst_d3d11_video_sink_prepare_window (GstD3D11VideoSink * self)
       break;
   }
 
+done:
   if (!self->window) {
     GST_ERROR_OBJECT (self, "Cannot create d3d11window");
     return FALSE;