diff --git a/configure.ac b/configure.ac index 8745719137..0fb737e2a8 100644 --- a/configure.ac +++ b/configure.ac @@ -308,6 +308,7 @@ AG_GST_CHECK_PLUGIN(videocrop) AG_GST_CHECK_PLUGIN(videomixer) AG_GST_CHECK_PLUGIN(wavenc) AG_GST_CHECK_PLUGIN(wavparse) +AG_GST_CHECK_PLUGIN(y4m) dnl *** checks for socket and nsl libraries *** AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)]) @@ -1086,6 +1087,7 @@ gst/videomixer/Makefile gst/wavenc/Makefile gst/wavparse/Makefile gst/flx/Makefile +gst/y4m/Makefile ext/jpeg/Makefile ext/Makefile ext/aalib/Makefile diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 790a4e178a..5a453029f4 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -185,6 +185,7 @@ EXTRA_HFILES = \ $(top_srcdir)/gst/videomixer/videomixerpad.h \ $(top_srcdir)/gst/wavenc/gstwavenc.h \ $(top_srcdir)/gst/wavparse/gstwavparse.h \ + $(top_srcdir)/gst/y4m/gsty4mencode.h \ $(top_srcdir)/sys/directdraw/gstdirectdrawsink.h \ $(top_srcdir)/sys/directsound/gstdirectsoundsink.h \ $(top_srcdir)/sys/oss/gstossmixerelement.h \ @@ -197,7 +198,6 @@ EXTRA_HFILES = \ $(top_srcdir)/sys/waveform/gstwaveformsink.h \ $(top_srcdir)/sys/ximage/gstximagesrc.h - # example code that needs to be converted to xml and placed in xml/ EXAMPLE_CFILES = \ $(top_srcdir)/tests/examples/level/level-example.c \ diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml index 2e61ed829c..dfe76a3946 100644 --- a/docs/plugins/gst-plugins-good-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml @@ -137,6 +137,7 @@ + @@ -211,6 +212,7 @@ + diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index 62c24bf47a..15d923454c 100644 --- a/docs/plugins/gst-plugins-good-plugins-sections.txt +++ b/docs/plugins/gst-plugins-good-plugins-sections.txt @@ -1793,3 +1793,19 @@ GST_XIMAGE_SRC_CLASS GST_IS_XIMAGE_SRC_CLASS gst_ximage_src_get_type + +
+element-y4menc +y4menc +GstY4mEncode + +GstY4mEncodeClass +GST_Y4M_ENCODE +GST_Y4M_ENCODE_CLASS +GST_IS_Y4M_ENCODE +GST_IS_Y4M_ENCODE_CLASS +GST_Y4M_ENCODE_GET_CLASS +GST_TYPE_Y4M_ENCODE +gst_y4m_encode_get_type +
+ diff --git a/docs/plugins/inspect/plugin-y4menc.xml b/docs/plugins/inspect/plugin-y4menc.xml new file mode 100644 index 0000000000..15e750c5f4 --- /dev/null +++ b/docs/plugins/inspect/plugin-y4menc.xml @@ -0,0 +1,34 @@ + + y4menc + Encodes a YUV frame into the yuv4mpeg format (mjpegtools) + ../../gst/y4m/.libs/libgsty4menc.so + libgsty4menc.so + 0.10.14.2 + LGPL + gst-plugins-good + GStreamer Good Plug-ins CVS/prerelease + Unknown package origin + + + y4menc + YUV4MPEG video encoder + Codec/Encoder/Video + Encodes a YUV frame into the yuv4mpeg format (mjpegtools) + Wim Taymans <wim.taymans@gmail.com> + + + sink + sink + always +
video/x-raw-yuv, format=(fourcc){ IYUV, I420 }, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
+ + + src + source + always +
application/x-yuv4mpeg, y4mversion=(int)2
+ + + + + \ No newline at end of file diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 22d0a4929d..b82b2d54a0 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -94,6 +94,7 @@ check_PROGRAMS = \ elements/spectrum \ elements/videocrop \ elements/videofilter \ + elements/y4menc \ pipelines/simple-launch-lines \ pipelines/flacdec \ $(check_gdkpixbuf) \ diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore index 8cd5d0944a..0eae331468 100644 --- a/tests/check/elements/.gitignore +++ b/tests/check/elements/.gitignore @@ -40,3 +40,4 @@ videofilter wavpackdec wavpackenc wavpackparse +y4menc diff --git a/tests/check/elements/y4menc.c b/tests/check/elements/y4menc.c new file mode 100644 index 0000000000..b5c5fcc464 --- /dev/null +++ b/tests/check/elements/y4menc.c @@ -0,0 +1,165 @@ +/* GStreamer + * + * unit test for y4menc + * + * Copyright (C) <2006> Mark Nauwelaerts + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include + +#include + +/* For ease of programming we use globals to keep refs for our floating + * src and sink pads we create; otherwise we always have to do get_pad, + * get_peer, and then remove references in every test function */ +static GstPad *mysrcpad, *mysinkpad; + +#define VIDEO_CAPS_STRING "video/x-raw-yuv, " \ + "width = (int) 384, " \ + "height = (int) 288, " \ + "framerate = (fraction) 25/1, " \ + "pixel-aspect-ratio = (fraction) 1/1" + +#define Y4M_CAPS_STRING "application/x-yuv4mpeg, " \ + "y4mversion = (int) 2" + +static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS (Y4M_CAPS_STRING)); + +static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS (VIDEO_CAPS_STRING)); + + +GstElement * +setup_y4menc () +{ + GstElement *y4menc; + + GST_DEBUG ("setup_y4menc"); + y4menc = gst_check_setup_element ("y4menc"); + mysrcpad = gst_check_setup_src_pad (y4menc, &srctemplate, NULL); + mysinkpad = gst_check_setup_sink_pad (y4menc, &sinktemplate, NULL); + gst_pad_set_active (mysrcpad, TRUE); + gst_pad_set_active (mysinkpad, TRUE); + + return y4menc; +} + +void +cleanup_y4menc (GstElement * y4menc) +{ + GST_DEBUG ("cleanup_y4menc"); + gst_element_set_state (y4menc, GST_STATE_NULL); + + gst_pad_set_active (mysrcpad, FALSE); + gst_pad_set_active (mysinkpad, FALSE); + gst_check_teardown_src_pad (y4menc); + gst_check_teardown_sink_pad (y4menc); + gst_check_teardown_element (y4menc); +} + +GST_START_TEST (test_y4m) +{ + GstElement *y4menc; + GstBuffer *inbuffer, *outbuffer; + GstCaps *caps; + int i, num_buffers, size; + const gchar *data0 = "YUV4MPEG2 W384 H288 I? F25:1 A1:1\nFRAME\n"; + + + y4menc = setup_y4menc (); + fail_unless (gst_element_set_state (y4menc, + GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS, + "could not set to playing"); + + /* corresponds to I420 buffer for the size mentioned in the caps */ + size = 384 * 288 * 3 / 2; + inbuffer = gst_buffer_new_and_alloc (size); + /* makes valgrind's memcheck happier */ + memset (GST_BUFFER_DATA (inbuffer), 0, GST_BUFFER_SIZE (inbuffer)); + caps = gst_caps_from_string (VIDEO_CAPS_STRING); + gst_buffer_set_caps (inbuffer, caps); + gst_caps_unref (caps); + GST_BUFFER_TIMESTAMP (inbuffer) = 0; + ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1); + fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK); + + num_buffers = g_list_length (buffers); + fail_unless (num_buffers == 1); + + /* clean up buffers */ + for (i = 0; i < num_buffers; ++i) { + outbuffer = GST_BUFFER (buffers->data); + fail_if (outbuffer == NULL); + + switch (i) { + case 0: + fail_unless (strlen (data0) == 40); + fail_unless (GST_BUFFER_SIZE (outbuffer) == size + 40); + fail_unless (memcmp (data0, GST_BUFFER_DATA (outbuffer), + strlen (data0)) == 0); + break; + default: + break; + } + buffers = g_list_remove (buffers, outbuffer); + + ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1); + gst_buffer_unref (outbuffer); + outbuffer = NULL; + } + + cleanup_y4menc (y4menc); + g_list_free (buffers); + buffers = NULL; +} + +GST_END_TEST; + +Suite * +y4menc_suite (void) +{ + Suite *s = suite_create ("y4menc"); + TCase *tc_chain = tcase_create ("general"); + + suite_add_tcase (s, tc_chain); + tcase_add_test (tc_chain, test_y4m); + + return s; +} + +int +main (int argc, char **argv) +{ + int nf; + + Suite *s = y4menc_suite (); + SRunner *sr = srunner_create (s); + + gst_check_init (&argc, &argv); + + srunner_run_all (sr, CK_NORMAL); + nf = srunner_ntests_failed (sr); + srunner_free (sr); + + return nf; +}