summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gst/videomixer/blend_ayuv.c10
-rw-r--r--gst/videomixer/blend_bgra.c7
-rw-r--r--gst/videomixer/blend_i420.c7
-rw-r--r--gst/videomixer/videomixer.c48
-rw-r--r--gst/videomixer/videomixer.h2
5 files changed, 44 insertions, 30 deletions
diff --git a/gst/videomixer/blend_ayuv.c b/gst/videomixer/blend_ayuv.c
index a3c212db..072773a7 100644
--- a/gst/videomixer/blend_ayuv.c
+++ b/gst/videomixer/blend_ayuv.c
@@ -176,13 +176,9 @@ gst_videomixer_blend_ayuv_ayuv (guint8 * src, gint xpos, gint ypos,
guint8 * dest, gint dest_width, gint dest_height)
{
gint alpha, b_alpha;
-
gint i, j;
-
gint src_stride, dest_stride;
-
gint src_add, dest_add;
-
gint Y, U, V;
src_stride = src_width * 4;
@@ -268,3 +264,9 @@ gst_videomixer_fill_ayuv_color (guint8 * dest, gint width, gint height,
}
}
}
+
+size_t
+gst_videomixer_calculate_frame_size_ayuv (gint width, gint height)
+{
+ return GST_ROUND_UP_4 (width) * height * 4;
+}
diff --git a/gst/videomixer/blend_bgra.c b/gst/videomixer/blend_bgra.c
index d939bf95..36ac2e96 100644
--- a/gst/videomixer/blend_bgra.c
+++ b/gst/videomixer/blend_bgra.c
@@ -111,7 +111,6 @@ gst_videomixer_fill_bgra_color (guint8 * dest, gint width, gint height,
gint red, green, blue;
gint i, j;
-//check this conversion
red = 1.164 * (colY - 16) + 1.596 * (colV - 128);
green = 1.164 * (colY - 16) - 0.813 * (colV - 128) - 0.391 * (colU - 128);
blue = 1.164 * (colY - 16) + 2.018 * (colU - 128);
@@ -126,3 +125,9 @@ gst_videomixer_fill_bgra_color (guint8 * dest, gint width, gint height,
}
}
}
+
+size_t
+gst_videomixer_calculate_frame_size_bgra (gint width, gint height)
+{
+ return GST_ROUND_UP_4 (width) * height * 4;
+}
diff --git a/gst/videomixer/blend_i420.c b/gst/videomixer/blend_i420.c
index 85ce53d5..08b5f9fe 100644
--- a/gst/videomixer/blend_i420.c
+++ b/gst/videomixer/blend_i420.c
@@ -316,3 +316,10 @@ gst_videomixer_fill_i420_color (guint8 * dest, gint width, gint height,
memset (dest + VIDEO_V_OFFSET (width, height), colV, size);
}
+
+size_t
+gst_videomixer_calculate_frame_size_i420 (gint width, gint height)
+{
+ return GST_ROUND_UP_4 (width) * GST_ROUND_UP_2 (height) +
+ 2 * (GST_ROUND_UP_8 (width) / 2) * (GST_ROUND_UP_2 (height) / 2);
+}
diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index 321fa419..fd3e74ba 100644
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -104,6 +104,7 @@ void gst_videomixer_blend_ayuv_ayuv (guint8 * src, gint xpos, gint ypos,
void gst_videomixer_fill_ayuv_checker (guint8 * dest, gint width, gint height);
void gst_videomixer_fill_ayuv_color (guint8 * dest, gint width, gint height,
gint colY, gint colU, gint colV);
+size_t gst_videomixer_calculate_frame_size_ayuv (gint width, gint height);
/*BGRA function definitions see file: blend_ayuv*/
void gst_videomixer_blend_bgra_bgra (guint8 * src, gint xpos, gint ypos,
gint src_width, gint src_height, gdouble src_alpha,
@@ -111,6 +112,7 @@ void gst_videomixer_blend_bgra_bgra (guint8 * src, gint xpos, gint ypos,
void gst_videomixer_fill_bgra_checker (guint8 * dest, gint width, gint height);
void gst_videomixer_fill_bgra_color (guint8 * dest, gint width, gint height,
gint colY, gint colU, gint colV);
+size_t gst_videomixer_calculate_frame_size_bgra (gint width, gint height);
/*I420 function definitions see file: blend_i420.c*/
void gst_videomixer_blend_i420_i420 (guint8 * src, gint xpos, gint ypos,
gint src_width, gint src_height, gdouble src_alpha,
@@ -118,6 +120,7 @@ void gst_videomixer_blend_i420_i420 (guint8 * src, gint xpos, gint ypos,
void gst_videomixer_fill_i420_checker (guint8 * dest, gint width, gint height);
void gst_videomixer_fill_i420_color (guint8 * dest, gint width, gint height,
gint colY, gint colU, gint colV);
+size_t gst_videomixer_calculate_frame_size_i420 (gint width, gint height);
#define DEFAULT_PAD_ZORDER 0
#define DEFAULT_PAD_XPOS 0
@@ -927,36 +930,36 @@ gst_videomixer_setcaps (GstPad * pad, GstCaps * caps)
int ret;
ret = gst_structure_get_fourcc (str, "format", &format);
if (!ret) {
- mixer->blend = 0;
- mixer->fill_checker = 0;
- mixer->fill_color = 0;
- mixer->bpp = 0;
+ mixer->blend = NULL;
+ mixer->fill_checker = NULL;
+ mixer->fill_color = NULL;
+ mixer->calculate_frame_size = NULL;
} else if (format == GST_STR_FOURCC ("AYUV")) {
mixer->blend = gst_videomixer_blend_ayuv_ayuv;
mixer->fill_checker = gst_videomixer_fill_ayuv_checker;
mixer->fill_color = gst_videomixer_fill_ayuv_color;
- mixer->bpp = 32;
+ mixer->calculate_frame_size = gst_videomixer_calculate_frame_size_ayuv;
} else if (format == GST_STR_FOURCC ("I420")) {
mixer->blend = gst_videomixer_blend_i420_i420;
mixer->fill_checker = gst_videomixer_fill_i420_checker;
mixer->fill_color = gst_videomixer_fill_i420_color;
- mixer->bpp = 12;
+ mixer->calculate_frame_size = gst_videomixer_calculate_frame_size_i420;
} else {
- mixer->blend = 0;
- mixer->fill_checker = 0;
- mixer->fill_color = 0;
- mixer->bpp = 0;
+ mixer->blend = NULL;
+ mixer->fill_checker = NULL;
+ mixer->fill_color = NULL;
+ mixer->calculate_frame_size = NULL;
}
} else if (gst_structure_has_name (str, "video/x-raw-rgb")) {
mixer->blend = gst_videomixer_blend_bgra_bgra;
mixer->fill_checker = gst_videomixer_fill_bgra_checker;
mixer->fill_color = gst_videomixer_fill_bgra_color;
- mixer->bpp = 32;
+ mixer->calculate_frame_size = gst_videomixer_calculate_frame_size_bgra;
} else {
- mixer->blend = 0;
- mixer->fill_checker = 0;
- mixer->fill_color = 0;
- mixer->bpp = 0;
+ mixer->blend = NULL;
+ mixer->fill_checker = NULL;
+ mixer->fill_color = NULL;
+ mixer->calculate_frame_size = NULL;
}
gst_object_unref (element);
@@ -1301,7 +1304,6 @@ gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix)
newcaps = gst_caps_make_writable
(gst_pad_get_negotiated_caps (GST_PAD (mix->master)));
gst_caps_set_simple (newcaps,
- //"format", GST_TYPE_FOURCC, GST_STR_FOURCC ("AYUV"),
"width", G_TYPE_INT, mix->in_width,
"height", G_TYPE_INT, mix->in_height, NULL);
@@ -1310,17 +1312,15 @@ gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix)
mix->setcaps = FALSE;
/* Calculating out buffer size from input size */
- gst_pad_set_caps (mix->srcpad, newcaps); //bpp would be 0 otherwise
- outsize =
- (mix->bpp / 8.0) * mix->in_width * GST_ROUND_UP_2 (mix->in_height);
+ gst_pad_set_caps (mix->srcpad, newcaps);
+ outsize = mix->calculate_frame_size (mix->out_width, mix->out_height);
ret =
gst_pad_alloc_buffer_and_set_caps (mix->srcpad, GST_BUFFER_OFFSET_NONE,
outsize, newcaps, &outbuf);
gst_caps_unref (newcaps);
} else { /* Otherwise we just allocate a buffer from current caps */
/* Calculating out buffer size from input size */
- outsize =
- (mix->bpp / 8.0) * mix->in_width * GST_ROUND_UP_2 (mix->in_height);
+ outsize = mix->calculate_frame_size (mix->out_width, mix->out_height);
ret =
gst_pad_alloc_buffer_and_set_caps (mix->srcpad, GST_BUFFER_OFFSET_NONE,
outsize, GST_PAD_CAPS (mix->srcpad), &outbuf);
@@ -1333,7 +1333,7 @@ gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix)
switch (mix->background) {
case VIDEO_MIXER_BACKGROUND_CHECKER:
if (G_UNLIKELY (mix->fill_checker == NULL)) {
- g_warning ("fill checker function pointer not set");
+ goto error;
} else {
mix->fill_checker (GST_BUFFER_DATA (outbuf), mix->out_width,
mix->out_height);
@@ -1341,7 +1341,7 @@ gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix)
break;
case VIDEO_MIXER_BACKGROUND_BLACK:
if (G_UNLIKELY (mix->fill_color == NULL)) {
- g_warning ("fill color function pointer not set");
+ goto error;
} else {
mix->fill_color (GST_BUFFER_DATA (outbuf), mix->out_width,
mix->out_height, 16, 128, 128);
@@ -1350,7 +1350,7 @@ gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix)
case VIDEO_MIXER_BACKGROUND_WHITE:
if (G_UNLIKELY (mix->fill_color == NULL)) {
- g_warning ("fill color function pointer not set");
+ goto error;
} else {
mix->fill_color (GST_BUFFER_DATA (outbuf), mix->out_width,
mix->out_height, 240, 128, 128);
diff --git a/gst/videomixer/videomixer.h b/gst/videomixer/videomixer.h
index 160a2e70..707bf27b 100644
--- a/gst/videomixer/videomixer.h
+++ b/gst/videomixer/videomixer.h
@@ -82,7 +82,6 @@ struct _GstVideoMixer
gint in_width, in_height;
gint out_width, out_height;
- gint bpp;
gboolean setcaps;
gboolean sendseg;
@@ -104,6 +103,7 @@ struct _GstVideoMixer
void (*fill_checker) (guint8 * dest, gint width, gint height);
void (*fill_color) (guint8 * dest, gint width, gint height, gint colY, gint colU, gint colV);
+ size_t (*calculate_frame_size) (gint width, gint height);
};
struct _GstVideoMixerClass
generated by cgit (git 2.34.1) at 2025-06-14 20:51:40 +0000