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

sys/oss/gstossaudio.c (plugin_init): Second-class citizen.

Browse source 
Original commit message from CVS:
2005-08-04  Andy Wingo  <wingo@pobox.com>

* sys/oss/gstossaudio.c (plugin_init): Second-class citizen.

* gst/videobox/gstvideobox.c (gst_video_box_get_size): Update for
API changes.

* configure.ac (DEFAULT_AUDIOSINK, DEFAULT_VIDEOSINK): Set to
autoaudiosink and autovideosink.
This commit is contained in:
Andy Wingo 2005-08-04 20:05:51 +00:00
parent 6af187c535
commit 284327da55
4 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,13 @@
2005-08-04 Andy Wingo <wingo@pobox.com>
* sys/oss/gstossaudio.c (plugin_init): Second-class citizen.
* gst/videobox/gstvideobox.c (gst_video_box_get_size): Update for
API changes.
* configure.ac (DEFAULT_AUDIOSINK, DEFAULT_VIDEOSINK): Set to
autoaudiosink and autovideosink.
2005-08-04 Edward Hervey <edward@fluendo.com> 2005-08-04 Edward Hervey <edward@fluendo.com>
* gst/avi/gstavidemux.c: (gst_avi_demux_reset), * gst/avi/gstavidemux.c: (gst_avi_demux_reset),
@ -1064,7 +1074,7 @@
UDP fixes, added uri handler. UDP fixes, added uri handler.
Added rtpdec that will manage the RTP session in the future. Added rtpdec that will manage the RTP session in the future.
2005-05-10 Arwed v. Merkatz <v.merkatz@gmx.net>> 2005-05-10 Arwed v. Merkatz <v.merkatz@gmx.net>
* PORTED_09: * PORTED_09:
* configure.ac: * configure.ac:

10
configure.ac
View file

@ -101,21 +101,17 @@ fi
dnl Check for FIONREAD ioctl declaration : dnl Check for FIONREAD ioctl declaration :
GST_CHECK_FIONREAD() GST_CHECK_FIONREAD()
DEFAULT_AUDIOSINK="osssink" DEFAULT_AUDIOSINK="autoaudiosink"
DEFAULT_VIDEOSINK="xvimagesink" DEFAULT_VIDEOSINK="autovideosink"
DEFAULT_AUDIOSRC="osssrc" DEFAULT_AUDIOSRC="alsasrc"
DEFAULT_VIDEOSRC="v4lsrc" DEFAULT_VIDEOSRC="v4lsrc"
DEFAULT_VISUALIZER="goom" DEFAULT_VISUALIZER="goom"
case "$host" in case "$host" in
*-sun-* | *pc-solaris* ) *-sun-* | *pc-solaris* )
DEFAULT_AUDIOSINK="sunaudiosink"
DEFAULT_VIDEOSINK="ximagesink"
DEFAULT_AUDIOSRC="sunaudiosrc" DEFAULT_AUDIOSRC="sunaudiosrc"
;; ;;
*-darwin* ) *-darwin* )
DEFAULT_AUDIOSINK="osxaudiosink"
DEFAULT_AUDIOSRC="osxaudiosrc" DEFAULT_AUDIOSRC="osxaudiosrc"
DEFAULT_VIDEOSINK="osxvideosink"
;; ;;
esac esac

19
gst/videobox/gstvideobox.c
View file

@ -129,7 +129,7 @@ static GstCaps *gst_video_box_transform_caps (GstBaseTransform * trans,
GstPad * pad, GstCaps * from); GstPad * pad, GstCaps * from);
static gboolean gst_video_box_set_caps (GstBaseTransform * trans, static gboolean gst_video_box_set_caps (GstBaseTransform * trans,
GstCaps * in, GstCaps * out); GstCaps * in, GstCaps * out);
static guint gst_video_box_get_size (GstBaseTransform * trans); static guint gst_video_box_get_size (GstBaseTransform * trans, GstCaps * caps);
static GstFlowReturn gst_video_box_transform (GstBaseTransform * trans, static GstFlowReturn gst_video_box_transform (GstBaseTransform * trans,
GstBuffer * in, GstBuffer * out); GstBuffer * in, GstBuffer * out);
@ -391,18 +391,23 @@ gst_video_box_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out)
#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)*ROUND_UP_2(h)/2))
static guint static guint
gst_video_box_get_size (GstBaseTransform * trans) gst_video_box_get_size (GstBaseTransform * trans, GstCaps * caps)
{ {
guint size; guint size = -1;
GstVideoBox *video_box; GstVideoBox *video_box;
video_box = GST_VIDEO_BOX (trans); video_box = GST_VIDEO_BOX (trans);
if (video_box->use_alpha) { if (gst_caps_is_equal (caps, GST_PAD_CAPS (trans->sinkpad))) {
size = video_box->out_height * video_box->out_height * 4; size = GST_VIDEO_I420_SIZE (video_box->in_width, video_box->in_height);
} else { } else if (gst_caps_is_equal (caps, GST_PAD_CAPS (trans->srcpad))) {
size = GST_VIDEO_I420_SIZE (video_box->out_width, video_box->out_height); if (video_box->use_alpha) {
size = video_box->out_height * video_box->out_height * 4;
} else {
size = GST_VIDEO_I420_SIZE (video_box->out_width, video_box->out_height);
}
} }
return size; return size;
} }

2
sys/oss/gstossaudio.c
View file

@ -38,7 +38,7 @@ plugin_init (GstPlugin * plugin)
GST_TYPE_OSSELEMENT) || GST_TYPE_OSSELEMENT) ||
!gst_element_register (plugin, "osssrc", GST_RANK_PRIMARY, !gst_element_register (plugin, "osssrc", GST_RANK_PRIMARY,
GST_TYPE_OSSSRC) || */ GST_TYPE_OSSSRC) || */
!gst_element_register (plugin, "osssink", GST_RANK_PRIMARY, !gst_element_register (plugin, "osssink", GST_RANK_SECONDARY,
GST_TYPE_OSSSINK)) { GST_TYPE_OSSSINK)) {
return FALSE; return FALSE;
} }