diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2017-05-15 16:37:14 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2017-05-15 19:38:33 +0300 |
| commit | f98403ca6b6ff84967375a468db2798b93488896 (patch) | |
| tree | f495937134241e8fb93a0c95afe8b74ef87e84cf | |
| parent | 922e39c2a3c381e15c79047c764ad92667005402 (diff) | |
| download | gstreamer-plugins-bad-f98403ca6b6ff84967375a468db2798b93488896.tar.gz | |
decklinkvideosink: Copy min(gstreamer_stride, decklink_stride) per line
Instead of just bpp * width, which might be more than we can copy.
| -rw-r--r-- | sys/decklink/gstdecklinkvideosink.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp index 7586bc356..78f5726fa 100644 --- a/sys/decklink/gstdecklinkvideosink.cpp +++ b/sys/decklink/gstdecklinkvideosink.cpp @@ -556,7 +556,7 @@ gst_decklink_video_sink_prepare (GstBaseSink * bsink, GstBuffer * buffer) gint i; GstDecklinkVideoFormat caps_format; BMDPixelFormat format; - gint bpp; + gint stride; GstVideoTimeCodeMeta *tc_meta; GST_DEBUG_OBJECT (self, "Preparing buffer %p", buffer); @@ -568,7 +568,6 @@ gst_decklink_video_sink_prepare (GstBaseSink * bsink, GstBuffer * buffer) caps_format = gst_decklink_type_from_video_format (self->info.finfo->format); format = gst_decklink_pixel_format_from_type (caps_format); - bpp = gst_decklink_bpp_from_type (caps_format); timestamp = GST_BUFFER_TIMESTAMP (buffer); duration = GST_BUFFER_DURATION (buffer); @@ -623,8 +622,9 @@ gst_decklink_video_sink_prepare (GstBaseSink * bsink, GstBuffer * buffer) frame->GetBytes ((void **) &outdata); indata = (guint8 *) GST_VIDEO_FRAME_PLANE_DATA (&vframe, 0); + stride = MIN (GST_VIDEO_FRAME_PLANE_STRIDE (&vframe, 0), frame->GetRowBytes()); for (i = 0; i < self->info.height; i++) { - memcpy (outdata, indata, GST_VIDEO_FRAME_WIDTH (&vframe) * bpp); + memcpy (outdata, indata, stride); indata += GST_VIDEO_FRAME_PLANE_STRIDE (&vframe, 0); outdata += frame->GetRowBytes (); } |