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

videomixer[2]: Use orc_memset() instead of memset()

Browse source
This commit is contained in:
Sebastian Dröge 2011-04-01 11:33:54 +02:00
parent ef5ac986f1
commit ce66aea7b0
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/videomixer/videomixer.c
View file

@ -89,6 +89,12 @@
#include "videomixer.h" #include "videomixer.h"
#include "videomixer2.h" #include "videomixer2.h"
#ifdef DISABLE_ORC
#define orc_memset memset
#else
#include <orc/orcfunctions.h>
#endif
GST_DEBUG_CATEGORY_STATIC (gst_videomixer_debug); GST_DEBUG_CATEGORY_STATIC (gst_videomixer_debug);
#define GST_CAT_DEFAULT gst_videomixer_debug #define GST_CAT_DEFAULT gst_videomixer_debug
@ -1610,7 +1616,7 @@ gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix)
mix->out_height, 240, 128, 128); mix->out_height, 240, 128, 128);
break; break;
case VIDEO_MIXER_BACKGROUND_TRANSPARENT: case VIDEO_MIXER_BACKGROUND_TRANSPARENT:
memset (GST_BUFFER_DATA (outbuf), 0, orc_memset (GST_BUFFER_DATA (outbuf), 0,
gst_video_format_get_row_stride (mix->fmt, 0, gst_video_format_get_row_stride (mix->fmt, 0,
mix->out_width) * mix->out_height); mix->out_width) * mix->out_height);
break; break;

8
gst/videomixer/videomixer2.c
View file

@ -93,6 +93,12 @@
#include <gst/controller/gstcontroller.h> #include <gst/controller/gstcontroller.h>
#ifdef DISABLE_ORC
#define orc_memset memset
#else
#include <orc/orcfunctions.h>
#endif
GST_DEBUG_CATEGORY_STATIC (gst_videomixer2_debug); GST_DEBUG_CATEGORY_STATIC (gst_videomixer2_debug);
#define GST_CAT_DEFAULT gst_videomixer2_debug #define GST_CAT_DEFAULT gst_videomixer2_debug
@ -838,7 +844,7 @@ gst_videomixer2_blend_buffers (GstVideoMixer2 * mix,
mix->height, 240, 128, 128); mix->height, 240, 128, 128);
break; break;
case VIDEO_MIXER2_BACKGROUND_TRANSPARENT: case VIDEO_MIXER2_BACKGROUND_TRANSPARENT:
memset (GST_BUFFER_DATA (*outbuf), 0, orc_memset (GST_BUFFER_DATA (*outbuf), 0,
gst_video_format_get_row_stride (mix->format, 0, gst_video_format_get_row_stride (mix->format, 0,
mix->width) * mix->height); mix->width) * mix->height);
/* use overlay to keep background transparent */ /* use overlay to keep background transparent */