diff --git a/Android.mk b/Android.mk index b3d345b78d..d6ca579a41 100644 --- a/Android.mk +++ b/Android.mk @@ -56,7 +56,7 @@ GST_PLUGINS_BASE_BUILT_SOURCES := \ gst/audiotestsrc/Android.mk \ gst/videotestsrc/Android.mk \ gst/videoscale/Android.mk \ - gst/ffmpegcolorspace/Android.mk \ + gst/videoconvert/Android.mk \ gst/videorate/Android.mk \ gst/encoding/Android.mk \ gst/adder/Android.mk \ @@ -114,7 +114,7 @@ CONFIGURE_TARGETS += gst-plugins-base-configure -include $(GST_PLUGINS_BASE_TOP)/gst/audiotestsrc/Android.mk -include $(GST_PLUGINS_BASE_TOP)/gst/videotestsrc/Android.mk -include $(GST_PLUGINS_BASE_TOP)/gst/videoscale/Android.mk --include $(GST_PLUGINS_BASE_TOP)/gst/ffmpegcolorspace/Android.mk +-include $(GST_PLUGINS_BASE_TOP)/gst/videoconvert/Android.mk -include $(GST_PLUGINS_BASE_TOP)/gst/videorate/Android.mk -include $(GST_PLUGINS_BASE_TOP)/gst/encoding/Android.mk -include $(GST_PLUGINS_BASE_TOP)/gst/adder/Android.mk diff --git a/android/ffmpegcolorspace.mk b/android/videoconvert.mk similarity index 66% rename from android/ffmpegcolorspace.mk rename to android/videoconvert.mk index c197a642bd..99d6391166 100644 --- a/android/ffmpegcolorspace.mk +++ b/android/videoconvert.mk @@ -4,15 +4,12 @@ include $(CLEAR_VARS) LOCAL_ARM_MODE := arm -ffmpegcolorspace_LOCAL_SRC_FILES:= \ - gst/ffmpegcolorspace/gstffmpegcolorspace.c \ - gst/ffmpegcolorspace/gstffmpegcodecmap.c \ - gst/ffmpegcolorspace/dsputil.c \ - gst/ffmpegcolorspace/imgconvert.c \ - gst/ffmpegcolorspace/mem.c \ - gst/ffmpegcolorspace/utils.c +videoconvert_LOCAL_SRC_FILES:= \ + gst/videoconvert/gstvideoconvert.c \ + gst/videoconvert/gstvideoconvertorc-dist.c \ + gst/videoconvert/videoconvert.c -LOCAL_SRC_FILES:= $(addprefix ../,$(ffmpegcolorspace_LOCAL_SRC_FILES)) +LOCAL_SRC_FILES:= $(addprefix ../,$(videoconvert_LOCAL_SRC_FILES)) LOCAL_SHARED_LIBRARIES := \ libgstvideo-0.10 \ @@ -24,7 +21,7 @@ LOCAL_SHARED_LIBRARIES := \ libgobject-2.0 \ libgstpbutils-0.10 -LOCAL_MODULE:= libgstffmpegcolorspace +LOCAL_MODULE:= libgstvideoconvert LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \ $(GST_PLUGINS_BASE_CFLAGS) diff --git a/docs/plugins/inspect/plugin-ffmpegcolorspace.xml b/docs/plugins/inspect/plugin-ffmpegcolorspace.xml deleted file mode 100644 index fbbbb761a9..0000000000 --- a/docs/plugins/inspect/plugin-ffmpegcolorspace.xml +++ /dev/null @@ -1,34 +0,0 @@ - - ffmpegcolorspace - colorspace conversion copied from FFMpeg 0.4.9-pre1 - ../../gst/ffmpegcolorspace/.libs/libgstffmpegcolorspace.so - libgstffmpegcolorspace.so - 0.10.35.1 - LGPL - gst-plugins-base - FFMpeg - http://ffmpeg.sourceforge.net/ - - - ffmpegcolorspace - FFMPEG Colorspace converter - Filter/Converter/Video - Converts video from one colorspace to another - GStreamer maintainers <gstreamer-devel@lists.sourceforge.net> - - - sink - sink - always -
video/x-raw-yuv, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ], format=(fourcc){ I420, NV12, NV21, YV12, YUY2, Y42B, Y444, YUV9, YVU9, Y41B, Y800, Y8 , GREY, Y16 , UYVY, YVYU, IYU1, v308, AYUV, A420 }; video/x-raw-rgb, bpp=(int)24, depth=(int)24, endianness=(int)4321, red_mask=(int)16711680, green_mask=(int)65280, blue_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)24, depth=(int)24, endianness=(int)4321, red_mask=(int)255, green_mask=(int)65280, blue_mask=(int)16711680, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)-16777216, green_mask=(int)16711680, blue_mask=(int)65280, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)16711680, green_mask=(int)65280, blue_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)255, green_mask=(int)65280, blue_mask=(int)16711680, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)-16777216, green_mask=(int)16711680, blue_mask=(int)65280, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)16711680, green_mask=(int)65280, blue_mask=(int)255, alpha_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)255, green_mask=(int)65280, blue_mask=(int)16711680, alpha_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)16, depth=(int)16, endianness=(int)1234, red_mask=(int)63488, green_mask=(int)2016, blue_mask=(int)31, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)16, depth=(int)15, endianness=(int)1234, red_mask=(int)31744, green_mask=(int)992, blue_mask=(int)31, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)8, depth=(int)8, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-gray, bpp=(int)8, depth=(int)8, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-gray, bpp=(int)16, depth=(int)16, endianness=(int)4321, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-gray, bpp=(int)16, depth=(int)16, endianness=(int)1234, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
- - - src - source - always -
video/x-raw-yuv, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ], format=(fourcc){ I420, NV12, NV21, YV12, YUY2, Y42B, Y444, YUV9, YVU9, Y41B, Y800, Y8 , GREY, Y16 , UYVY, YVYU, IYU1, v308, AYUV, A420 }; video/x-raw-rgb, bpp=(int)24, depth=(int)24, endianness=(int)4321, red_mask=(int)16711680, green_mask=(int)65280, blue_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)24, depth=(int)24, endianness=(int)4321, red_mask=(int)255, green_mask=(int)65280, blue_mask=(int)16711680, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)-16777216, green_mask=(int)16711680, blue_mask=(int)65280, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)16711680, green_mask=(int)65280, blue_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)255, green_mask=(int)65280, blue_mask=(int)16711680, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)-16777216, green_mask=(int)16711680, blue_mask=(int)65280, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)16711680, green_mask=(int)65280, blue_mask=(int)255, alpha_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)255, green_mask=(int)65280, blue_mask=(int)16711680, alpha_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)16, depth=(int)16, endianness=(int)1234, red_mask=(int)63488, green_mask=(int)2016, blue_mask=(int)31, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)16, depth=(int)15, endianness=(int)1234, red_mask=(int)31744, green_mask=(int)992, blue_mask=(int)31, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)8, depth=(int)8, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-gray, bpp=(int)8, depth=(int)8, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-gray, bpp=(int)16, depth=(int)16, endianness=(int)4321, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-gray, bpp=(int)16, depth=(int)16, endianness=(int)1234, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
- - - - - diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c index 34a2722212..9cc0f2f4c3 100644 --- a/ext/ogg/gstoggmux.c +++ b/ext/ogg/gstoggmux.c @@ -27,7 +27,7 @@ * * Example pipelines * |[ - * gst-launch v4l2src num-buffers=500 ! video/x-raw,width=320,height=240 ! ffmpegcolorspace ! theoraenc ! oggmux ! filesink location=video.ogg + * gst-launch v4l2src num-buffers=500 ! video/x-raw,width=320,height=240 ! videoconvert ! theoraenc ! oggmux ! filesink location=video.ogg * ]| Encodes a video stream captured from a v4l2-compatible camera to Ogg/Theora * (the encoding will stop automatically after 500 frames) * diff --git a/ext/pango/gstclockoverlay.c b/ext/pango/gstclockoverlay.c index 6c770ce330..484127456e 100644 --- a/ext/pango/gstclockoverlay.c +++ b/ext/pango/gstclockoverlay.c @@ -34,7 +34,7 @@ * gst-launch -v videotestsrc ! clockoverlay ! xvimagesink * ]| Display the current time in the top left corner of the video picture * |[ - * gst-launch -v videotestsrc ! clockoverlay halign=right valign=bottom text="Edge City" shaded-background=true ! ffmpegcolorspace ! ximagesink + * gst-launch -v videotestsrc ! clockoverlay halign=right valign=bottom text="Edge City" shaded-background=true ! videoconvert ! ximagesink * ]| Another pipeline that displays the current time with some leading * text in the bottom right corner of the video picture, with the background * of the text being shaded in order to make it more legible on top of a diff --git a/gst-libs/gst/pbutils/install-plugins.c b/gst-libs/gst/pbutils/install-plugins.c index 9b5f45e1df..5f52cbcab9 100644 --- a/gst-libs/gst/pbutils/install-plugins.c +++ b/gst-libs/gst/pbutils/install-plugins.c @@ -216,7 +216,7 @@ * urisource-$(PROTOCOL_REQUIRED), e.g. urisource-http or urisource-mms * * - * element-$(ELEMENT_REQUIRED), e.g. element-ffmpegcolorspace + * element-$(ELEMENT_REQUIRED), e.g. element-videoconvert * * * decoder-$(CAPS_REQUIRED), e.g. (do read below for more details!): diff --git a/gst-libs/gst/video/convertframe.c b/gst-libs/gst/video/convertframe.c index 5825de2de7..c752c70b75 100644 --- a/gst-libs/gst/video/convertframe.c +++ b/gst-libs/gst/video/convertframe.c @@ -120,7 +120,7 @@ build_convert_frame_pipeline (GstElement ** src_element, /* videoscale is here to correct for the pixel-aspect-ratio for us */ GST_DEBUG ("creating elements"); if (!create_element ("appsrc", &src, &error) || - !create_element ("ffmpegcolorspace", &csp, &error) || + !create_element ("videoconvert", &csp, &error) || !create_element ("videoscale", &vscale, &error) || !create_element ("appsink", &sink, &error)) goto no_elements; diff --git a/gst-plugins-base.spec.in b/gst-plugins-base.spec.in index 6ea9f70765..0b59f85962 100644 --- a/gst-plugins-base.spec.in +++ b/gst-plugins-base.spec.in @@ -100,7 +100,6 @@ rm -rf $RPM_BUILD_ROOT # base plugins without external dependencies %{_libdir}/gstreamer-%{majorminor}/libgstadder.so %{_libdir}/gstreamer-%{majorminor}/libgstaudioconvert.so -%{_libdir}/gstreamer-%{majorminor}/libgstffmpegcolorspace.so %{_libdir}/gstreamer-%{majorminor}/libgstdecodebin.so %{_libdir}/gstreamer-%{majorminor}/libgstdecodebin2.so %{_libdir}/gstreamer-%{majorminor}/libgstplaybin.so @@ -109,6 +108,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gstreamer-%{majorminor}/libgstaudiorate.so %{_libdir}/gstreamer-%{majorminor}/libgstsubparse.so %{_libdir}/gstreamer-%{majorminor}/libgstvolume.so +%{_libdir}/gstreamer-%{majorminor}/libgstvideoconvert.so %{_libdir}/gstreamer-%{majorminor}/libgstvideorate.so %{_libdir}/gstreamer-%{majorminor}/libgstvideoscale.so %{_libdir}/gstreamer-%{majorminor}/libgsttcp.so diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c index 91fecc2dbf..e30314392e 100644 --- a/gst/audiotestsrc/gstaudiotestsrc.c +++ b/gst/audiotestsrc/gstaudiotestsrc.c @@ -29,7 +29,7 @@ * ]| This pipeline produces a sine with default frequency, 440 Hz, and the * default volume, 0.8 (relative to a maximum 1.0). * |[ - * gst-launch audiotestsrc wave=2 freq=200 ! audioconvert ! tee name=t ! queue ! alsasink t. ! queue ! libvisual_lv_scope ! ffmpegcolorspace ! xvimagesink + * gst-launch audiotestsrc wave=2 freq=200 ! audioconvert ! tee name=t ! queue ! alsasink t. ! queue ! libvisual_lv_scope ! videoconvert ! xvimagesink * ]| In this example a saw wave is generated. The wave is shown using a * scope visualizer from libvisual, allowing you to visually verify that * the saw wave is correct. diff --git a/gst/encoding/gstencodebin.c b/gst/encoding/gstencodebin.c index f5799ae986..0a3a2fd2b9 100644 --- a/gst/encoding/gstencodebin.c +++ b/gst/encoding/gstencodebin.c @@ -1268,7 +1268,7 @@ _create_stream_group (GstEncodeBin * ebin, GstEncodingProfile * sprof, GST_LOG ("Adding conversion elements for video stream"); if (!native_video) { - cspace = gst_element_factory_make ("ffmpegcolorspace", NULL); + cspace = gst_element_factory_make ("videoconvert", NULL); scale = gst_element_factory_make ("videoscale", NULL); if (!scale) { missing_element_name = "videoscale"; @@ -1276,10 +1276,10 @@ _create_stream_group (GstEncodeBin * ebin, GstEncodingProfile * sprof, } /* 4-tap scaling and black borders */ g_object_set (scale, "method", 2, "add-borders", TRUE, NULL); - cspace2 = gst_element_factory_make ("ffmpegcolorspace", NULL); + cspace2 = gst_element_factory_make ("videoconvert", NULL); if (!cspace || !cspace2) { - missing_element_name = "ffmpegcolorspace"; + missing_element_name = "videoconvert"; goto missing_element; } diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index 80b575f13c..5bf8949ff8 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -81,7 +81,7 @@ * size are allocated along the way. If you take away the queue, scaling will * happen almost immediately. * |[ - * gst-launch -v videotestsrc ! navigationtest ! ffmpegcolorspace ! ximagesink + * gst-launch -v videotestsrc ! navigationtest ! videoconvert ! ximagesink * ]| A pipeline to test navigation events. * While moving the mouse pointer over the test signal you will see a black box * following the mouse pointer. If you press the mouse button somewhere on the diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 089e490f17..7dd94b9fd5 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -99,6 +99,8 @@ else cxx_checks = endif +# FIXME 0.11: convert elements/ffmpegcolorspace to videoconvert or remove + check_PROGRAMS = \ $(check_alsa) \ $(check_gio) \ @@ -115,7 +117,6 @@ check_PROGRAMS = \ elements/audiotestsrc \ elements/decodebin \ $(check_encodebin) \ - elements/ffmpegcolorspace \ elements/gdpdepay \ elements/gdppay \ elements/multifdsink \ @@ -154,9 +155,9 @@ check_PROGRAMS = \ # TORTURE_TO_FIX = \ # elements/adder -# ffmpegcolorspace takes too long, so disabled for now +# videoconvert takes too long, so disabled for now VALGRIND_TO_FIX = \ - elements/ffmpegcolorspace \ + elements/videoconvert \ libs/video # these tests don't even pass diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore index a19ab6243e..58b38ba594 100644 --- a/tests/check/elements/.gitignore +++ b/tests/check/elements/.gitignore @@ -19,7 +19,7 @@ volume vorbisdec typefindfunctions textoverlay -ffmpegcolorspace +videoconvert videoscale vorbistag playbin diff --git a/tests/check/elements/videoscale.c b/tests/check/elements/videoscale.c index 0949b44653..83a5c32510 100644 --- a/tests/check/elements/videoscale.c +++ b/tests/check/elements/videoscale.c @@ -94,14 +94,14 @@ run_test (const GstCaps * caps, gint src_width, gint src_height, GCallback sink_handoff, gpointer sink_handoff_user_data) { GstElement *pipeline; - GstElement *src, *ffmpegcolorspace, *capsfilter1, *identity, *scale, + GstElement *src, *videoconvert, *capsfilter1, *identity, *scale, *capsfilter2, *sink; GstMessage *msg; GstBus *bus; GstCaps *copy; guint n_buffers = 0; - /* skip formats that ffmpegcolorspace can't handle */ + /* skip formats that videoconvert can't handle */ if (caps_are_64bpp (caps)) return; @@ -112,8 +112,8 @@ run_test (const GstCaps * caps, gint src_width, gint src_height, fail_unless (src != NULL); g_object_set (G_OBJECT (src), "num-buffers", 1, NULL); - ffmpegcolorspace = gst_element_factory_make ("ffmpegcolorspace", "csp"); - fail_unless (ffmpegcolorspace != NULL); + videoconvert = gst_element_factory_make ("videoconvert", "csp"); + fail_unless (videoconvert != NULL); capsfilter1 = gst_element_factory_make ("capsfilter", "filter1"); fail_unless (capsfilter1 != NULL); @@ -152,12 +152,12 @@ run_test (const GstCaps * caps, gint src_width, gint src_height, sink_handoff_user_data); } - gst_bin_add_many (GST_BIN (pipeline), src, ffmpegcolorspace, capsfilter1, + gst_bin_add_many (GST_BIN (pipeline), src, videoconvert, capsfilter1, identity, scale, capsfilter2, sink, NULL); - fail_unless (gst_element_link_pads_full (src, "src", ffmpegcolorspace, "sink", + fail_unless (gst_element_link_pads_full (src, "src", videoconvert, "sink", LINK_CHECK_FLAGS)); - fail_unless (gst_element_link_pads_full (ffmpegcolorspace, "src", capsfilter1, + fail_unless (gst_element_link_pads_full (videoconvert, "src", capsfilter1, "sink", LINK_CHECK_FLAGS)); fail_unless (gst_element_link_pads_full (capsfilter1, "src", identity, "sink", LINK_CHECK_FLAGS)); @@ -221,7 +221,7 @@ GST_START_TEST (test_passthrough) GstCaps *caps = *p; for (method = 0; method < 3; method++) { - /* skip formats that ffmpegcolorspace can't handle */ + /* skip formats that videoconvert can't handle */ if (caps_are_64bpp (caps)) continue; @@ -627,7 +627,7 @@ gst_test_reverse_negotiation_sink_render (GstBaseSink * bsink, sink->nbuffers++; /* The third buffer is still in the old size - * because the ffmpegcolorspaces can't convert + * because the videoconverts can't convert * the frame sizes */ if (sink->nbuffers > 3) { @@ -715,13 +715,13 @@ GST_START_TEST (test_reverse_negotiation) fail_unless (src != NULL); g_object_set (G_OBJECT (src), "num-buffers", 8, NULL); - csp1 = gst_element_factory_make ("ffmpegcolorspace", "csp1"); + csp1 = gst_element_factory_make ("videoconvert", "csp1"); fail_unless (csp1 != NULL); scale = gst_element_factory_make ("videoscale", "scale"); fail_unless (scale != NULL); - csp2 = gst_element_factory_make ("ffmpegcolorspace", "csp2"); + csp2 = gst_element_factory_make ("videoconvert", "csp2"); fail_unless (csp2 != NULL); sink = g_object_new (GST_TYPE_TEST_REVERSE_NEGOTIATION_SINK, NULL); diff --git a/tests/check/pipelines/oggmux.c b/tests/check/pipelines/oggmux.c index de079dacf2..7c9607df47 100644 --- a/tests/check/pipelines/oggmux.c +++ b/tests/check/pipelines/oggmux.c @@ -350,7 +350,7 @@ GST_END_TEST; GST_START_TEST (test_theora) { test_pipeline - ("videotestsrc num-buffers=5 ! ffmpegcolorspace ! theoraenc ! oggmux"); + ("videotestsrc num-buffers=5 ! videoconvert ! theoraenc ! oggmux"); } GST_END_TEST; @@ -360,7 +360,7 @@ GST_END_TEST; GST_START_TEST (test_theora_vorbis) { test_pipeline - ("videotestsrc num-buffers=10 ! ffmpegcolorspace ! theoraenc ! queue ! oggmux name=mux " + ("videotestsrc num-buffers=10 ! videoconvert ! theoraenc ! queue ! oggmux name=mux " "audiotestsrc num-buffers=2 ! audioconvert ! vorbisenc ! queue ! mux."); } @@ -369,7 +369,7 @@ GST_END_TEST; GST_START_TEST (test_vorbis_theora) { test_pipeline - ("videotestsrc num-buffers=2 ! ffmpegcolorspace ! theoraenc ! queue ! oggmux name=mux " + ("videotestsrc num-buffers=2 ! videoconvert ! theoraenc ! queue ! oggmux name=mux " "audiotestsrc num-buffers=10 ! audioconvert ! vorbisenc ! queue ! mux."); } diff --git a/tests/examples/dynamic/addstream.c b/tests/examples/dynamic/addstream.c index 66ad0becb9..5d23630911 100644 --- a/tests/examples/dynamic/addstream.c +++ b/tests/examples/dynamic/addstream.c @@ -149,7 +149,7 @@ perform_step (gpointer pstep) g_print ("creating bin1\n"); bin1 = create_stream - ("( v4l2src ! ffmpegcolorspace ! timeoverlay ! queue ! xvimagesink name=v4llive )"); + ("( v4l2src ! videoconvert ! timeoverlay ! queue ! xvimagesink name=v4llive )"); pause_play_stream (bin1, 0); g_timeout_add (1000, (GSourceFunc) perform_step, GINT_TO_POINTER (1)); break; @@ -172,7 +172,7 @@ perform_step (gpointer pstep) g_print ("creating bin4\n"); bin4 = create_stream - ("( videotestsrc ! timeoverlay ! ffmpegcolorspace ! ximagesink name=vtnonlive )"); + ("( videotestsrc ! timeoverlay ! videoconvert ! ximagesink name=vtnonlive )"); pause_play_stream (bin4, 0); g_timeout_add (1000, (GSourceFunc) perform_step, GINT_TO_POINTER (4)); break; @@ -181,7 +181,7 @@ perform_step (gpointer pstep) g_print ("creating bin5\n"); bin5 = create_stream - ("( videotestsrc is-live=1 ! timeoverlay ! ffmpegcolorspace ! ximagesink name=vtlive )"); + ("( videotestsrc is-live=1 ! timeoverlay ! videoconvert ! ximagesink name=vtlive )"); pause_play_stream (bin5, 0); g_timeout_add (1000, (GSourceFunc) perform_step, GINT_TO_POINTER (5)); break; diff --git a/tests/examples/seek/jsseek.c b/tests/examples/seek/jsseek.c index c75a6f0bea..6d6ec21d46 100644 --- a/tests/examples/seek/jsseek.c +++ b/tests/examples/seek/jsseek.c @@ -483,7 +483,7 @@ make_theora_pipeline (const gchar * location) src = gst_element_factory_make_or_warn (SOURCE, "src"); demux = gst_element_factory_make_or_warn ("oggdemux", "demux"); decoder = gst_element_factory_make_or_warn ("theoradec", "decoder"); - convert = gst_element_factory_make_or_warn ("ffmpegcolorspace", "convert"); + convert = gst_element_factory_make_or_warn ("videoconvert", "convert"); videosink = gst_element_factory_make_or_warn (VSINK, "sink"); g_object_set (G_OBJECT (src), "location", location, NULL); @@ -565,8 +565,7 @@ make_vorbis_theora_pipeline (const gchar * location) video_bin = gst_bin_new ("v_decoder_bin"); v_queue = gst_element_factory_make_or_warn ("queue", "v_queue"); v_decoder = gst_element_factory_make_or_warn ("theoradec", "v_dec"); - v_convert = - gst_element_factory_make_or_warn ("ffmpegcolorspace", "v_convert"); + v_convert = gst_element_factory_make_or_warn ("videoconvert", "v_convert"); v_scale = gst_element_factory_make_or_warn ("videoscale", "v_scale"); videosink = gst_element_factory_make_or_warn (VSINK, "v_sink"); @@ -645,8 +644,7 @@ make_avi_msmpeg4v3_mp3_pipeline (const gchar * location) video_bin = gst_bin_new ("v_decoder_bin"); v_queue = gst_element_factory_make_or_warn ("queue", "v_queue"); v_decoder = gst_element_factory_make_or_warn ("ffdec_msmpeg4", "v_dec"); - v_convert = - gst_element_factory_make_or_warn ("ffmpegcolorspace", "v_convert"); + v_convert = gst_element_factory_make_or_warn ("videoconvert", "v_convert"); videosink = gst_element_factory_make_or_warn (VSINK, "v_sink"); gst_bin_add (GST_BIN (video_bin), v_queue); @@ -826,7 +824,7 @@ make_mpeg_pipeline (const gchar * location) video_bin = gst_bin_new ("v_decoder_bin"); v_decoder = gst_element_factory_make_or_warn ("mpeg2dec", "v_dec"); v_queue = gst_element_factory_make_or_warn ("queue", "v_queue"); - v_filter = gst_element_factory_make_or_warn ("ffmpegcolorspace", "v_filter"); + v_filter = gst_element_factory_make_or_warn ("videoconvert", "v_filter"); videosink = gst_element_factory_make_or_warn (VSINK, "v_sink"); gst_bin_add (GST_BIN (video_bin), v_decoder); @@ -904,7 +902,7 @@ make_mpegnt_pipeline (const gchar * location) video_bin = gst_bin_new ("v_decoder_bin"); v_decoder = gst_element_factory_make_or_warn ("mpeg2dec", "v_dec"); - v_filter = gst_element_factory_make_or_warn ("ffmpegcolorspace", "v_filter"); + v_filter = gst_element_factory_make_or_warn ("videoconvert", "v_filter"); videosink = gst_element_factory_make_or_warn (VSINK, "v_sink"); gst_element_link_many (v_decoder, v_filter, videosink, NULL); diff --git a/tests/examples/snapshot/snapshot.c b/tests/examples/snapshot/snapshot.c index b1ec777fa5..feafdf30bb 100644 --- a/tests/examples/snapshot/snapshot.c +++ b/tests/examples/snapshot/snapshot.c @@ -50,7 +50,7 @@ main (int argc, char *argv[]) /* create a new pipeline */ descr = - g_strdup_printf ("uridecodebin uri=%s ! ffmpegcolorspace ! videoscale ! " + g_strdup_printf ("uridecodebin uri=%s ! videoconvert ! videoscale ! " " appsink name=sink caps=\"" CAPS "\"", argv[1]); pipeline = gst_parse_launch (descr, &error); diff --git a/tests/icles/output-selector-test.c b/tests/icles/output-selector-test.c index 24ad2835dc..6d9b94e9a1 100644 --- a/tests/icles/output-selector-test.c +++ b/tests/icles/output-selector-test.c @@ -86,11 +86,11 @@ main (gint argc, gchar * argv[]) /* create elements */ pipeline = gst_element_factory_make ("pipeline", "pipeline"); src = gst_element_factory_make ("videotestsrc", "src"); - c0 = gst_element_factory_make ("ffmpegcolorspace", NULL); + c0 = gst_element_factory_make ("videoconvert", NULL); toverlay = gst_element_factory_make ("timeoverlay", "timeoverlay"); osel = gst_element_factory_make ("output-selector", "osel"); - c1 = gst_element_factory_make ("ffmpegcolorspace", NULL); - c2 = gst_element_factory_make ("ffmpegcolorspace", NULL); + c1 = gst_element_factory_make ("videoconvert", NULL); + c2 = gst_element_factory_make ("videoconvert", NULL); sink1 = gst_element_factory_make ("autovideosink", "sink1"); sink2 = gst_element_factory_make ("autovideosink", "sink2"); diff --git a/tests/icles/playback/test.c b/tests/icles/playback/test.c index 4526b1d000..282302f817 100644 --- a/tests/icles/playback/test.c +++ b/tests/icles/playback/test.c @@ -35,7 +35,7 @@ gen_video_element (void) GstPad *pad; element = gst_bin_new ("vbin"); - conv = gst_element_factory_make ("ffmpegcolorspace", "conv"); + conv = gst_element_factory_make ("videoconvert", "conv"); sink = gst_element_factory_make (DEFAULT_VIDEOSINK, "sink"); gst_bin_add (GST_BIN (element), conv); diff --git a/tests/icles/test-box.c b/tests/icles/test-box.c index 6d04e560f7..09fd3e7547 100644 --- a/tests/icles/test-box.c +++ b/tests/icles/test-box.c @@ -38,7 +38,7 @@ make_pipeline (gint type) pstr = g_strdup_printf ("videotestsrc ! " CAPS " ! videobox name=box ! videoscale ! " CAPS - " ! ffmpegcolorspace ! ximagesink"); + " ! videoconvert ! ximagesink"); break; default: return NULL; diff --git a/tests/icles/test-scale.c b/tests/icles/test-scale.c index 6d1311930d..719adee165 100644 --- a/tests/icles/test-scale.c +++ b/tests/icles/test-scale.c @@ -63,7 +63,7 @@ make_pipeline (gint type) "capsfilter name=filter ! " "ximagesink"); break; case 7: - pstr = g_strdup_printf ("v4l2src ! ffmpegcolorspace ! videoscale ! " + pstr = g_strdup_printf ("v4l2src ! videoconvert ! videoscale ! " "capsfilter name=filter ! " "ximagesink"); break; default: diff --git a/tests/icles/test-textoverlay.c b/tests/icles/test-textoverlay.c index 8d989a8f8c..22119df3e6 100644 --- a/tests/icles/test-textoverlay.c +++ b/tests/icles/test-textoverlay.c @@ -82,7 +82,7 @@ test_textoverlay (int width, int height) pstr = g_strdup_printf ("videotestsrc pattern=blue ! " "video/x-raw-yuv,width=%d,height=%d ! t.video_sink " "textoverlay name=t font-desc=\"Sans Serif, 20\" ! " - " ffmpegcolorspace ! videoscale ! autovideosink", width, height); + " videoconvert ! videoscale ! autovideosink", width, height); pipe = gst_parse_launch_full (pstr, NULL, GST_PARSE_FLAG_NONE, NULL); g_assert (pipe); diff --git a/tools/gst-launch-ext.1.in b/tools/gst-launch-ext.1.in index ada73802ce..90ee34cc40 100644 --- a/tools/gst-launch-ext.1.in +++ b/tools/gst-launch-ext.1.in @@ -27,7 +27,7 @@ Here is an example .gst file that implements the same defaults as hard-coded in the script : AUDIOSINK = osssink -VIDEOSINK = ffmpegcolorspace ! xvimagesink +VIDEOSINK = videoconvert ! xvimagesink You can change osssink to esdsink or alsasink (if you have the plug-in), and you can change xvimagesink to ximagesink, aasink diff --git a/tools/gst-visualise-m.m b/tools/gst-visualise-m.m index 293209aee1..798929b188 100644 --- a/tools/gst-visualise-m.m +++ b/tools/gst-visualise-m.m @@ -52,7 +52,7 @@ sub visualise(@) my $pipe; $pipe = $vis unless $pipe = $pipes{$vis}; - $command = "gst-launch-@GST_MAJORMINOR@ $cfg{AUDIOSRC} ! $pipe ! { queue ! ffmpegcolorspace ! $cfg{VIDEOSINK} }"; + $command = "gst-launch-@GST_MAJORMINOR@ $cfg{AUDIOSRC} ! $pipe ! { queue ! videoconvert ! $cfg{VIDEOSINK} }"; print "Running $command\n"; system ("PATH=\$PATH:".$cfg{CVS_PATH}."/gstreamer/tools $command"); } diff --git a/win32/MANIFEST b/win32/MANIFEST index f075b820b3..6785c88fb3 100644 --- a/win32/MANIFEST +++ b/win32/MANIFEST @@ -35,7 +35,6 @@ win32/vs6/libgstaudiotestsrc.dsp win32/vs6/libgstcdda.dsp win32/vs6/libgstdecodebin2.dsp win32/vs6/libgstdecodebin.dsp -win32/vs6/libgstffmpegcolorspace.dsp win32/vs6/libgstfft.dsp win32/vs6/libgstgdp.dsp win32/vs6/libgstinterfaces.dsp @@ -66,7 +65,6 @@ win32/vs8/libgstaudiorate.vcproj win32/vs8/libgstaudioresample.vcproj win32/vs8/libgstaudiotestsrc.vcproj win32/vs8/libgstdecodebin.vcproj -win32/vs8/libgstffmpegcolorspace.vcproj win32/vs8/libgstinterfaces.vcproj win32/vs8/libgstogg.vcproj win32/vs8/libgstplaybin.vcproj diff --git a/win32/vs6/gst_plugins_base.dsw b/win32/vs6/gst_plugins_base.dsw index ab6bfadc10..a651927a75 100644 --- a/win32/vs6/gst_plugins_base.dsw +++ b/win32/vs6/gst_plugins_base.dsw @@ -138,18 +138,6 @@ Package=<4> ############################################################################### -Project: "libgstffmpegcolorspace"=".\libgstffmpegcolorspace.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "libgstfft"=".\libgstfft.dsp" - Package Owner=<4> Package=<5> diff --git a/win32/vs6/libgstffmpegcolorspace.dsp b/win32/vs6/libgstffmpegcolorspace.dsp deleted file mode 100644 index ad7cd40612..0000000000 --- a/win32/vs6/libgstffmpegcolorspace.dsp +++ /dev/null @@ -1,163 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libgstffmpegcolorspace" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=libgstffmpegcolorspace - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libgstffmpegcolorspace.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libgstffmpegcolorspace.mak" CFG="libgstffmpegcolorspace - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libgstffmpegcolorspace - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libgstffmpegcolorspace - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libgstffmpegcolorspace - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTFFMPEGCOLORSPACE_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../gst/ffmpegcolorspace" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTFFMPEGCOLORSPACE_EXPORTS" /D "HAVE_CONFIG_H" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" -# Begin Special Build Tool -TargetPath=.\Release\libgstffmpegcolorspace.dll -SOURCE="$(InputPath)" -PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\lib\gstreamer-0.10 -# End Special Build Tool - -!ELSEIF "$(CFG)" == "libgstffmpegcolorspace - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTFFMPEGCOLORSPACE_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../gst/ffmpegcolorspace" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTFFMPEGCOLORSPACE_EXPORTS" /D "HAVE_CONFIG_H" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" -# Begin Special Build Tool -TargetPath=.\Debug\libgstffmpegcolorspace.dll -SOURCE="$(InputPath)" -PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10 -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "libgstffmpegcolorspace - Win32 Release" -# Name "libgstffmpegcolorspace - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\dsputil.c -# End Source File -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\gstffmpeg.c -# End Source File -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\gstffmpegcodecmap.c -# End Source File -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\gstffmpegcolorspace.c -# End Source File -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\imgconvert.c -# End Source File -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\mem.c -# End Source File -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\utils.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\avcodec.h -# End Source File -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\dsputil.h -# End Source File -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\gstffmpegcodecmap.h -# End Source File -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\gstffmpegcolorspace.h -# End Source File -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\imgconvert_template.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/win32/vs6/libgsttag.dsp b/win32/vs6/libgsttag.dsp index 7e68ec6168..07bb70dd65 100644 --- a/win32/vs6/libgsttag.dsp +++ b/win32/vs6/libgsttag.dsp @@ -131,9 +131,5 @@ SOURCE="..\..\gst-libs\gst\tag\tags.c" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group -# Begin Source File - -SOURCE=..\..\gst\ffmpegcolorspace\avcodec.h -# End Source File # End Target # End Project diff --git a/win32/vs7/gst-plugins-base.sln b/win32/vs7/gst-plugins-base.sln index cd048c279b..b486e89612 100644 --- a/win32/vs7/gst-plugins-base.sln +++ b/win32/vs7/gst-plugins-base.sln @@ -28,10 +28,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstaudiotestsrc", "libgs ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstffmpegcolorspace", "libgstffmpegcolorspace.vcproj", "{BE2600A9-5BEB-42D9-8F13-FD38FCF5B801}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstplaybin", "libgstplaybin.vcproj", "{7B296C12-D728-4CD8-8CF7-B8D7A433F85C}" ProjectSection(ProjectDependencies) = postProject {F7558C2A-C1BC-453C-8FDE-84F33DB73915} = {F7558C2A-C1BC-453C-8FDE-84F33DB73915} diff --git a/win32/vs7/libgstffmpegcolorspace.vcproj b/win32/vs7/libgstffmpegcolorspace.vcproj deleted file mode 100644 index 5b53b22b86..0000000000 --- a/win32/vs7/libgstffmpegcolorspace.vcproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs8/gst-plugins-base.sln b/win32/vs8/gst-plugins-base.sln index e7a593d37f..d8a85f1a76 100644 --- a/win32/vs8/gst-plugins-base.sln +++ b/win32/vs8/gst-plugins-base.sln @@ -21,8 +21,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstaudioresample", "libg EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstaudiotestsrc", "libgstaudiotestsrc.vcproj", "{B5CDFF9E-28E0-4915-8C3E-95EDAE2D9DE3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstffmpegcolorspace", "libgstffmpegcolorspace.vcproj", "{BE2600A9-5BEB-42D9-8F13-FD38FCF5B801}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstplaybin", "libgstplaybin.vcproj", "{7B296C12-D728-4CD8-8CF7-B8D7A433F85C}" ProjectSection(ProjectDependencies) = postProject {F7558C2A-C1BC-453C-8FDE-84F33DB73915} = {F7558C2A-C1BC-453C-8FDE-84F33DB73915} diff --git a/win32/vs8/libgstffmpegcolorspace.vcproj b/win32/vs8/libgstffmpegcolorspace.vcproj deleted file mode 100644 index add0dc76a3..0000000000 --- a/win32/vs8/libgstffmpegcolorspace.vcproj +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -