diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2005-09-09 17:56:43 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2005-09-09 17:56:43 +0000 |
| commit | 1436139a8c7077f979bc1aab77e7e3df7ec45a41 (patch) | |
| tree | 8baa27ce04aeda5d535789fda0302061f835c04a /gst/videobox | |
| parent | e30601f40007a52d93879efc9143b0d97086a550 (diff) | |
Move fdsrc back into gstreamer core elements.
Original commit message from CVS:
* configure.ac:
* gst/fdsrc/Makefile.am:
* gst/fdsrc/gstfdsrc.c:
* gst/fdsrc/gstfdsrc.h:
Move fdsrc back into gstreamer core elements.
* gst/level/gstlevel.c: (gst_level_class_init),
(gst_level_transform_ip):
* gst/videobox/gstvideobox.c: (gst_video_box_set_property):
Basetransform changes.
Diffstat (limited to 'gst/videobox')
| -rw-r--r-- | gst/videobox/gstvideobox.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c index 6d6d1b92..2aff4074 100644 --- a/gst/videobox/gstvideobox.c +++ b/gst/videobox/gstvideobox.c @@ -290,6 +290,12 @@ gst_video_box_set_property (GObject * object, guint prop_id, G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } + + if (video_box->box_left == 0 && video_box->box_right == 0 && + video_box->box_top == 0 && video_box->box_bottom == 0) + gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (video_box), TRUE); + else + gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (video_box), FALSE); } static void gst_video_box_get_property (GObject * object, guint prop_id, GValue * value, @@ -376,20 +382,16 @@ gst_video_box_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out) return ret; } -#define ROUND_UP_2(x) (((x)+1)&~1) -#define ROUND_UP_4(x) (((x)+3)&~3) -#define ROUND_UP_8(x) (((x)+7)&~7) - /* see gst-plugins/gst/games/gstvideoimage.c, paint_setup_I420() */ -#define GST_VIDEO_I420_Y_ROWSTRIDE(width) (ROUND_UP_4(width)) -#define GST_VIDEO_I420_U_ROWSTRIDE(width) (ROUND_UP_8(width)/2) -#define GST_VIDEO_I420_V_ROWSTRIDE(width) ((ROUND_UP_8(GST_VIDEO_I420_Y_ROWSTRIDE(width)))/2) +#define GST_VIDEO_I420_Y_ROWSTRIDE(width) (GST_ROUND_UP_4(width)) +#define GST_VIDEO_I420_U_ROWSTRIDE(width) (GST_ROUND_UP_8(width)/2) +#define GST_VIDEO_I420_V_ROWSTRIDE(width) ((GST_ROUND_UP_8(GST_VIDEO_I420_Y_ROWSTRIDE(width)))/2) #define GST_VIDEO_I420_Y_OFFSET(w,h) (0) -#define GST_VIDEO_I420_U_OFFSET(w,h) (GST_VIDEO_I420_Y_OFFSET(w,h)+(GST_VIDEO_I420_Y_ROWSTRIDE(w)*ROUND_UP_2(h))) -#define GST_VIDEO_I420_V_OFFSET(w,h) (GST_VIDEO_I420_U_OFFSET(w,h)+(GST_VIDEO_I420_U_ROWSTRIDE(w)*ROUND_UP_2(h)/2)) +#define GST_VIDEO_I420_U_OFFSET(w,h) (GST_VIDEO_I420_Y_OFFSET(w,h)+(GST_VIDEO_I420_Y_ROWSTRIDE(w)*GST_ROUND_UP_2(h))) +#define GST_VIDEO_I420_V_OFFSET(w,h) (GST_VIDEO_I420_U_OFFSET(w,h)+(GST_VIDEO_I420_U_ROWSTRIDE(w)*GST_ROUND_UP_2(h)/2)) -#define GST_VIDEO_I420_SIZE(w,h) (GST_VIDEO_I420_V_OFFSET(w,h)+(GST_VIDEO_I420_V_ROWSTRIDE(w)*ROUND_UP_2(h)/2)) +#define GST_VIDEO_I420_SIZE(w,h) (GST_VIDEO_I420_V_OFFSET(w,h)+(GST_VIDEO_I420_V_ROWSTRIDE(w)*GST_ROUND_UP_2(h)/2)) static gboolean gst_video_box_get_unit_size (GstBaseTransform * trans, GstCaps * caps, |