diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | gst/rtsp/URLS | 3 | ||||
| -rw-r--r-- | gst/smpte/barboxwipes.c | 3 | ||||
| -rwxr-xr-x | tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh | 4 |
4 files changed, 19 insertions, 2 deletions
@@ -1,5 +1,16 @@ 2008-06-17 Wim Taymans <wim.taymans@collabora.co.uk> + * gst/rtsp/URLS: + Some more urls. + + * gst/smpte/barboxwipes.c: + Add a comment + + * tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh: + Fix typo, add audioresample to the pipeline. + +2008-06-17 Wim Taymans <wim.taymans@collabora.co.uk> + * ext/libmng/Makefile.am: * ext/libmng/gstmng.c: (plugin_init): * ext/libmng/gstmngdec.c: (gst_mng_dec_base_init), diff --git a/gst/rtsp/URLS b/gst/rtsp/URLS index 653fe1dc..cb000bab 100644 --- a/gst/rtsp/URLS +++ b/gst/rtsp/URLS @@ -27,3 +27,6 @@ H264/MPA REAL: rtsp://213.254.239.61/farm/*/encoder/tagesschau/live1high.rm rtsp://64.192.137.105:554/real.amazon-de.eu2/phononet/B/0/0/0/H/W/Y/4/K/S/01.01.rm?cloakport=80,554,7070 + + rtsp://211.89.225.1/encoder/cnr7_p + rtsp://stream2.visual.cz/broadcast/ct/CT24-High.rm diff --git a/gst/smpte/barboxwipes.c b/gst/smpte/barboxwipes.c index 173355ea..b8f00f7f 100644 --- a/gst/smpte/barboxwipes.c +++ b/gst/smpte/barboxwipes.c @@ -658,6 +658,9 @@ gst_wipe_triangles_draw (GstMask * mask) } } +/* see also: + * http://www.w3c.rl.ac.uk/pasttalks/slidemaker/XML_Multimedia/htmls/transitions.html + */ static const GstMaskDefinition definitions[] = { {1, "bar-wipe-lr", "A bar moves from left to right", diff --git a/tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh b/tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh index b30787f4..d42b5126 100755 --- a/tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh +++ b/tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh @@ -57,10 +57,10 @@ VRTPSINK="udpsink port=5000 host=$DEST ts-offset=$VOFFSET name=vrtpsink" VRTCPSINK="udpsink port=5001 host=$DEST sync=false async=false name=vrtcpsink" VRTCPSRC="udpsrc port=5005 name=vrtpsrc" -# PCMA encode from an the source +# PCMA encode from the source AELEM="alsasrc" #AELEM="audiotestsrc is-live=1" -ASOURCE="$AELEM ! queue ! audioconvert" +ASOURCE="$AELEM ! queue ! audioresample ! audioconvert" AENC="alawenc ! rtppcmapay" ARTPSINK="udpsink port=5002 host=$DEST ts-offset=$AOFFSET name=artpsink" |