# HG changeset patch # User hgs # Date 1273880624 18000 # Node ID 7e3786c5ed276617d3e349cf422d06444b49606b # Parent 24ed0baaf8e5bbfe17196339a33b4da70ae928c4 201019 diff -r 24ed0baaf8e5 -r 7e3786c5ed27 data/gst_dll_2001F41F.txt --- a/data/gst_dll_2001F41F.txt Fri Apr 30 19:11:56 2010 -0500 +++ b/data/gst_dll_2001F41F.txt Fri May 14 18:43:44 2010 -0500 @@ -39,3 +39,5 @@ libgstmulaw.dll libgstalaw.dll libgstamrmux.dll +libgstmpegaudioparse.dll +libgstnokiaaacdec.dll diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/bld.inf --- a/gst_plugins_base/group/bld.inf Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/bld.inf Fri May 14 18:43:44 2010 -0500 @@ -4,166 +4,166 @@ PRJ_EXPORTS // interfaces -../gst-libs/gst/interfaces/colorbalance.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/colorbalance.h -../gst-libs/gst/interfaces/colorbalancechannel.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/colorbalancechannel.h -../gst-libs/gst/interfaces/mixer.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/mixer.h -../gst-libs/gst/interfaces/mixeroptions.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/mixeroptions.h -../gst-libs/gst/interfaces/mixertrack.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/mixertrack.h -../gst-libs/gst/interfaces/navigation.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/navigation.h -../gst-libs/gst/interfaces/propertyprobe.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/propertyprobe.h -../gst-libs/gst/interfaces/tuner.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/tuner.h -../gst-libs/gst/interfaces/tunernorm.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/tunernorm.h -../gst-libs/gst/interfaces/tunerchannel.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/tunerchannel.h -../gst-libs/gst/interfaces/xoverlay.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/xoverlay.h -../gst-libs/gst/interfaces/interfaces-enumtypes.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/interfaces-enumtypes.h +../gst-libs/gst/interfaces/colorbalance.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/colorbalance.h +../gst-libs/gst/interfaces/colorbalancechannel.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/colorbalancechannel.h +../gst-libs/gst/interfaces/mixer.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/mixer.h +../gst-libs/gst/interfaces/mixeroptions.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/mixeroptions.h +../gst-libs/gst/interfaces/mixertrack.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/mixertrack.h +../gst-libs/gst/interfaces/navigation.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/navigation.h +../gst-libs/gst/interfaces/propertyprobe.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/propertyprobe.h +../gst-libs/gst/interfaces/tuner.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/tuner.h +../gst-libs/gst/interfaces/tunernorm.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/tunernorm.h +../gst-libs/gst/interfaces/tunerchannel.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/tunerchannel.h +../gst-libs/gst/interfaces/xoverlay.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/xoverlay.h +../gst-libs/gst/interfaces/interfaces-enumtypes.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/interfaces-enumtypes.h // audio -../gst-libs/gst/audio/audio.h /sf/mw/gstreamer/include/gstreamer/gst/audio/audio.h -../gst-libs/gst/audio/gstaudioclock.h /sf/mw/gstreamer/include/gstreamer/gst/audio/gstaudioclock.h -../gst-libs/gst/audio/gstaudiofilter.h /sf/mw/gstreamer/include/gstreamer/gst/audio/gstaudiofilter.h -../gst-libs/gst/audio/gstaudiosink.h /sf/mw/gstreamer/include/gstreamer/gst/audio/gstaudiosink.h -../gst-libs/gst/audio/gstaudiosrc.h /sf/mw/gstreamer/include/gstreamer/gst/audio/gstaudiosrc.h -../gst-libs/gst/audio/gstbaseaudiosink.h /sf/mw/gstreamer/include/gstreamer/gst/audio/gstbaseaudiosink.h -../gst-libs/gst/audio/gstbaseaudiosrc.h /sf/mw/gstreamer/include/gstreamer/gst/audio/gstbaseaudiosrc.h -../gst-libs/gst/audio/gstringbuffer.h /sf/mw/gstreamer/include/gstreamer/gst/audio/gstringbuffer.h -../gst-libs/gst/audio/mixerutils.h /sf/mw/gstreamer/include/gstreamer/gst/audio/mixerutils.h -../gst-libs/gst/audio/multichannel.h /sf/mw/gstreamer/include/gstreamer/gst/audio/multichannel.h -../gst-libs/gst/audio/audio-enumtypes.h /sf/mw/gstreamer/include/gstreamer/gst/audio/audio-enumtypes.h +../gst-libs/gst/audio/audio.h /epoc32/include/platform/mw/gstreamer/gst/audio/audio.h +../gst-libs/gst/audio/gstaudioclock.h /epoc32/include/platform/mw/gstreamer/gst/audio/gstaudioclock.h +../gst-libs/gst/audio/gstaudiofilter.h /epoc32/include/platform/mw/gstreamer/gst/audio/gstaudiofilter.h +../gst-libs/gst/audio/gstaudiosink.h /epoc32/include/platform/mw/gstreamer/gst/audio/gstaudiosink.h +../gst-libs/gst/audio/gstaudiosrc.h /epoc32/include/platform/mw/gstreamer/gst/audio/gstaudiosrc.h +../gst-libs/gst/audio/gstbaseaudiosink.h /epoc32/include/platform/mw/gstreamer/gst/audio/gstbaseaudiosink.h +../gst-libs/gst/audio/gstbaseaudiosrc.h /epoc32/include/platform/mw/gstreamer/gst/audio/gstbaseaudiosrc.h +../gst-libs/gst/audio/gstringbuffer.h /epoc32/include/platform/mw/gstreamer/gst/audio/gstringbuffer.h +../gst-libs/gst/audio/mixerutils.h /epoc32/include/platform/mw/gstreamer/gst/audio/mixerutils.h +../gst-libs/gst/audio/multichannel.h /epoc32/include/platform/mw/gstreamer/gst/audio/multichannel.h +../gst-libs/gst/audio/audio-enumtypes.h /epoc32/include/platform/mw/gstreamer/gst/audio/audio-enumtypes.h // cdda -//../gst-libs/gst/cdda/base64.h /sf/mw/gstreamer/include/gstreamer/gst/cdda/base64.h -../gst-libs/gst/cdda/gstcddabasesrc.h /sf/mw/gstreamer/include/gstreamer/gst/cdda/gstcddabasesrc.h +//../gst-libs/gst/cdda/base64.h /epoc32/include/platform/mw/gstreamer/gst/cdda/base64.h +../gst-libs/gst/cdda/gstcddabasesrc.h /epoc32/include/platform/mw/gstreamer/gst/cdda/gstcddabasesrc.h // floatcast -../gst-libs/gst/floatcast/floatcast.h /sf/mw/gstreamer/include/gstreamer/gst/floatcast/floatcast.h +../gst-libs/gst/floatcast/floatcast.h /epoc32/include/platform/mw/gstreamer/gst/floatcast/floatcast.h // riff -../gst-libs/gst/riff/riff-ids.h /sf/mw/gstreamer/include/gstreamer/gst/riff/riff-ids.h -../gst-libs/gst/riff/riff-media.h /sf/mw/gstreamer/include/gstreamer/gst/riff/riff-media.h -../gst-libs/gst/riff/riff-read.h /sf/mw/gstreamer/include/gstreamer/gst/riff/riff-read.h +../gst-libs/gst/riff/riff-ids.h /epoc32/include/platform/mw/gstreamer/gst/riff/riff-ids.h +../gst-libs/gst/riff/riff-media.h /epoc32/include/platform/mw/gstreamer/gst/riff/riff-media.h +../gst-libs/gst/riff/riff-read.h /epoc32/include/platform/mw/gstreamer/gst/riff/riff-read.h //app -../gst-libs/gst/app/gstappbuffer.h /sf/mw/gstreamer/include/gstreamer/gst/app/gstappbuffer.h -../gst-libs/gst/app/gstappsink.h /sf/mw/gstreamer/include/gstreamer/gst/app/gstappsink.h -../gst-libs/gst/app/gstappsrc.h /sf/mw/gstreamer/include/gstreamer/gst/app/gstappsrc.h +../gst-libs/gst/app/gstappbuffer.h /epoc32/include/platform/mw/gstreamer/gst/app/gstappbuffer.h +../gst-libs/gst/app/gstappsink.h /epoc32/include/platform/mw/gstreamer/gst/app/gstappsink.h +../gst-libs/gst/app/gstappsrc.h /epoc32/include/platform/mw/gstreamer/gst/app/gstappsrc.h // rtp -../gst-libs/gst/rtp/gstbasertpdepayload.h /sf/mw/gstreamer/include/gstreamer/gst/rtp/gstbasertpdepayload.h -../gst-libs/gst/rtp/gstbasertppayload.h /sf/mw/gstreamer/include/gstreamer/gst/rtp/gstbasertppayload.h -../gst-libs/gst/rtp/gstrtpbuffer.h /sf/mw/gstreamer/include/gstreamer/gst/rtp/gstrtpbuffer.h -../gst-libs/gst/rtp/gstbasertpaudiopayload.h /sf/mw/gstreamer/include/gstreamer/gst/rtp/gstbasertpaudiopayload.h -../gst-libs/gst/rtp/gstrtcpbuffer.h /sf/mw/gstreamer/include/gstreamer/gst/rtp/gstrtcpbuffer.h -../gst-libs/gst/rtp/gstrtppayloads.h /sf/mw/gstreamer/include/gstreamer/gst/rtp/gstrtppayloads.h +../gst-libs/gst/rtp/gstbasertpdepayload.h /epoc32/include/platform/mw/gstreamer/gst/rtp/gstbasertpdepayload.h +../gst-libs/gst/rtp/gstbasertppayload.h /epoc32/include/platform/mw/gstreamer/gst/rtp/gstbasertppayload.h +../gst-libs/gst/rtp/gstrtpbuffer.h /epoc32/include/platform/mw/gstreamer/gst/rtp/gstrtpbuffer.h +../gst-libs/gst/rtp/gstbasertpaudiopayload.h /epoc32/include/platform/mw/gstreamer/gst/rtp/gstbasertpaudiopayload.h +../gst-libs/gst/rtp/gstrtcpbuffer.h /epoc32/include/platform/mw/gstreamer/gst/rtp/gstrtcpbuffer.h +../gst-libs/gst/rtp/gstrtppayloads.h /epoc32/include/platform/mw/gstreamer/gst/rtp/gstrtppayloads.h // tag -../gst-libs/gst/tag/gsttageditingprivate.h /sf/mw/gstreamer/include/gstreamer/gst/tag/gsttageditingprivate.h -../gst-libs/gst/tag/tag.h /sf/mw/gstreamer/include/gstreamer/gst/tag/tag.h +//../gst-libs/gst/tag/gsttageditingprivate.h /epoc32/include/platform/mw/gstreamer/gst/tag/gsttageditingprivate.h +../gst-libs/gst/tag/tag.h /epoc32/include/platform/mw/gstreamer/gst/tag/tag.h // netbuffer -../gst-libs/gst/netbuffer/gstnetbuffer.h /sf/mw/gstreamer/include/gstreamer/gst/netbuffer/gstnetbuffer.h +../gst-libs/gst/netbuffer/gstnetbuffer.h /epoc32/include/platform/mw/gstreamer/gst/netbuffer/gstnetbuffer.h // video -../gst-libs/gst/video/gstvideofilter.h /sf/mw/gstreamer/include/gstreamer/gst/video/gstvideofilter.h -../gst-libs/gst/video/gstvideosink.h /sf/mw/gstreamer/include/gstreamer/gst/video/gstvideosink.h -../gst-libs/gst/video/video.h /sf/mw/gstreamer/include/gstreamer/gst/video/video.h -../gst-libs/gst/video/video-enumtypes.h /sf/mw/gstreamer/include/gstreamer/gst/video/video-enumtypes.h +../gst-libs/gst/video/gstvideofilter.h /epoc32/include/platform/mw/gstreamer/gst/video/gstvideofilter.h +../gst-libs/gst/video/gstvideosink.h /epoc32/include/platform/mw/gstreamer/gst/video/gstvideosink.h +../gst-libs/gst/video/video.h /epoc32/include/platform/mw/gstreamer/gst/video/video.h +../gst-libs/gst/video/video-enumtypes.h /epoc32/include/platform/mw/gstreamer/gst/video/video-enumtypes.h // adder -../gst/adder/gstadder.h /sf/mw/gstreamer/include/gstreamer/gst/adder/gstadder.h +//../gst/adder/gstadder.h /epoc32/include/platform/mw/gstreamer/gst/adder/gstadder.h // audioconvert -../gst/audioconvert/audioconvert.h /sf/mw/gstreamer/include/gstreamer/gst/audioconvert/audioconvert.h -../gst/audioconvert/gstaudioconvert.h /sf/mw/gstreamer/include/gstreamer/gst/audioconvert/gstaudioconvert.h -../gst/audioconvert/gstchannelmix.h /sf/mw/gstreamer/include/gstreamer/gst/audioconvert/gstchannelmix.h -../gst/audioconvert/plugin.h /sf/mw/gstreamer/include/gstreamer/gst/audioconvert/plugin.h +//../gst/audioconvert/audioconvert.h /epoc32/include/platform/mw/gstreamer/gst/audioconvert/audioconvert.h +//../gst/audioconvert/gstaudioconvert.h /epoc32/include/platform/mw/gstreamer/gst/audioconvert/gstaudioconvert.h +//../gst/audioconvert/gstchannelmix.h /epoc32/include/platform/mw/gstreamer/gst/audioconvert/gstchannelmix.h +//../gst/audioconvert/plugin.h /epoc32/include/platform/mw/gstreamer/gst/audioconvert/plugin.h // audioresample -//../gst/audioresample/buffer.h /sf/mw/gstreamer/include/gstreamer/gst/audioresample/buffer.h -//../gst/audioresample/debug.h /sf/mw/gstreamer/include/gstreamer/gst/audioresample/debug.h -//../gst/audioresample/functable.h /sf/mw/gstreamer/include/gstreamer/gst/audioresample/functable.h -../gst/audioresample/gstaudioresample.h /sf/mw/gstreamer/include/gstreamer/gst/audioresample/gstaudioresample.h -//../gst/audioresample/resample.h /sf/mw/gstreamer/include/gstreamer/gst/audioresample/resample.h +//../gst/audioresample/buffer.h /epoc32/include/platform/mw/gstreamer/gst/audioresample/buffer.h +//../gst/audioresample/debug.h /epoc32/include/platform/mw/gstreamer/gst/audioresample/debug.h +//../gst/audioresample/functable.h /epoc32/include/platform/mw/gstreamer/gst/audioresample/functable.h +//../gst/audioresample/gstaudioresample.h /epoc32/include/platform/mw/gstreamer/gst/audioresample/gstaudioresample.h +//../gst/audioresample/resample.h /epoc32/include/platform/mw/gstreamer/gst/audioresample/resample.h // audiotestsrc -../gst/audiotestsrc/gstaudiotestsrc.h /sf/mw/gstreamer/include/gstreamer/gst/audiotestsrc/gstaudiotestsrc.h +//../gst/audiotestsrc/gstaudiotestsrc.h /epoc32/include/platform/mw/gstreamer/gst/audiotestsrc/gstaudiotestsrc.h // ffmpegcolorspace -../gst/ffmpegcolorspace/avcodec.h /sf/mw/gstreamer/include/gstreamer/gst/ffmpegcolorspace/avcodec.h -../gst/ffmpegcolorspace/dsputil.h /sf/mw/gstreamer/include/gstreamer/gst/ffmpegcolorspace/dsputil.h -../gst/ffmpegcolorspace/gstffmpegcodecmap.h /sf/mw/gstreamer/include/gstreamer/gst/ffmpegcolorspace/gstffmpegcodecmap.h -../gst/ffmpegcolorspace/gstffmpegcolorspace.h /sf/mw/gstreamer/include/gstreamer/gst/ffmpegcolorspace/gstffmpegcolorspace.h -../gst/ffmpegcolorspace/imgconvert_template.h /sf/mw/gstreamer/include/gstreamer/gst/ffmpegcolorspace/imgconvert_template.h +//../gst/ffmpegcolorspace/avcodec.h /epoc32/include/platform/mw/gstreamer/gst/ffmpegcolorspace/avcodec.h +//../gst/ffmpegcolorspace/dsputil.h /epoc32/include/platform/mw/gstreamer/gst/ffmpegcolorspace/dsputil.h +//../gst/ffmpegcolorspace/gstffmpegcodecmap.h /epoc32/include/platform/mw/gstreamer/gst/ffmpegcolorspace/gstffmpegcodecmap.h +//../gst/ffmpegcolorspace/gstffmpegcolorspace.h /epoc32/include/platform/mw/gstreamer/gst/ffmpegcolorspace/gstffmpegcolorspace.h +//../gst/ffmpegcolorspace/imgconvert_template.h /epoc32/include/platform/mw/gstreamer/gst/ffmpegcolorspace/imgconvert_template.h // playback -../gst/playback/gstplay-marshal.h /sf/mw/gstreamer/include/gstreamer/gst/playback/gstplay-marshal.h -../gst/playback/gstplaybasebin.h /sf/mw/gstreamer/include/gstreamer/gst/playback/gstplaybasebin.h -../gst/playback/gststreaminfo.h /sf/mw/gstreamer/include/gstreamer/gst/playback/gststreaminfo.h -../gst/playback/gststreamselector.h /sf/mw/gstreamer/include/gstreamer/gst/playback/gststreamselector.h +//../gst/playback/gstplay-marshal.h /epoc32/include/platform/mw/gstreamer/gst/playback/gstplay-marshal.h +//../gst/playback/gstplaybasebin.h /epoc32/include/platform/mw/gstreamer/gst/playback/gstplaybasebin.h +//../gst/playback/gststreaminfo.h /epoc32/include/platform/mw/gstreamer/gst/playback/gststreaminfo.h +//../gst/playback/gststreamselector.h /epoc32/include/platform/mw/gstreamer/gst/playback/gststreamselector.h //pbutils -../gst-libs/gst/pbutils/pbutils.h /sf/mw/gstreamer/include/gstreamer/gst/pbutils/pbutils.h -../gst-libs/gst/pbutils/descriptions.h /sf/mw/gstreamer/include/gstreamer/gst/pbutils/descriptions.h -../gst-libs/gst/pbutils/install-plugins.h /sf/mw/gstreamer/include/gstreamer/gst/pbutils/install-plugins.h -../gst-libs/gst/pbutils/missing-plugins.h /sf/mw/gstreamer/include/gstreamer/gst/pbutils/missing-plugins.h -../gst-libs/gst/pbutils/pbutils-enumtypes.h /sf/mw/gstreamer/include/gstreamer/gst/pbutils/pbutils-enumtypes.h +../gst-libs/gst/pbutils/pbutils.h /epoc32/include/platform/mw/gstreamer/gst/pbutils/pbutils.h +../gst-libs/gst/pbutils/descriptions.h /epoc32/include/platform/mw/gstreamer/gst/pbutils/descriptions.h +../gst-libs/gst/pbutils/install-plugins.h /epoc32/include/platform/mw/gstreamer/gst/pbutils/install-plugins.h +../gst-libs/gst/pbutils/missing-plugins.h /epoc32/include/platform/mw/gstreamer/gst/pbutils/missing-plugins.h +../gst-libs/gst/pbutils/pbutils-enumtypes.h /epoc32/include/platform/mw/gstreamer/gst/pbutils/pbutils-enumtypes.h // subparse -../gst/subparse/gstssaparse.h /sf/mw/gstreamer/include/gstreamer/gst/subparse/gstssaparse.h -../gst/subparse/gstsubparse.h /sf/mw/gstreamer/include/gstreamer/gst/subparse/gstsubparse.h -../gst/subparse/samiparse.h /sf/mw/gstreamer/include/gstreamer/gst/subparse/samiparse.h +//../gst/subparse/gstssaparse.h /epoc32/include/platform/mw/gstreamer/gst/subparse/gstssaparse.h +//../gst/subparse/gstsubparse.h /epoc32/include/platform/mw/gstreamer/gst/subparse/gstsubparse.h +//../gst/subparse/samiparse.h /epoc32/include/platform/mw/gstreamer/gst/subparse/samiparse.h // tcp -../gst/tcp/gstmultifdsink.h /sf/mw/gstreamer/include/gstreamer/gst/tcp/gstmultifdsink.h -../gst/tcp/gsttcp-enumtypes.h /sf/mw/gstreamer/include/gstreamer/gst/tcp/gsttcp-enumtypes.h -../gst/tcp/gsttcp-marshal.h /sf/mw/gstreamer/include/gstreamer/gst/tcp/gsttcp-marshal.h -../gst/tcp/gsttcp.h /sf/mw/gstreamer/include/gstreamer/gst/tcp/gsttcp.h -../gst/tcp/gsttcpclientsink.h /sf/mw/gstreamer/include/gstreamer/gst/tcp/gsttcpclientsink.h -../gst/tcp/gsttcpclientsrc.h /sf/mw/gstreamer/include/gstreamer/gst/tcp/gsttcpclientsrc.h -../gst/tcp/gsttcpplugin.h /sf/mw/gstreamer/include/gstreamer/gst/tcp/gsttcpplugin.h -../gst/tcp/gsttcpserversink.h /sf/mw/gstreamer/include/gstreamer/gst/tcp/gsttcpserversink.h -../gst/tcp/gsttcpserversrc.h /sf/mw/gstreamer/include/gstreamer/gst/tcp/gsttcpserversrc.h +//../gst/tcp/gstmultifdsink.h /epoc32/include/platform/mw/gstreamer/gst/tcp/gstmultifdsink.h +//../gst/tcp/gsttcp-enumtypes.h /epoc32/include/platform/mw/gstreamer/gst/tcp/gsttcp-enumtypes.h +//../gst/tcp/gsttcp-marshal.h /epoc32/include/platform/mw/gstreamer/gst/tcp/gsttcp-marshal.h +//../gst/tcp/gsttcp.h /epoc32/include/platform/mw/gstreamer/gst/tcp/gsttcp.h +//../gst/tcp/gsttcpclientsink.h /epoc32/include/platform/mw/gstreamer/gst/tcp/gsttcpclientsink.h +//../gst/tcp/gsttcpclientsrc.h /epoc32/include/platform/mw/gstreamer/gst/tcp/gsttcpclientsrc.h +//../gst/tcp/gsttcpplugin.h /epoc32/include/platform/mw/gstreamer/gst/tcp/gsttcpplugin.h +//../gst/tcp/gsttcpserversink.h /epoc32/include/platform/mw/gstreamer/gst/tcp/gsttcpserversink.h +//../gst/tcp/gsttcpserversrc.h /epoc32/include/platform/mw/gstreamer/gst/tcp/gsttcpserversrc.h // videorate -../gst/videorate/gstvideorate.h /sf/mw/gstreamer/include/gstreamer/gst/videorate/gstvideorate.h +//../gst/videorate/gstvideorate.h /epoc32/include/platform/mw/gstreamer/gst/videorate/gstvideorate.h // videoscale -../gst/videoscale/gstvideoscale.h /sf/mw/gstreamer/include/gstreamer/gst/videoscale/gstvideoscale.h -../gst/videoscale/vs_image.h /sf/mw/gstreamer/include/gstreamer/gst/videoscale/vs_image.h -../gst/videoscale/vs_scanline.h /sf/mw/gstreamer/include/gstreamer/gst/videoscale/vs_scanline.h +//../gst/videoscale/gstvideoscale.h /epoc32/include/platform/mw/gstreamer/gst/videoscale/gstvideoscale.h +//../gst/videoscale/vs_image.h /epoc32/include/platform/mw/gstreamer/gst/videoscale/vs_image.h +//../gst/videoscale/vs_scanline.h /epoc32/include/platform/mw/gstreamer/gst/videoscale/vs_scanline.h // videotestsrc -../gst/videotestsrc/gstvideotestsrc.h /sf/mw/gstreamer/include/gstreamer/gst/videotestsrc/gstvideotestsrc.h -../gst/videotestsrc/videotestsrc.h /sf/mw/gstreamer/include/gstreamer/gst/videotestsrc/videotestsrc.h +//../gst/videotestsrc/gstvideotestsrc.h /epoc32/include/platform/mw/gstreamer/gst/videotestsrc/gstvideotestsrc.h +//../gst/videotestsrc/videotestsrc.h /epoc32/include/platform/mw/gstreamer/gst/videotestsrc/videotestsrc.h // volume -../gst/volume/gstvolume.h /sf/mw/gstreamer/include/gstreamer/gst/volume/gstvolume.h +//../gst/volume/gstvolume.h /epoc32/include/platform/mw/gstreamer/gst/volume/gstvolume.h //liboil - Since liboil port is available, No need to use liboil stub. -//../gst/oil/liboil.h /sf/mw/gstreamer/include/gstreamer/gst/liboil.h +//../gst/oil/liboil.h /epoc32/include/platform/mw/gstreamer/gst/liboil.h // fft -../gst-libs/gst/fft/_kiss_fft_guts_f32.h /sf/mw/gstreamer/include/gstreamer/gst/fft/_kiss_fft_guts_f32.h -../gst-libs/gst/fft/_kiss_fft_guts_f64.h /sf/mw/gstreamer/include/gstreamer/gst/fft/_kiss_fft_guts_f64.h -../gst-libs/gst/fft/_kiss_fft_guts_s16.h /sf/mw/gstreamer/include/gstreamer/gst/fft/_kiss_fft_guts_s16.h -../gst-libs/gst/fft/_kiss_fft_guts_s32.h /sf/mw/gstreamer/include/gstreamer/gst/fft/_kiss_fft_guts_s32.h -../gst-libs/gst/fft/gstfft.h /sf/mw/gstreamer/include/gstreamer/gst/fft/gstfft.h -../gst-libs/gst/fft/gstfftf32.h /sf/mw/gstreamer/include/gstreamer/gst/fft/gstfftf32.h -../gst-libs/gst/fft/gstfftf64.h /sf/mw/gstreamer/include/gstreamer/gst/fft/gstfftf64.h -../gst-libs/gst/fft/gstffts16.h /sf/mw/gstreamer/include/gstreamer/gst/fft/gstffts16.h -../gst-libs/gst/fft/gstffts32.h /sf/mw/gstreamer/include/gstreamer/gst/fft/gstffts32.h -../gst-libs/gst/fft/kiss_fft_f32.h /sf/mw/gstreamer/include/gstreamer/gst/fft/kiss_fft_f32.h -../gst-libs/gst/fft/kiss_fft_f64.h /sf/mw/gstreamer/include/gstreamer/gst/fft/kiss_fft_f64.h -../gst-libs/gst/fft/kiss_fft_s16.h /sf/mw/gstreamer/include/gstreamer/gst/fft/kiss_fft_s16.h -../gst-libs/gst/fft/kiss_fft_s32.h /sf/mw/gstreamer/include/gstreamer/gst/fft/kiss_fft_s32.h -../gst-libs/gst/fft/kiss_fftr_f32.h /sf/mw/gstreamer/include/gstreamer/gst/fft/kiss_fftr_f32.h -../gst-libs/gst/fft/kiss_fftr_f64.h /sf/mw/gstreamer/include/gstreamer/gst/fft/kiss_fftr_f64.h -../gst-libs/gst/fft/kiss_fftr_s16.h /sf/mw/gstreamer/include/gstreamer/gst/fft/kiss_fftr_s16.h -../gst-libs/gst/fft/kiss_fftr_s32.h /sf/mw/gstreamer/include/gstreamer/gst/fft/kiss_fftr_s32.h +//../gst-libs/gst/fft/_kiss_fft_guts_f32.h /epoc32/include/platform/mw/gstreamer/gst/fft/_kiss_fft_guts_f32.h +//../gst-libs/gst/fft/_kiss_fft_guts_f64.h /epoc32/include/platform/mw/gstreamer/gst/fft/_kiss_fft_guts_f64.h +//../gst-libs/gst/fft/_kiss_fft_guts_s16.h /epoc32/include/platform/mw/gstreamer/gst/fft/_kiss_fft_guts_s16.h +//../gst-libs/gst/fft/_kiss_fft_guts_s32.h /epoc32/include/platform/mw/gstreamer/gst/fft/_kiss_fft_guts_s32.h +../gst-libs/gst/fft/gstfft.h /epoc32/include/platform/mw/gstreamer/gst/fft/gstfft.h +../gst-libs/gst/fft/gstfftf32.h /epoc32/include/platform/mw/gstreamer/gst/fft/gstfftf32.h +../gst-libs/gst/fft/gstfftf64.h /epoc32/include/platform/mw/gstreamer/gst/fft/gstfftf64.h +../gst-libs/gst/fft/gstffts16.h /epoc32/include/platform/mw/gstreamer/gst/fft/gstffts16.h +../gst-libs/gst/fft/gstffts32.h /epoc32/include/platform/mw/gstreamer/gst/fft/gstffts32.h +//../gst-libs/gst/fft/kiss_fft_f32.h /epoc32/include/platform/mw/gstreamer/gst/fft/kiss_fft_f32.h +//../gst-libs/gst/fft/kiss_fft_f64.h /epoc32/include/platform/mw/gstreamer/gst/fft/kiss_fft_f64.h +//../gst-libs/gst/fft/kiss_fft_s16.h /epoc32/include/platform/mw/gstreamer/gst/fft/kiss_fft_s16.h +//../gst-libs/gst/fft/kiss_fft_s32.h /epoc32/include/platform/mw/gstreamer/gst/fft/kiss_fft_s32.h +//../gst-libs/gst/fft/kiss_fftr_f32.h /epoc32/include/platform/mw/gstreamer/gst/fft/kiss_fftr_f32.h +//../gst-libs/gst/fft/kiss_fftr_f64.h /epoc32/include/platform/mw/gstreamer/gst/fft/kiss_fftr_f64.h +//../gst-libs/gst/fft/kiss_fftr_s16.h /epoc32/include/platform/mw/gstreamer/gst/fft/kiss_fftr_s16.h +//../gst-libs/gst/fft/kiss_fftr_s32.h /epoc32/include/platform/mw/gstreamer/gst/fft/kiss_fftr_s32.h //internationalization macros -../gst-libs/gst/gst-i18n-plugin.h /sf/mw/gstreamer/include/gstreamer/gst/gst-i18n-plugin.h +//../gst-libs/gst/gst-i18n-plugin.h /epoc32/include/platform/mw/gstreamer/gst/gst-i18n-plugin.h //avcodec -../gst/ffmpegcolorspace/avcodec.h /sf/mw/gstreamer/include/gstreamer/gst/avcodec.h +//../gst/ffmpegcolorspace/avcodec.h /epoc32/include/platform/mw/gstreamer/gst/avcodec.h PRJ_MMPFILES diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/ffmpegcolorspace.mmp --- a/gst_plugins_base/group/ffmpegcolorspace.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/ffmpegcolorspace.mmp Fri May 14 18:43:44 2010 -0500 @@ -46,12 +46,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/ffmpegcolorspace SOURCE dsputil.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstadder.mmp --- a/gst_plugins_base/group/gstadder.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstadder.mmp Fri May 14 18:43:44 2010 -0500 @@ -44,12 +44,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/adder SOURCE gstadder.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstapp.mmp --- a/gst_plugins_base/group/gstapp.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstapp.mmp Fri May 14 18:43:44 2010 -0500 @@ -39,10 +39,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE - -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/app +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/app SOURCE gstapp.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstaudio.mmp --- a/gst_plugins_base/group/gstaudio.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstaudio.mmp Fri May 14 18:43:44 2010 -0500 @@ -44,14 +44,8 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE - OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../gst-libs/audio diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstaudioconvert.mmp --- a/gst_plugins_base/group/gstaudioconvert.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstaudioconvert.mmp Fri May 14 18:43:44 2010 -0500 @@ -42,15 +42,8 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE - OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net -USERINCLUDE ../../include/gstreamer/gst/audioconvert +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/audioconvert SOURCE audioconvert.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstaudiorate.mmp --- a/gst_plugins_base/group/gstaudiorate.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstaudiorate.mmp Fri May 14 18:43:44 2010 -0500 @@ -44,12 +44,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/audiorate SOURCE gstaudiorate.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstaudioresample.mmp --- a/gst_plugins_base/group/gstaudioresample.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstaudioresample.mmp Fri May 14 18:43:44 2010 -0500 @@ -44,12 +44,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/audioresample diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstaudiotestsrc.mmp --- a/gst_plugins_base/group/gstaudiotestsrc.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstaudiotestsrc.mmp Fri May 14 18:43:44 2010 -0500 @@ -44,12 +44,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/audiotestsrc SOURCE gstaudiotestsrc.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstcdda.mmp --- a/gst_plugins_base/group/gstcdda.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstcdda.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst-libs/gst/cdda SOURCE gstcddabasesrc.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstdecodebin.mmp --- a/gst_plugins_base/group/gstdecodebin.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstdecodebin.mmp Fri May 14 18:43:44 2010 -0500 @@ -46,12 +46,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/playback SOURCE gstdecodebin.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstdecodebin2.mmp --- a/gst_plugins_base/group/gstdecodebin2.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstdecodebin2.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/playback SOURCE gstdecodebin2.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstfft.mmp --- a/gst_plugins_base/group/gstfft.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstfft.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst-libs/gst/fft SOURCE gstfft.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstgdp.mmp --- a/gst_plugins_base/group/gstgdp.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstgdp.mmp Fri May 14 18:43:44 2010 -0500 @@ -43,12 +43,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/gdp SOURCE gstgdp.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstinterfaces.mmp --- a/gst_plugins_base/group/gstinterfaces.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstinterfaces.mmp Fri May 14 18:43:44 2010 -0500 @@ -46,12 +46,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst-libs/gst/interfaces SOURCE colorbalance.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstnetbuffer.mmp --- a/gst_plugins_base/group/gstnetbuffer.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstnetbuffer.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst-libs/gst/netbuffer SOURCE gstnetbuffer.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstpbutils.mmp --- a/gst_plugins_base/group/gstpbutils.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstpbutils.mmp Fri May 14 18:43:44 2010 -0500 @@ -37,23 +37,17 @@ EpocAllowDllData #endif +MW_LAYER_SYSTEMINCLUDE +OS_LAYER_LIBC_SYSTEMINCLUDE +OS_LAYER_GLIB_SYSTEMINCLUDE +MW_LAYER_GSTREAMER_SYSTEMINCLUDE + USERINCLUDE ../gst USERINCLUDE ../gst-libs/gst/pbutils USERINCLUDE ../gst-libs USERINCLUDE ../gst-libs/gst USERINCLUDE .. -MW_LAYER_SYSTEMINCLUDE -OS_LAYER_LIBC_SYSTEMINCLUDE - -OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net - SOURCEPATH ../gst-libs/gst/pbutils SOURCE descriptions.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstplayback.mmp --- a/gst_plugins_base/group/gstplayback.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstplayback.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/playback SOURCE gstplay-marshal.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstplaybin.mmp --- a/gst_plugins_base/group/gstplaybin.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstplaybin.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/playback SOURCE gstplayback.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstqueue2.mmp --- a/gst_plugins_base/group/gstqueue2.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstqueue2.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/playback SOURCE gstqueue2.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstriff.mmp --- a/gst_plugins_base/group/gstriff.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstriff.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst-libs/gst/riff SOURCE riff.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstrtp.mmp --- a/gst_plugins_base/group/gstrtp.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstrtp.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst-libs/gst/rtp SOURCE gstbasertpdepayload.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstsubparse.mmp --- a/gst_plugins_base/group/gstsubparse.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstsubparse.mmp Fri May 14 18:43:44 2010 -0500 @@ -43,12 +43,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/subparse SOURCE gstssaparse.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gsttag.mmp --- a/gst_plugins_base/group/gsttag.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gsttag.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst-libs/gst/tag SOURCE gstid3tag.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gsttcp.mmp --- a/gst_plugins_base/group/gsttcp.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gsttcp.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/tcp SOURCE gstmultifdsink.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gsttypefind.mmp --- a/gst_plugins_base/group/gsttypefind.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gsttypefind.mmp Fri May 14 18:43:44 2010 -0500 @@ -43,12 +43,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/typefind SOURCE gsttypefindfunctions.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstvideo.mmp --- a/gst_plugins_base/group/gstvideo.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstvideo.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst-libs/gst/video SOURCE gstvideofilter.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstvideorate.mmp --- a/gst_plugins_base/group/gstvideorate.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstvideorate.mmp Fri May 14 18:43:44 2010 -0500 @@ -43,12 +43,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/videorate SOURCE gstvideorate.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstvideoscale.mmp --- a/gst_plugins_base/group/gstvideoscale.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstvideoscale.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_GLIB_SYSTEMINCLUDE OS_LAYER_LIBOIL_SYSTEMINCLUDE SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/videoscale SOURCE gstvideoscale.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstvideotestsrc.mmp --- a/gst_plugins_base/group/gstvideotestsrc.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstvideotestsrc.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,12 +45,7 @@ OS_LAYER_GLIB_SYSTEMINCLUDE OS_LAYER_LIBOIL_SYSTEMINCLUDE SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/videotestsrc SOURCE gstvideotestsrc.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/group/gstvolume.mmp --- a/gst_plugins_base/group/gstvolume.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/group/gstvolume.mmp Fri May 14 18:43:44 2010 -0500 @@ -44,12 +44,7 @@ OS_LAYER_GLIB_SYSTEMINCLUDE OS_LAYER_LIBOIL_SYSTEMINCLUDE SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/volume SOURCE gstvolume.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/gst-libs/gst/pbutils/install-plugins.c --- a/gst_plugins_base/gst-libs/gst/pbutils/install-plugins.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/gst-libs/gst/pbutils/install-plugins.c Fri May 14 18:43:44 2010 -0500 @@ -355,7 +355,7 @@ #endif #ifdef __SYMBIAN32__ -#include +#include #endif #include "install-plugins.h" diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/gst-libs/gst/riff/riff-media.h --- a/gst_plugins_base/gst-libs/gst/riff/riff-media.h Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/gst-libs/gst/riff/riff-media.h Fri May 14 18:43:44 2010 -0500 @@ -24,7 +24,7 @@ #include #include -#include "riff-ids.h" +#include "gst/riff/riff-ids.h" G_BEGIN_DECLS diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/gst-libs/gst/riff/riff-read.h --- a/gst_plugins_base/gst-libs/gst/riff/riff-read.h Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/gst-libs/gst/riff/riff-read.h Fri May 14 18:43:44 2010 -0500 @@ -25,7 +25,7 @@ #include #include -#include "riff-ids.h" +#include "gst/riff/riff-ids.h" G_BEGIN_DECLS diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/adder/group/adder.mmp --- a/gst_plugins_base/tsrc/check/elements/adder/group/adder.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/adder/group/adder.mmp Fri May 14 18:43:44 2010 -0500 @@ -38,13 +38,7 @@ OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net - +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/audioconvert/group/audioconvert.mmp --- a/gst_plugins_base/tsrc/check/elements/audioconvert/group/audioconvert.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/audioconvert/group/audioconvert.mmp Fri May 14 18:43:44 2010 -0500 @@ -35,12 +35,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/audiorate/group/audiorate.mmp --- a/gst_plugins_base/tsrc/check/elements/audiorate/group/audiorate.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/audiorate/group/audiorate.mmp Fri May 14 18:43:44 2010 -0500 @@ -39,12 +39,7 @@ OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/audioresample/group/audioresample.mmp --- a/gst_plugins_base/tsrc/check/elements/audioresample/group/audioresample.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/audioresample/group/audioresample.mmp Fri May 14 18:43:44 2010 -0500 @@ -39,13 +39,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net - +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/audiotestsrc/group/audiotestsrc.mmp --- a/gst_plugins_base/tsrc/check/elements/audiotestsrc/group/audiotestsrc.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/audiotestsrc/group/audiotestsrc.mmp Fri May 14 18:43:44 2010 -0500 @@ -37,12 +37,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/createelementbase/group/createelementbase.mmp --- a/gst_plugins_base/tsrc/check/elements/createelementbase/group/createelementbase.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/createelementbase/group/createelementbase.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/createelementbasevideo/group/createelementbasevideo.mmp --- a/gst_plugins_base/tsrc/check/elements/createelementbasevideo/group/createelementbasevideo.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/createelementbasevideo/group/createelementbasevideo.mmp Fri May 14 18:43:44 2010 -0500 @@ -37,12 +37,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/decodebin/ffmpegcolorspace/group/ffmpegcolorspace.mmp --- a/gst_plugins_base/tsrc/check/elements/decodebin/ffmpegcolorspace/group/ffmpegcolorspace.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/decodebin/ffmpegcolorspace/group/ffmpegcolorspace.mmp Fri May 14 18:43:44 2010 -0500 @@ -40,12 +40,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/decodebin/group/decodebin.mmp --- a/gst_plugins_base/tsrc/check/elements/decodebin/group/decodebin.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/decodebin/group/decodebin.mmp Fri May 14 18:43:44 2010 -0500 @@ -38,12 +38,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/ffmpegcolorspace/group/ffmpegcolorspace.mmp --- a/gst_plugins_base/tsrc/check/elements/ffmpegcolorspace/group/ffmpegcolorspace.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/ffmpegcolorspace/group/ffmpegcolorspace.mmp Fri May 14 18:43:44 2010 -0500 @@ -39,12 +39,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/gdpdepay/group/gdpdepay.mmp --- a/gst_plugins_base/tsrc/check/elements/gdpdepay/group/gdpdepay.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/gdpdepay/group/gdpdepay.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/multifdsink/group/multifdsink.mmp --- a/gst_plugins_base/tsrc/check/elements/multifdsink/group/multifdsink.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/multifdsink/group/multifdsink.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/playbin/group/playbin.mmp --- a/gst_plugins_base/tsrc/check/elements/playbin/group/playbin.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/playbin/group/playbin.mmp Fri May 14 18:43:44 2010 -0500 @@ -33,12 +33,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/playbin/src/playbin.c --- a/gst_plugins_base/tsrc/check/elements/playbin/src/playbin.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/playbin/src/playbin.c Fri May 14 18:43:44 2010 -0500 @@ -879,6 +879,7 @@ typedef GstPushSrc GstCodecSrc; typedef GstPushSrcClass GstCodecSrcClass; + GST_BOILERPLATE_FULL (GstCodecSrc, gst_codec_src, GstPushSrc, GST_TYPE_PUSH_SRC, gst_codec_src_init_type); diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/subparse/group/subparse.mmp --- a/gst_plugins_base/tsrc/check/elements/subparse/group/subparse.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/subparse/group/subparse.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/videorate/group/videorate.mmp --- a/gst_plugins_base/tsrc/check/elements/videorate/group/videorate.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/videorate/group/videorate.mmp Fri May 14 18:43:44 2010 -0500 @@ -41,12 +41,7 @@ OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/elements/volume/group/volume.mmp --- a/gst_plugins_base/tsrc/check/elements/volume/group/volume.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/elements/volume/group/volume.mmp Fri May 14 18:43:44 2010 -0500 @@ -29,12 +29,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/generic/clock-selection/group/clock-selection.mmp --- a/gst_plugins_base/tsrc/check/generic/clock-selection/group/clock-selection.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/generic/clock-selection/group/clock-selection.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,13 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net - +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SYSTEMINCLUDE ../../../../../../gstreamer_core/libs diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/generic/states/group/states.mmp --- a/gst_plugins_base/tsrc/check/generic/states/group/states.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/generic/states/group/states.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,9 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE + + USERINCLUDE ../../../../.. SYSTEMINCLUDE ../../../../../gst SYSTEMINCLUDE ../../../../../../gstreamer_core/libs diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/gst/typefindfunctions/group/typefindfunctions.mmp --- a/gst_plugins_base/tsrc/check/gst/typefindfunctions/group/typefindfunctions.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/gst/typefindfunctions/group/typefindfunctions.mmp Fri May 14 18:43:44 2010 -0500 @@ -21,12 +21,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/libs/fft/group/fft.mmp --- a/gst_plugins_base/tsrc/check/libs/fft/group/fft.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/libs/fft/group/fft.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/libs/netbuffer/group/netbuffer.mmp --- a/gst_plugins_base/tsrc/check/libs/netbuffer/group/netbuffer.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/libs/netbuffer/group/netbuffer.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/libs/pbutils/group/pbutils.mmp --- a/gst_plugins_base/tsrc/check/libs/pbutils/group/pbutils.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/libs/pbutils/group/pbutils.mmp Fri May 14 18:43:44 2010 -0500 @@ -37,12 +37,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/libs/rtp/group/rtp.mmp --- a/gst_plugins_base/tsrc/check/libs/rtp/group/rtp.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/libs/rtp/group/rtp.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/libs/tag/group/tag.mmp --- a/gst_plugins_base/tsrc/check/libs/tag/group/tag.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/libs/tag/group/tag.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/libs/taudio/group/taudio.mmp --- a/gst_plugins_base/tsrc/check/libs/taudio/group/taudio.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/libs/taudio/group/taudio.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/libs/video/group/video.mmp --- a/gst_plugins_base/tsrc/check/libs/video/group/video.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/libs/video/group/video.mmp Fri May 14 18:43:44 2010 -0500 @@ -21,12 +21,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/pipelines/simple-launch-lines/group/simple-launch-lines.mmp --- a/gst_plugins_base/tsrc/check/pipelines/simple-launch-lines/group/simple-launch-lines.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/pipelines/simple-launch-lines/group/simple-launch-lines.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/check/pipelines/streamheader/group/streamheader.mmp --- a/gst_plugins_base/tsrc/check/pipelines/streamheader/group/streamheader.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/check/pipelines/streamheader/group/streamheader.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/examples/dynamic/addstream/group/addstream.mmp --- a/gst_plugins_base/tsrc/examples/dynamic/addstream/group/addstream.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/examples/dynamic/addstream/group/addstream.mmp Fri May 14 18:43:44 2010 -0500 @@ -37,13 +37,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net - +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_base/tsrc/icles/stress_playbin/group/stress_playbin.mmp --- a/gst_plugins_base/tsrc/icles/stress_playbin/group/stress_playbin.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_base/tsrc/icles/stress_playbin/group/stress_playbin.mmp Fri May 14 18:43:44 2010 -0500 @@ -38,12 +38,7 @@ OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../include/gstreamer -USERINCLUDE ../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../gstreamer_core/libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/bwins/libgstmpegaudioparseu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gst_plugins_good/bwins/libgstmpegaudioparseu.def Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,5 @@ +EXPORTS + _GST_PLUGIN_DESC @ 1 NONAME + gst_mp3parse_get_type @ 2 NONAME + gst_xing_mux_get_type @ 3 NONAME + diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/eabi/libgstmpegaudioparseu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gst_plugins_good/eabi/libgstmpegaudioparseu.def Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,5 @@ +EXPORTS + _GST_PLUGIN_DESC @ 1 NONAME + gst_mp3parse_get_type @ 2 NONAME + gst_xing_mux_get_type @ 3 NONAME + diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/bld.inf --- a/gst_plugins_good/group/bld.inf Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/bld.inf Fri May 14 18:43:44 2010 -0500 @@ -2,8 +2,8 @@ default PRJ_EXPORTS -../gst-libs/gst/interfaces/photography.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/photography.h -../gst-libs/gst/interfaces/photography-enumtypes.h /sf/mw/gstreamer/include/gstreamer/gst/interfaces/photography-enumtypes.h +../gst-libs/gst/interfaces/photography.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/photography.h +../gst-libs/gst/interfaces/photography-enumtypes.h /epoc32/include/platform/mw/gstreamer/gst/interfaces/photography-enumtypes.h PRJ_MMPFILES gstwavparse.mmp @@ -13,4 +13,5 @@ gstqtmux.mmp gstphotography.mmp gstcamerabin.mmp - +gstqtdemux.mmp +gstmpegaudioparse.mmp diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstalaw.mmp --- a/gst_plugins_good/group/gstalaw.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstalaw.mmp Fri May 14 18:43:44 2010 -0500 @@ -51,21 +51,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net -USERINCLUDE ../../include/gstreamer/gst/audio -USERINCLUDE ../../include/gstreamer/gst/cdda -USERINCLUDE ../../include/gstreamer/gst/floatcast -USERINCLUDE ../../include/gstreamer/gst/interfaces -USERINCLUDE ../../include/gstreamer/gst/netbuffer -USERINCLUDE ../../include/gstreamer/gst/riff -USERINCLUDE ../../include/gstreamer/gst/rtp -USERINCLUDE ../../include/gstreamer/gst/tag -USERINCLUDE ../../include/gstreamer/gst/video +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/law SOURCE alaw.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstalpha.mmp --- a/gst_plugins_good/group/gstalpha.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstalpha.mmp Fri May 14 18:43:44 2010 -0500 @@ -57,11 +57,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/riff +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/alpha SOURCE gstalpha.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstalphacolor.mmp --- a/gst_plugins_good/group/gstalphacolor.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstalphacolor.mmp Fri May 14 18:43:44 2010 -0500 @@ -56,11 +56,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/riff +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/alpha SOURCE gstalphacolor.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstaudiofx.mmp --- a/gst_plugins_good/group/gstaudiofx.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstaudiofx.mmp Fri May 14 18:43:44 2010 -0500 @@ -51,21 +51,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net -USERINCLUDE ../../include/gstreamer/gst/audio -USERINCLUDE ../../include/gstreamer/gst/cdda -USERINCLUDE ../../include/gstreamer/gst/floatcast -USERINCLUDE ../../include/gstreamer/gst/interfaces -USERINCLUDE ../../include/gstreamer/gst/netbuffer -USERINCLUDE ../../include/gstreamer/gst/riff -USERINCLUDE ../../include/gstreamer/gst/rtp -USERINCLUDE ../../include/gstreamer/gst/tag -USERINCLUDE ../../include/gstreamer/gst/video +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/audiofx SOURCE audioamplify.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstauparse.mmp --- a/gst_plugins_good/group/gstauparse.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstauparse.mmp Fri May 14 18:43:44 2010 -0500 @@ -51,9 +51,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/auparse diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstautodetect.mmp --- a/gst_plugins_good/group/gstautodetect.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstautodetect.mmp Fri May 14 18:43:44 2010 -0500 @@ -44,9 +44,12 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -SYSTEMINCLUDE ../../include/gstreamer +MW_LAYER_GSTREAMER_SYSTEMINCLUDE + USERINCLUDE ../ + + SOURCEPATH ../gst/autodetect SOURCE gstautodetect.c SOURCE gstautoaudiosrc.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstavi.mmp --- a/gst_plugins_good/group/gstavi.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstavi.mmp Fri May 14 18:43:44 2010 -0500 @@ -50,10 +50,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/riff +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/avi SOURCE gstavi.c gstavimux.c gstavidemux.c gstavisubtitle.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstcamerabin.mmp --- a/gst_plugins_good/group/gstcamerabin.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstcamerabin.mmp Fri May 14 18:43:44 2010 -0500 @@ -47,24 +47,9 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -//USERINCLUDE ../../include/gstreamer/gst/controller -//USERINCLUDE ../../include/gstreamer/gst/dataprotocol -//USERINCLUDE ../../include/gstreamer/gst/net -//USERINCLUDE ../../include/gstreamer/gst/audio -//USERINCLUDE ../../include/gstreamer/gst/cdda -//USERINCLUDE ../../include/gstreamer/gst/floatcast -USERINCLUDE ../../include/gstreamer/gst/interfaces -//USERINCLUDE ../../include/gstreamer/gst/netbuffer -//USERINCLUDE ../../include/gstreamer/gst/riff -//USERINCLUDE ../../include/gstreamer/gst/rtp -//USERINCLUDE ../../include/gstreamer/gst/tag -//USERINCLUDE ../../include/gstreamer/gst/video +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SYSTEMINCLUDE .. -SYSTEMINCLUDE /sf/mw/gstreamer/include/gstreamer SOURCEPATH ../gst/camerabin diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstjpeg.mmp --- a/gst_plugins_good/group/gstjpeg.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstjpeg.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,21 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net -USERINCLUDE ../../include/gstreamer/gst/audio -USERINCLUDE ../../include/gstreamer/gst/cdda -USERINCLUDE ../../include/gstreamer/gst/floatcast -USERINCLUDE ../../include/gstreamer/gst/interfaces -USERINCLUDE ../../include/gstreamer/gst/netbuffer -USERINCLUDE ../../include/gstreamer/gst/riff -USERINCLUDE ../../include/gstreamer/gst/rtp -USERINCLUDE ../../include/gstreamer/gst/tag -USERINCLUDE ../../include/gstreamer/gst/video +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/jpeg-6b diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstmpegaudioparse.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gst_plugins_good/group/gstmpegaudioparse.mmp Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,61 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser 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 +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser 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. +* +* Description: +* +*/ + +#include + +TARGET libgstmpegaudioparse.dll +TARGETTYPE DLL +UID 0x1000008d 0x10207C45 +CAPABILITY All -TCB +VENDORID VID_DEFAULT +LANG SC + +#if !defined(__WINSCW__) && !defined(__WINS__) +EpocAllowDllData +#endif + + +MACRO HAVE_CONFIG_H + + +USERINCLUDE ../gst/mpegaudioparse + + +MW_LAYER_SYSTEMINCLUDE +OS_LAYER_LIBC_SYSTEMINCLUDE +OS_LAYER_GLIB_SYSTEMINCLUDE +MW_LAYER_GSTREAMER_SYSTEMINCLUDE + +SOURCEPATH ../gst/mpegaudioparse +SOURCE gstmpegaudioparse.c +SOURCE gstxingmux.c +SOURCE plugin.c + +LIBRARY euser.lib +LIBRARY libc.lib +LIBRARY libpthread.lib +LIBRARY libglib.lib +LIBRARY libgobject.lib +LIBRARY libgstreamer.lib +LIBRARY libgstbase.lib +LIBRARY libgthread.lib + diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstmulaw.mmp --- a/gst_plugins_good/group/gstmulaw.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstmulaw.mmp Fri May 14 18:43:44 2010 -0500 @@ -49,21 +49,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net -USERINCLUDE ../../include/gstreamer/gst/audio -USERINCLUDE ../../include/gstreamer/gst/cdda -USERINCLUDE ../../include/gstreamer/gst/floatcast -USERINCLUDE ../../include/gstreamer/gst/interfaces -USERINCLUDE ../../include/gstreamer/gst/netbuffer -USERINCLUDE ../../include/gstreamer/gst/riff -USERINCLUDE ../../include/gstreamer/gst/rtp -USERINCLUDE ../../include/gstreamer/gst/tag -USERINCLUDE ../../include/gstreamer/gst/video +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/law SOURCE mulaw.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstphotography.mmp --- a/gst_plugins_good/group/gstphotography.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstphotography.mmp Fri May 14 18:43:44 2010 -0500 @@ -45,11 +45,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/audio - -SYSTEMINCLUDE /sf/mw/gstreamer/include/gstreamer +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst-libs/gst/interfaces SOURCE photography.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstpng.mmp --- a/gst_plugins_good/group/gstpng.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstpng.mmp Fri May 14 18:43:44 2010 -0500 @@ -58,11 +58,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/riff +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE /epoc32/include/libpng SOURCEPATH ../ext/libpng diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstqtdemux.mmp --- a/gst_plugins_good/group/gstqtdemux.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstqtdemux.mmp Fri May 14 18:43:44 2010 -0500 @@ -51,21 +51,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net -USERINCLUDE ../../include/gstreamer/gst/audio -USERINCLUDE ../../include/gstreamer/gst/cdda -USERINCLUDE ../../include/gstreamer/gst/floatcast -USERINCLUDE ../../include/gstreamer/gst/interfaces -USERINCLUDE ../../include/gstreamer/gst/netbuffer -USERINCLUDE ../../include/gstreamer/gst/riff -USERINCLUDE ../../include/gstreamer/gst/rtp -USERINCLUDE ../../include/gstreamer/gst/tag -USERINCLUDE ../../include/gstreamer/gst/video +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/qtdemux SOURCE quicktime.c gstrtpxqtdepay.c qtdemux.c qtdemux_types.c qtdemux_dump.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstqtmux.mmp --- a/gst_plugins_good/group/gstqtmux.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstqtmux.mmp Fri May 14 18:43:44 2010 -0500 @@ -49,21 +49,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net -USERINCLUDE ../../include/gstreamer/gst/audio -USERINCLUDE ../../include/gstreamer/gst/cdda -USERINCLUDE ../../include/gstreamer/gst/floatcast -USERINCLUDE ../../include/gstreamer/gst/interfaces -USERINCLUDE ../../include/gstreamer/gst/netbuffer -USERINCLUDE ../../include/gstreamer/gst/riff -USERINCLUDE ../../include/gstreamer/gst/rtp -USERINCLUDE ../../include/gstreamer/gst/tag -USERINCLUDE ../../include/gstreamer/gst/video +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/qtmux SOURCE atoms.c descriptors.c gstqtmux.c gstqtmuxmap.c properties.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstwavenc.mmp --- a/gst_plugins_good/group/gstwavenc.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstwavenc.mmp Fri May 14 18:43:44 2010 -0500 @@ -49,21 +49,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net -USERINCLUDE ../../include/gstreamer/gst/audio -USERINCLUDE ../../include/gstreamer/gst/cdda -USERINCLUDE ../../include/gstreamer/gst/floatcast -USERINCLUDE ../../include/gstreamer/gst/interfaces -USERINCLUDE ../../include/gstreamer/gst/netbuffer -USERINCLUDE ../../include/gstreamer/gst/riff -USERINCLUDE ../../include/gstreamer/gst/rtp -USERINCLUDE ../../include/gstreamer/gst/tag -USERINCLUDE ../../include/gstreamer/gst/video +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/wavenc SOURCE gstwavenc.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/group/gstwavparse.mmp --- a/gst_plugins_good/group/gstwavparse.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/group/gstwavparse.mmp Fri May 14 18:43:44 2010 -0500 @@ -49,21 +49,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net -USERINCLUDE ../../include/gstreamer/gst/audio -USERINCLUDE ../../include/gstreamer/gst/cdda -USERINCLUDE ../../include/gstreamer/gst/floatcast -USERINCLUDE ../../include/gstreamer/gst/interfaces -USERINCLUDE ../../include/gstreamer/gst/netbuffer -USERINCLUDE ../../include/gstreamer/gst/riff -USERINCLUDE ../../include/gstreamer/gst/rtp -USERINCLUDE ../../include/gstreamer/gst/tag -USERINCLUDE ../../include/gstreamer/gst/video +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/wavparse SOURCE gstwavparse.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/gst-libs/gst/interfaces/photography.h --- a/gst_plugins_good/gst-libs/gst/interfaces/photography.h Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/gst-libs/gst/interfaces/photography.h Fri May 14 18:43:44 2010 -0500 @@ -25,7 +25,7 @@ #define __GST_PHOTOGRAPHY_H__ #include -#include "photography-enumtypes.h" +#include G_BEGIN_DECLS diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/gst/mpegaudioparse/gstmpegaudioparse.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gst_plugins_good/gst/mpegaudioparse/gstmpegaudioparse.c Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,2199 @@ +/* GStreamer + * Copyright (C) <1999> Erik Walthinsen + * Copyright (C) <2006-2007> Jan Schmidt + * + * 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. + */ + +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + +#include + +#include "gstmpegaudioparse.h" + +GST_DEBUG_CATEGORY_STATIC (mp3parse_debug); +#define GST_CAT_DEFAULT mp3parse_debug + +#define MP3_CHANNEL_MODE_UNKNOWN -1 +#define MP3_CHANNEL_MODE_STEREO 0 +#define MP3_CHANNEL_MODE_JOINT_STEREO 1 +#define MP3_CHANNEL_MODE_DUAL_CHANNEL 2 +#define MP3_CHANNEL_MODE_MONO 3 + +#define CRC_UNKNOWN -1 +#define CRC_PROTECTED 0 +#define CRC_NOT_PROTECTED 1 + +#define XING_FRAMES_FLAG 0x0001 +#define XING_BYTES_FLAG 0x0002 +#define XING_TOC_FLAG 0x0004 +#define XING_VBR_SCALE_FLAG 0x0008 + +#ifndef GST_READ_UINT24_BE +#define GST_READ_UINT24_BE(p) (p[2] | (p[1] << 8) | (p[0] << 16)) +#endif + +/* Minimum number of consecutive, valid-looking frames to consider + for resyncing */ +#define MIN_RESYNC_FRAMES 3 + +static inline MPEGAudioSeekEntry * +mpeg_audio_seek_entry_new () +{ + return g_slice_new (MPEGAudioSeekEntry); +} + +static inline void +mpeg_audio_seek_entry_free (MPEGAudioSeekEntry * entry) +{ + g_slice_free (MPEGAudioSeekEntry, entry); +} + +/* elementfactory information */ +static GstElementDetails mp3parse_details = { + "MPEG1 Audio Parser", + "Codec/Parser/Audio", + "Parses and frames mpeg1 audio streams (levels 1-3), provides seek", + "Jan Schmidt \n" + "Erik Walthinsen " +}; + +static GstStaticPadTemplate mp3_src_template = GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("audio/mpeg, " + "mpegversion = (int) 1, " + "layer = (int) [ 1, 3 ], " + "rate = (int) [ 8000, 48000 ], channels = (int) [ 1, 2 ]," + "parsed=(boolean) true") + ); + +static GstStaticPadTemplate mp3_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("audio/mpeg, mpegversion = (int) 1, parsed=(boolean)false") + ); + +/* GstMPEGAudioParse signals and args */ +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +enum +{ + ARG_0, + ARG_SKIP, + ARG_BIT_RATE + /* FILL ME */ +}; + + +static void gst_mp3parse_class_init (GstMPEGAudioParseClass * klass); +static void gst_mp3parse_base_init (gpointer klass); +static void gst_mp3parse_init (GstMPEGAudioParse * mp3parse, + GstMPEGAudioParseClass * klass); + +static gboolean gst_mp3parse_sink_event (GstPad * pad, GstEvent * event); +static GstFlowReturn gst_mp3parse_chain (GstPad * pad, GstBuffer * buffer); +static gboolean mp3parse_src_query (GstPad * pad, GstQuery * query); +static const GstQueryType *mp3parse_get_query_types (GstPad * pad); +static gboolean mp3parse_src_event (GstPad * pad, GstEvent * event); + +static int head_check (GstMPEGAudioParse * mp3parse, unsigned long head); + +static void gst_mp3parse_dispose (GObject * object); +static void gst_mp3parse_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec); +static void gst_mp3parse_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec); +static GstStateChangeReturn gst_mp3parse_change_state (GstElement * element, + GstStateChange transition); +static GstFlowReturn +gst_mp3parse_handle_data (GstMPEGAudioParse * mp3parse, gboolean at_eos); + +static gboolean mp3parse_bytepos_to_time (GstMPEGAudioParse * mp3parse, + gint64 bytepos, GstClockTime * ts, gboolean from_total_time); +static gboolean +mp3parse_total_bytes (GstMPEGAudioParse * mp3parse, gint64 * total); +static gboolean +mp3parse_total_time (GstMPEGAudioParse * mp3parse, GstClockTime * total); + +GST_BOILERPLATE (GstMPEGAudioParse, gst_mp3parse, GstElement, GST_TYPE_ELEMENT); + +#define GST_TYPE_MP3_CHANNEL_MODE (gst_mp3_channel_mode_get_type()) + +static const GEnumValue mp3_channel_mode[] = { + {MP3_CHANNEL_MODE_UNKNOWN, "Unknown", "unknown"}, + {MP3_CHANNEL_MODE_MONO, "Mono", "mono"}, + {MP3_CHANNEL_MODE_DUAL_CHANNEL, "Dual Channel", "dual-channel"}, + {MP3_CHANNEL_MODE_JOINT_STEREO, "Joint Stereo", "joint-stereo"}, + {MP3_CHANNEL_MODE_STEREO, "Stereo", "stereo"}, + {0, NULL, NULL}, +}; + +static GType +gst_mp3_channel_mode_get_type (void) +{ + static GType mp3_channel_mode_type = 0; + + if (!mp3_channel_mode_type) { + mp3_channel_mode_type = + g_enum_register_static ("GstMp3ChannelMode", mp3_channel_mode); + } + return mp3_channel_mode_type; +} + +static const gchar * +gst_mp3_channel_mode_get_nick (gint mode) +{ + guint i; + for (i = 0; i < G_N_ELEMENTS (mp3_channel_mode); i++) { + if (mp3_channel_mode[i].value == mode) + return mp3_channel_mode[i].value_nick; + } + return NULL; +} + +static const guint mp3types_bitrates[2][3][16] = { + { + {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448,}, + {0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384,}, + {0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320,} + }, + { + {0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256,}, + {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160,}, + {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160,} + }, +}; + +static const guint mp3types_freqs[3][3] = { {44100, 48000, 32000}, +{22050, 24000, 16000}, +{11025, 12000, 8000} +}; + +static inline guint +mp3_type_frame_length_from_header (GstMPEGAudioParse * mp3parse, guint32 header, + guint * put_version, guint * put_layer, guint * put_channels, + guint * put_bitrate, guint * put_samplerate, guint * put_mode, + guint * put_crc) +{ + guint length; + gulong mode, samplerate, bitrate, layer, channels, padding, crc; + gulong version; + gint lsf, mpg25; + + if (header & (1 << 20)) { + lsf = (header & (1 << 19)) ? 0 : 1; + mpg25 = 0; + } else { + lsf = 1; + mpg25 = 1; + } + + version = 1 + lsf + mpg25; + + layer = 4 - ((header >> 17) & 0x3); + + crc = (header >> 16) & 0x1; + + bitrate = (header >> 12) & 0xF; + bitrate = mp3types_bitrates[lsf][layer - 1][bitrate] * 1000; + /* The caller has ensured we have a valid header, so bitrate can't be + zero here. */ + g_assert (bitrate != 0); + + samplerate = (header >> 10) & 0x3; + samplerate = mp3types_freqs[lsf + mpg25][samplerate]; + + padding = (header >> 9) & 0x1; + + mode = (header >> 6) & 0x3; + channels = (mode == 3) ? 1 : 2; + + switch (layer) { + case 1: + length = 4 * ((bitrate * 12) / samplerate + padding); + break; + case 2: + length = (bitrate * 144) / samplerate + padding; + break; + default: + case 3: + length = (bitrate * 144) / (samplerate << lsf) + padding; + break; + } + + GST_DEBUG_OBJECT (mp3parse, "Calculated mp3 frame length of %u bytes", + length); + GST_DEBUG_OBJECT (mp3parse, "samplerate = %lu, bitrate = %lu, version = %lu, " + "layer = %lu, channels = %lu, mode = %s", samplerate, bitrate, version, + layer, channels, gst_mp3_channel_mode_get_nick (mode)); + + if (put_version) + *put_version = version; + if (put_layer) + *put_layer = layer; + if (put_channels) + *put_channels = channels; + if (put_bitrate) + *put_bitrate = bitrate; + if (put_samplerate) + *put_samplerate = samplerate; + if (put_mode) + *put_mode = mode; + if (put_crc) + *put_crc = crc; + + return length; +} + +static GstCaps * +mp3_caps_create (guint version, guint layer, guint channels, guint samplerate) +{ + GstCaps *new; + + g_assert (version); + g_assert (layer); + g_assert (samplerate); + g_assert (channels); + + new = gst_caps_new_simple ("audio/mpeg", + "mpegversion", G_TYPE_INT, 1, + "mpegaudioversion", G_TYPE_INT, version, + "layer", G_TYPE_INT, layer, + "rate", G_TYPE_INT, samplerate, + "channels", G_TYPE_INT, channels, "parsed", G_TYPE_BOOLEAN, TRUE, NULL); + + return new; +} + +static void +gst_mp3parse_base_init (gpointer klass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&mp3_sink_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&mp3_src_template)); + + GST_DEBUG_CATEGORY_INIT (mp3parse_debug, "mp3parse", 0, "MPEG Audio Parser"); + + gst_element_class_set_details (element_class, &mp3parse_details); +} + +static void +gst_mp3parse_class_init (GstMPEGAudioParseClass * klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + + gobject_class = (GObjectClass *) klass; + gstelement_class = (GstElementClass *) klass; + + parent_class = g_type_class_peek_parent (klass); + + gobject_class->set_property = gst_mp3parse_set_property; + gobject_class->get_property = gst_mp3parse_get_property; + gobject_class->dispose = gst_mp3parse_dispose; + + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SKIP, + g_param_spec_int ("skip", "skip", "skip", + G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BIT_RATE, + g_param_spec_int ("bitrate", "Bitrate", "Bit Rate", + G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); + + gstelement_class->change_state = gst_mp3parse_change_state; + +/* register tags */ +#define GST_TAG_CRC "has-crc" +#define GST_TAG_MODE "channel-mode" + + gst_tag_register (GST_TAG_CRC, GST_TAG_FLAG_META, G_TYPE_BOOLEAN, + "has crc", "Using CRC", NULL); + gst_tag_register (GST_TAG_MODE, GST_TAG_FLAG_ENCODED, G_TYPE_STRING, + "channel mode", "MPEG audio channel mode", NULL); + + g_type_class_ref (GST_TYPE_MP3_CHANNEL_MODE); +} + +static void +gst_mp3parse_reset (GstMPEGAudioParse * mp3parse) +{ + mp3parse->skip = 0; + mp3parse->resyncing = TRUE; + mp3parse->next_ts = GST_CLOCK_TIME_NONE; + mp3parse->cur_offset = -1; + + mp3parse->sync_offset = 0; + mp3parse->tracked_offset = 0; + mp3parse->pending_ts = GST_CLOCK_TIME_NONE; + mp3parse->pending_offset = -1; + + gst_adapter_clear (mp3parse->adapter); + + mp3parse->rate = mp3parse->channels = mp3parse->layer = -1; + mp3parse->version = 1; + mp3parse->max_bitreservoir = GST_CLOCK_TIME_NONE; + + mp3parse->avg_bitrate = 0; + mp3parse->bitrate_sum = 0; + mp3parse->last_posted_bitrate = 0; + mp3parse->frame_count = 0; + mp3parse->sent_codec_tag = FALSE; + + mp3parse->last_posted_crc = CRC_UNKNOWN; + mp3parse->last_posted_channel_mode = MP3_CHANNEL_MODE_UNKNOWN; + + mp3parse->xing_flags = 0; + mp3parse->xing_bitrate = 0; + mp3parse->xing_frames = 0; + mp3parse->xing_total_time = 0; + mp3parse->xing_bytes = 0; + mp3parse->xing_vbr_scale = 0; + memset (mp3parse->xing_seek_table, 0, 100); + memset (mp3parse->xing_seek_table_inverse, 0, 256); + + mp3parse->vbri_bitrate = 0; + mp3parse->vbri_frames = 0; + mp3parse->vbri_total_time = 0; + mp3parse->vbri_bytes = 0; + mp3parse->vbri_seek_points = 0; + g_free (mp3parse->vbri_seek_table); + mp3parse->vbri_seek_table = NULL; + + if (mp3parse->seek_table) { + g_list_foreach (mp3parse->seek_table, (GFunc) mpeg_audio_seek_entry_free, + NULL); + g_list_free (mp3parse->seek_table); + mp3parse->seek_table = NULL; + } + + g_mutex_lock (mp3parse->pending_seeks_lock); + if (mp3parse->pending_accurate_seeks) { + g_slist_foreach (mp3parse->pending_accurate_seeks, (GFunc) g_free, NULL); + g_slist_free (mp3parse->pending_accurate_seeks); + mp3parse->pending_accurate_seeks = NULL; + } + if (mp3parse->pending_nonaccurate_seeks) { + g_slist_foreach (mp3parse->pending_nonaccurate_seeks, (GFunc) g_free, NULL); + g_slist_free (mp3parse->pending_nonaccurate_seeks); + mp3parse->pending_nonaccurate_seeks = NULL; + } + g_mutex_unlock (mp3parse->pending_seeks_lock); + + if (mp3parse->pending_segment) { + GstEvent **eventp = &mp3parse->pending_segment; + + gst_event_replace (eventp, NULL); + } + + mp3parse->exact_position = FALSE; + gst_segment_init (&mp3parse->segment, GST_FORMAT_TIME); +} + +static void +gst_mp3parse_init (GstMPEGAudioParse * mp3parse, GstMPEGAudioParseClass * klass) +{ + mp3parse->sinkpad = + gst_pad_new_from_static_template (&mp3_sink_template, "sink"); + gst_pad_set_event_function (mp3parse->sinkpad, gst_mp3parse_sink_event); + gst_pad_set_chain_function (mp3parse->sinkpad, gst_mp3parse_chain); + gst_element_add_pad (GST_ELEMENT (mp3parse), mp3parse->sinkpad); + + mp3parse->srcpad = + gst_pad_new_from_static_template (&mp3_src_template, "src"); + gst_pad_use_fixed_caps (mp3parse->srcpad); + gst_pad_set_event_function (mp3parse->srcpad, mp3parse_src_event); + gst_pad_set_query_function (mp3parse->srcpad, mp3parse_src_query); + gst_pad_set_query_type_function (mp3parse->srcpad, mp3parse_get_query_types); + gst_element_add_pad (GST_ELEMENT (mp3parse), mp3parse->srcpad); + + mp3parse->adapter = gst_adapter_new (); + mp3parse->pending_seeks_lock = g_mutex_new (); + + gst_mp3parse_reset (mp3parse); +} + +static void +gst_mp3parse_dispose (GObject * object) +{ + GstMPEGAudioParse *mp3parse = GST_MP3PARSE (object); + + gst_mp3parse_reset (mp3parse); + + if (mp3parse->adapter) { + g_object_unref (mp3parse->adapter); + mp3parse->adapter = NULL; + } + g_mutex_free (mp3parse->pending_seeks_lock); + mp3parse->pending_seeks_lock = NULL; + + g_list_foreach (mp3parse->pending_events, (GFunc) gst_mini_object_unref, + NULL); + g_list_free (mp3parse->pending_events); + mp3parse->pending_events = NULL; + + G_OBJECT_CLASS (parent_class)->dispose (object); +} + +static gboolean +gst_mp3parse_sink_event (GstPad * pad, GstEvent * event) +{ + gboolean res = TRUE; + GstMPEGAudioParse *mp3parse; + GstEvent **eventp; + + mp3parse = GST_MP3PARSE (gst_pad_get_parent (pad)); + + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_NEWSEGMENT: + { + gdouble rate, applied_rate; + GstFormat format; + gint64 start, stop, pos; + gboolean update; + MPEGAudioPendingAccurateSeek *seek = NULL; + GSList *node; + + gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate, + &format, &start, &stop, &pos); + + g_mutex_lock (mp3parse->pending_seeks_lock); + if (format == GST_FORMAT_BYTES && mp3parse->pending_accurate_seeks) { + + for (node = mp3parse->pending_accurate_seeks; node; node = node->next) { + MPEGAudioPendingAccurateSeek *tmp = node->data; + + if (tmp->upstream_start == pos) { + seek = tmp; + break; + } + } + if (seek) { + GstSegment *s = &seek->segment; + + event = + gst_event_new_new_segment_full (FALSE, s->rate, s->applied_rate, + GST_FORMAT_TIME, s->start, s->stop, s->last_stop); + + mp3parse->segment = seek->segment; + + mp3parse->resyncing = FALSE; + mp3parse->cur_offset = pos; + mp3parse->next_ts = seek->timestamp_start; + mp3parse->pending_ts = GST_CLOCK_TIME_NONE; + mp3parse->tracked_offset = 0; + mp3parse->sync_offset = 0; + + gst_event_parse_new_segment_full (event, &update, &rate, + &applied_rate, &format, &start, &stop, &pos); + + GST_DEBUG_OBJECT (mp3parse, + "Pushing accurate newseg rate %g, applied rate %g, " + "format %d, start %" G_GINT64_FORMAT ", stop %" G_GINT64_FORMAT + ", pos %" G_GINT64_FORMAT, rate, applied_rate, format, start, + stop, pos); + + g_free (seek); + mp3parse->pending_accurate_seeks = + g_slist_delete_link (mp3parse->pending_accurate_seeks, node); + + g_mutex_unlock (mp3parse->pending_seeks_lock); + res = gst_pad_push_event (mp3parse->srcpad, event); + + return res; + } else { + GST_WARNING_OBJECT (mp3parse, + "Accurate seek not possible, didn't get an appropiate upstream segment"); + } + } + g_mutex_unlock (mp3parse->pending_seeks_lock); + + mp3parse->exact_position = FALSE; + + if (format == GST_FORMAT_BYTES) { + GstClockTime seg_start, seg_stop, seg_pos; + + /* stop time is allowed to be open-ended, but not start & pos */ + if (!mp3parse_bytepos_to_time (mp3parse, stop, &seg_stop, FALSE)) + seg_stop = GST_CLOCK_TIME_NONE; + if (mp3parse_bytepos_to_time (mp3parse, start, &seg_start, FALSE) && + mp3parse_bytepos_to_time (mp3parse, pos, &seg_pos, FALSE)) { + gst_event_unref (event); + + /* search the pending nonaccurate seeks */ + g_mutex_lock (mp3parse->pending_seeks_lock); + seek = NULL; + for (node = mp3parse->pending_nonaccurate_seeks; node; + node = node->next) { + MPEGAudioPendingAccurateSeek *tmp = node->data; + + if (tmp->upstream_start == pos) { + seek = tmp; + break; + } + } + + if (seek) { + if (seek->segment.stop == -1) { + /* corrent the segment end, because non-accurate seeks might make + * our streaming end earlier (see bug #603695) */ + seg_stop = -1; + } + g_free (seek); + mp3parse->pending_nonaccurate_seeks = + g_slist_delete_link (mp3parse->pending_nonaccurate_seeks, node); + } + g_mutex_unlock (mp3parse->pending_seeks_lock); + + event = gst_event_new_new_segment_full (update, rate, applied_rate, + GST_FORMAT_TIME, seg_start, seg_stop, seg_pos); + format = GST_FORMAT_TIME; + GST_DEBUG_OBJECT (mp3parse, "Converted incoming segment to TIME. " + "start = %" GST_TIME_FORMAT ", stop = %" GST_TIME_FORMAT + ", pos = %" GST_TIME_FORMAT, GST_TIME_ARGS (seg_start), + GST_TIME_ARGS (seg_stop), GST_TIME_ARGS (seg_pos)); + } + } + + if (format != GST_FORMAT_TIME) { + /* Unknown incoming segment format. Output a default open-ended + * TIME segment */ + gst_event_unref (event); + event = gst_event_new_new_segment_full (update, rate, applied_rate, + GST_FORMAT_TIME, 0, GST_CLOCK_TIME_NONE, 0); + } + + mp3parse->resyncing = TRUE; + mp3parse->cur_offset = -1; + mp3parse->next_ts = GST_CLOCK_TIME_NONE; + mp3parse->pending_ts = GST_CLOCK_TIME_NONE; + mp3parse->tracked_offset = 0; + mp3parse->sync_offset = 0; + /* also clear leftover data if clearing so much state */ + gst_adapter_clear (mp3parse->adapter); + + gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate, + &format, &start, &stop, &pos); + GST_DEBUG_OBJECT (mp3parse, "Pushing newseg rate %g, applied rate %g, " + "format %d, start %" G_GINT64_FORMAT ", stop %" G_GINT64_FORMAT + ", pos %" G_GINT64_FORMAT, rate, applied_rate, format, start, stop, + pos); + + gst_segment_set_newsegment_full (&mp3parse->segment, update, rate, + applied_rate, format, start, stop, pos); + + /* save the segment for later, right before we push a new buffer so that + * the caps are fixed and the next linked element can receive the segment. */ + eventp = &mp3parse->pending_segment; + gst_event_replace (eventp, event); + gst_event_unref (event); + res = TRUE; + break; + } + case GST_EVENT_FLUSH_STOP: + /* Clear our adapter and set up for a new position */ + gst_adapter_clear (mp3parse->adapter); + eventp = &mp3parse->pending_segment; + gst_event_replace (eventp, NULL); + res = gst_pad_push_event (mp3parse->srcpad, event); + break; + case GST_EVENT_EOS: + /* If we haven't processed any frames yet, then make sure we process + at least whatever's in our adapter */ + if (mp3parse->frame_count == 0) { + gst_mp3parse_handle_data (mp3parse, TRUE); + + /* If we STILL have zero frames processed, fire an error */ + if (mp3parse->frame_count == 0) { + GST_ELEMENT_ERROR (mp3parse, STREAM, WRONG_TYPE, + ("No valid frames found before end of stream"), (NULL)); + } + } + /* fall through */ + default: + if (mp3parse->pending_segment && + (GST_EVENT_TYPE (event) != GST_EVENT_EOS) && + (GST_EVENT_TYPE (event) != GST_EVENT_FLUSH_START)) { + /* Cache all events except EOS and the ones above if we have + * a pending segment */ + mp3parse->pending_events = + g_list_append (mp3parse->pending_events, event); + } else { + res = gst_pad_push_event (mp3parse->srcpad, event); + } + break; + } + + gst_object_unref (mp3parse); + + return res; +} + +static void +gst_mp3parse_add_index_entry (GstMPEGAudioParse * mp3parse, guint64 offset, + GstClockTime ts) +{ + MPEGAudioSeekEntry *entry, *last; + + if (G_LIKELY (mp3parse->seek_table != NULL)) { + last = mp3parse->seek_table->data; + + if (last->byte >= offset) + return; + + if (GST_CLOCK_DIFF (last->timestamp, ts) < mp3parse->idx_interval) + return; + } + + entry = mpeg_audio_seek_entry_new (); + entry->byte = offset; + entry->timestamp = ts; + mp3parse->seek_table = g_list_prepend (mp3parse->seek_table, entry); + + GST_LOG_OBJECT (mp3parse, "Adding index entry %" GST_TIME_FORMAT " @ offset " + "0x%08" G_GINT64_MODIFIER "x", GST_TIME_ARGS (ts), offset); +} + +/* Prepare a buffer of the indicated size, timestamp it and output */ +static GstFlowReturn +gst_mp3parse_emit_frame (GstMPEGAudioParse * mp3parse, guint size, + guint mode, guint crc) +{ + GstBuffer *outbuf; + guint bitrate; + GstFlowReturn ret = GST_FLOW_OK; + GstClockTime push_start; + GstTagList *taglist; + + outbuf = gst_adapter_take_buffer (mp3parse->adapter, size); + + GST_BUFFER_DURATION (outbuf) = + gst_util_uint64_scale (GST_SECOND, mp3parse->spf, mp3parse->rate); + + GST_BUFFER_OFFSET (outbuf) = mp3parse->cur_offset; + + /* Check if we have a pending timestamp from an incoming buffer to apply + * here */ + if (GST_CLOCK_TIME_IS_VALID (mp3parse->pending_ts)) { + if (mp3parse->tracked_offset >= mp3parse->pending_offset) { + /* If the incoming timestamp differs from our expected by more than + * half a frame, then take it instead of our calculated timestamp. + * This avoids creating imperfect streams just because of + * quantization in the container timestamping */ + GstClockTimeDiff diff = mp3parse->next_ts - mp3parse->pending_ts; + GstClockTimeDiff thresh = GST_BUFFER_DURATION (outbuf) / 2; + + if (diff < -thresh || diff > thresh) { + GST_DEBUG_OBJECT (mp3parse, "Updating next_ts from %" GST_TIME_FORMAT + " to pending ts %" GST_TIME_FORMAT + " at offset %" G_GINT64_FORMAT " (pending offset was %" + G_GINT64_FORMAT ")", GST_TIME_ARGS (mp3parse->next_ts), + GST_TIME_ARGS (mp3parse->pending_ts), mp3parse->tracked_offset, + mp3parse->pending_offset); + mp3parse->next_ts = mp3parse->pending_ts; + } + mp3parse->pending_ts = GST_CLOCK_TIME_NONE; + } + } + + /* Decide what timestamp we're going to apply */ + if (GST_CLOCK_TIME_IS_VALID (mp3parse->next_ts)) { + GST_BUFFER_TIMESTAMP (outbuf) = mp3parse->next_ts; + } else { + GstClockTime ts; + + /* No timestamp yet, convert our offset to a timestamp if we can, or + * start at 0 */ + if (mp3parse_bytepos_to_time (mp3parse, mp3parse->cur_offset, &ts, FALSE) && + GST_CLOCK_TIME_IS_VALID (ts)) + GST_BUFFER_TIMESTAMP (outbuf) = ts; + else { + GST_BUFFER_TIMESTAMP (outbuf) = 0; + } + } + + if (GST_BUFFER_TIMESTAMP (outbuf) == 0) + mp3parse->exact_position = TRUE; + + if (mp3parse->seekable && + mp3parse->exact_position && GST_BUFFER_TIMESTAMP_IS_VALID (outbuf) && + mp3parse->cur_offset != GST_BUFFER_OFFSET_NONE) { + gst_mp3parse_add_index_entry (mp3parse, mp3parse->cur_offset, + GST_BUFFER_TIMESTAMP (outbuf)); + } + + /* Update our byte offset tracking */ + if (mp3parse->cur_offset != -1) { + mp3parse->cur_offset += size; + } + mp3parse->tracked_offset += size; + + if (GST_BUFFER_TIMESTAMP_IS_VALID (outbuf)) + mp3parse->next_ts = + GST_BUFFER_TIMESTAMP (outbuf) + GST_BUFFER_DURATION (outbuf); + + gst_buffer_set_caps (outbuf, GST_PAD_CAPS (mp3parse->srcpad)); + + /* Post a bitrate tag if we need to before pushing the buffer */ + if (mp3parse->xing_bitrate != 0) + bitrate = mp3parse->xing_bitrate; + else if (mp3parse->vbri_bitrate != 0) + bitrate = mp3parse->vbri_bitrate; + else + bitrate = mp3parse->avg_bitrate; + + /* we will create a taglist (if any of the parameters has changed) + * to add the tags that changed */ + taglist = NULL; + if ((mp3parse->last_posted_bitrate / 10000) != (bitrate / 10000)) { + taglist = gst_tag_list_new (); + mp3parse->last_posted_bitrate = bitrate; + gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_BITRATE, + mp3parse->last_posted_bitrate, NULL); + + /* Post a new duration message if the average bitrate changes that much + * so applications can update their cached values + */ + if ((mp3parse->xing_flags & XING_TOC_FLAG) == 0 + && mp3parse->vbri_total_time == 0) { + gst_element_post_message (GST_ELEMENT (mp3parse), + gst_message_new_duration (GST_OBJECT (mp3parse), GST_FORMAT_TIME, + -1)); + } + } + + if (mp3parse->last_posted_crc != crc) { + gboolean using_crc; + + if (!taglist) { + taglist = gst_tag_list_new (); + } + mp3parse->last_posted_crc = crc; + if (mp3parse->last_posted_crc == CRC_PROTECTED) { + using_crc = TRUE; + } else { + using_crc = FALSE; + } + gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_CRC, + using_crc, NULL); + } + + if (mp3parse->last_posted_channel_mode != mode) { + if (!taglist) { + taglist = gst_tag_list_new (); + } + mp3parse->last_posted_channel_mode = mode; + + gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_MODE, + gst_mp3_channel_mode_get_nick (mode), NULL); + } + + /* if the taglist exists, we need to send it */ + if (taglist) { + gst_element_found_tags_for_pad (GST_ELEMENT (mp3parse), + mp3parse->srcpad, taglist); + } + + /* We start pushing 9 frames earlier (29 frames for MPEG2) than + * segment start to be able to decode the first frame we want. + * 9 (29) frames are the theoretical maximum of frames that contain + * data for the current frame (bit reservoir). + */ + if (mp3parse->segment.start == 0) { + push_start = 0; + } else if (GST_CLOCK_TIME_IS_VALID (mp3parse->max_bitreservoir)) { + if (GST_CLOCK_TIME_IS_VALID (mp3parse->segment.start) && + mp3parse->segment.start > mp3parse->max_bitreservoir) + push_start = mp3parse->segment.start - mp3parse->max_bitreservoir; + else + push_start = 0; + } else { + push_start = mp3parse->segment.start; + } + + if (G_UNLIKELY ((GST_CLOCK_TIME_IS_VALID (push_start) && + GST_BUFFER_TIMESTAMP_IS_VALID (outbuf) && + GST_BUFFER_TIMESTAMP (outbuf) + GST_BUFFER_DURATION (outbuf) + < push_start))) { + GST_DEBUG_OBJECT (mp3parse, + "Buffer before configured segment range %" GST_TIME_FORMAT + " to %" GST_TIME_FORMAT ", dropping, timestamp %" + GST_TIME_FORMAT " duration %" GST_TIME_FORMAT + ", offset 0x%08" G_GINT64_MODIFIER "x", GST_TIME_ARGS (push_start), + GST_TIME_ARGS (mp3parse->segment.stop), + GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), + GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf)), + GST_BUFFER_OFFSET (outbuf)); + + gst_buffer_unref (outbuf); + ret = GST_FLOW_OK; + } else if (G_UNLIKELY (GST_BUFFER_TIMESTAMP_IS_VALID (outbuf) && + GST_CLOCK_TIME_IS_VALID (mp3parse->segment.stop) && + GST_BUFFER_TIMESTAMP (outbuf) >= + mp3parse->segment.stop + GST_BUFFER_DURATION (outbuf))) { + /* Some mp3 streams have an offset in the timestamps, for which we have to + * push the frame *after* the end position in order for the decoder to be + * able to decode everything up until the segment.stop position. + * That is the reason of the calculated offset */ + GST_DEBUG_OBJECT (mp3parse, + "Buffer after configured segment range %" GST_TIME_FORMAT " to %" + GST_TIME_FORMAT ", returning GST_FLOW_UNEXPECTED, timestamp %" + GST_TIME_FORMAT " duration %" GST_TIME_FORMAT ", offset 0x%08" + G_GINT64_MODIFIER "x", GST_TIME_ARGS (push_start), + GST_TIME_ARGS (mp3parse->segment.stop), + GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), + GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf)), + GST_BUFFER_OFFSET (outbuf)); + + gst_buffer_unref (outbuf); + ret = GST_FLOW_UNEXPECTED; + } else { + GST_DEBUG_OBJECT (mp3parse, + "pushing buffer of %d bytes, timestamp %" GST_TIME_FORMAT + ", offset 0x%08" G_GINT64_MODIFIER "x", size, + GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), + GST_BUFFER_OFFSET (outbuf)); + mp3parse->segment.last_stop = GST_BUFFER_TIMESTAMP (outbuf); + /* push any pending segment now */ + if (mp3parse->pending_segment) { + gst_pad_push_event (mp3parse->srcpad, mp3parse->pending_segment); + mp3parse->pending_segment = NULL; + } + if (mp3parse->pending_events) { + GList *l; + + for (l = mp3parse->pending_events; l != NULL; l = l->next) { + gst_pad_push_event (mp3parse->srcpad, GST_EVENT (l->data)); + } + g_list_free (mp3parse->pending_events); + mp3parse->pending_events = NULL; + } + + /* set discont if needed */ + if (mp3parse->discont) { + GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT); + mp3parse->discont = FALSE; + } + + ret = gst_pad_push (mp3parse->srcpad, outbuf); + } + + return ret; +} + +static void +gst_mp3parse_handle_first_frame (GstMPEGAudioParse * mp3parse) +{ + GstTagList *taglist; + gchar *codec; + const guint32 xing_id = 0x58696e67; /* 'Xing' in hex */ + const guint32 info_id = 0x496e666f; /* 'Info' in hex - found in LAME CBR files */ + const guint32 vbri_id = 0x56425249; /* 'VBRI' in hex */ + + gint offset; + + guint64 avail; + gint64 upstream_total_bytes = 0; + guint32 read_id; + const guint8 *data; + + /* Output codec tag */ + if (!mp3parse->sent_codec_tag) { + if (mp3parse->layer == 3) { + codec = g_strdup_printf ("MPEG %d Audio, Layer %d (MP3)", + mp3parse->version, mp3parse->layer); + } else { + codec = g_strdup_printf ("MPEG %d Audio, Layer %d", + mp3parse->version, mp3parse->layer); + } + + taglist = gst_tag_list_new (); + gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, + GST_TAG_AUDIO_CODEC, codec, NULL); + gst_element_found_tags_for_pad (GST_ELEMENT (mp3parse), + mp3parse->srcpad, taglist); + g_free (codec); + + mp3parse->sent_codec_tag = TRUE; + } + /* end setting the tag */ + + /* Check first frame for Xing info */ + if (mp3parse->version == 1) { /* MPEG-1 file */ + if (mp3parse->channels == 1) + offset = 0x11; + else + offset = 0x20; + } else { /* MPEG-2 header */ + if (mp3parse->channels == 1) + offset = 0x09; + else + offset = 0x11; + } + /* Skip the 4 bytes of the MP3 header too */ + offset += 4; + + /* Check if we have enough data to read the Xing header */ + avail = gst_adapter_available (mp3parse->adapter); + + if (avail < offset + 8) + return; + + data = gst_adapter_peek (mp3parse->adapter, offset + 8); + if (data == NULL) + return; + /* The header starts at the provided offset */ + data += offset; + + /* obtain real upstream total bytes */ + mp3parse_total_bytes (mp3parse, &upstream_total_bytes); + + read_id = GST_READ_UINT32_BE (data); + if (read_id == xing_id || read_id == info_id) { + guint32 xing_flags; + guint bytes_needed = offset + 8; + gint64 total_bytes; + GstClockTime total_time; + + GST_DEBUG_OBJECT (mp3parse, "Found Xing header marker 0x%x", xing_id); + + /* Read 4 base bytes of flags, big-endian */ + xing_flags = GST_READ_UINT32_BE (data + 4); + if (xing_flags & XING_FRAMES_FLAG) + bytes_needed += 4; + if (xing_flags & XING_BYTES_FLAG) + bytes_needed += 4; + if (xing_flags & XING_TOC_FLAG) + bytes_needed += 100; + if (xing_flags & XING_VBR_SCALE_FLAG) + bytes_needed += 4; + if (avail < bytes_needed) { + GST_DEBUG_OBJECT (mp3parse, + "Not enough data to read Xing header (need %d)", bytes_needed); + return; + } + + GST_DEBUG_OBJECT (mp3parse, "Reading Xing header"); + mp3parse->xing_flags = xing_flags; + data = gst_adapter_peek (mp3parse->adapter, bytes_needed); + data += offset + 8; + + if (xing_flags & XING_FRAMES_FLAG) { + mp3parse->xing_frames = GST_READ_UINT32_BE (data); + if (mp3parse->xing_frames == 0) { + GST_WARNING_OBJECT (mp3parse, + "Invalid number of frames in Xing header"); + mp3parse->xing_flags &= ~XING_FRAMES_FLAG; + } else { + mp3parse->xing_total_time = gst_util_uint64_scale (GST_SECOND, + (guint64) (mp3parse->xing_frames) * (mp3parse->spf), + mp3parse->rate); + } + + data += 4; + } else { + mp3parse->xing_frames = 0; + mp3parse->xing_total_time = 0; + } + + if (xing_flags & XING_BYTES_FLAG) { + mp3parse->xing_bytes = GST_READ_UINT32_BE (data); + if (mp3parse->xing_bytes == 0) { + GST_WARNING_OBJECT (mp3parse, "Invalid number of bytes in Xing header"); + mp3parse->xing_flags &= ~XING_BYTES_FLAG; + } + + data += 4; + } else { + mp3parse->xing_bytes = 0; + } + + /* If we know the upstream size and duration, compute the + * total bitrate, rounded up to the nearest kbit/sec */ + if ((total_time = mp3parse->xing_total_time) && + (total_bytes = mp3parse->xing_bytes)) { + mp3parse->xing_bitrate = gst_util_uint64_scale (total_bytes, + 8 * GST_SECOND, total_time); + mp3parse->xing_bitrate += 500; + mp3parse->xing_bitrate -= mp3parse->xing_bitrate % 1000; + } + + if (xing_flags & XING_TOC_FLAG) { + int i, percent = 0; + guchar *table = mp3parse->xing_seek_table; + guchar old = 0, new; + guint first; + + first = data[0]; + GST_DEBUG_OBJECT (mp3parse, + "Subtracting initial offset of %d bytes from Xing TOC", first); + + /* xing seek table: percent time -> 1/256 bytepos */ + for (i = 0; i < 100; i++) { + new = data[i] - first; + if (old > new) { + GST_WARNING_OBJECT (mp3parse, "Skipping broken Xing TOC"); + mp3parse->xing_flags &= ~XING_TOC_FLAG; + goto skip_toc; + } + mp3parse->xing_seek_table[i] = old = new; + } + + /* build inverse table: 1/256 bytepos -> 1/100 percent time */ + for (i = 0; i < 256; i++) { + while (percent < 99 && table[percent + 1] <= i) + percent++; + + if (table[percent] == i) { + mp3parse->xing_seek_table_inverse[i] = percent * 100; + } else if (table[percent] < i && percent < 99) { + gdouble fa, fb, fx; + gint a = percent, b = percent + 1; + + fa = table[a]; + fb = table[b]; + fx = (b - a) / (fb - fa) * (i - fa) + a; + mp3parse->xing_seek_table_inverse[i] = (guint16) (fx * 100); + } else if (percent == 99) { + gdouble fa, fb, fx; + gint a = percent, b = 100; + + fa = table[a]; + fb = 256.0; + fx = (b - a) / (fb - fa) * (i - fa) + a; + mp3parse->xing_seek_table_inverse[i] = (guint16) (fx * 100); + } + } + skip_toc: + data += 100; + } else { + memset (mp3parse->xing_seek_table, 0, 100); + memset (mp3parse->xing_seek_table_inverse, 0, 256); + } + + if (xing_flags & XING_VBR_SCALE_FLAG) { + mp3parse->xing_vbr_scale = GST_READ_UINT32_BE (data); + } else + mp3parse->xing_vbr_scale = 0; + + GST_DEBUG_OBJECT (mp3parse, "Xing header reported %u frames, time %" + GST_TIME_FORMAT ", %u bytes, vbr scale %u", mp3parse->xing_frames, + GST_TIME_ARGS (mp3parse->xing_total_time), mp3parse->xing_bytes, + mp3parse->xing_vbr_scale); + + /* check for truncated file */ + if (upstream_total_bytes && mp3parse->xing_bytes && + mp3parse->xing_bytes * 0.8 > upstream_total_bytes) { + GST_WARNING_OBJECT (mp3parse, "File appears to have been truncated; " + "invalidating Xing header duration and size"); + mp3parse->xing_flags &= ~XING_BYTES_FLAG; + mp3parse->xing_flags &= ~XING_FRAMES_FLAG; + } + } else if (read_id == vbri_id) { + gint64 total_bytes, total_frames; + GstClockTime total_time; + guint16 nseek_points; + + GST_DEBUG_OBJECT (mp3parse, "Found VBRI header marker 0x%x", vbri_id); + if (avail < offset + 26) { + GST_DEBUG_OBJECT (mp3parse, + "Not enough data to read VBRI header (need %d)", offset + 26); + return; + } + + GST_DEBUG_OBJECT (mp3parse, "Reading VBRI header"); + data = gst_adapter_peek (mp3parse->adapter, offset + 26); + data += offset + 4; + + if (GST_READ_UINT16_BE (data) != 0x0001) { + GST_WARNING_OBJECT (mp3parse, + "Unsupported VBRI version 0x%x", GST_READ_UINT16_BE (data)); + return; + } + data += 2; + + /* Skip encoder delay */ + data += 2; + + /* Skip quality */ + data += 2; + + total_bytes = GST_READ_UINT32_BE (data); + if (total_bytes != 0) + mp3parse->vbri_bytes = total_bytes; + data += 4; + + total_frames = GST_READ_UINT32_BE (data); + if (total_frames != 0) { + mp3parse->vbri_frames = total_frames; + mp3parse->vbri_total_time = gst_util_uint64_scale (GST_SECOND, + (guint64) (mp3parse->vbri_frames) * (mp3parse->spf), mp3parse->rate); + } + data += 4; + + /* If we know the upstream size and duration, compute the + * total bitrate, rounded up to the nearest kbit/sec */ + if ((total_time = mp3parse->vbri_total_time) && + (total_bytes = mp3parse->vbri_bytes)) { + mp3parse->vbri_bitrate = gst_util_uint64_scale (total_bytes, + 8 * GST_SECOND, total_time); + mp3parse->vbri_bitrate += 500; + mp3parse->vbri_bitrate -= mp3parse->vbri_bitrate % 1000; + } + + nseek_points = GST_READ_UINT16_BE (data); + data += 2; + + if (nseek_points > 0) { + guint scale, seek_bytes, seek_frames; + gint i; + + mp3parse->vbri_seek_points = nseek_points; + + scale = GST_READ_UINT16_BE (data); + data += 2; + + seek_bytes = GST_READ_UINT16_BE (data); + data += 2; + + seek_frames = GST_READ_UINT16_BE (data); + + if (scale == 0 || seek_bytes == 0 || seek_bytes > 4 || seek_frames == 0) { + GST_WARNING_OBJECT (mp3parse, "Unsupported VBRI seek table"); + goto out_vbri; + } + + if (avail < offset + 26 + nseek_points * seek_bytes) { + GST_WARNING_OBJECT (mp3parse, + "Not enough data to read VBRI seek table (need %d)", + offset + 26 + nseek_points * seek_bytes); + goto out_vbri; + } + + if (seek_frames * nseek_points < total_frames - seek_frames || + seek_frames * nseek_points > total_frames + seek_frames) { + GST_WARNING_OBJECT (mp3parse, + "VBRI seek table doesn't cover the complete file"); + goto out_vbri; + } + + data = + gst_adapter_peek (mp3parse->adapter, + offset + 26 + nseek_points * seek_bytes); + data += offset + 26; + + + /* VBRI seek table: frame/seek_frames -> byte */ + mp3parse->vbri_seek_table = g_new (guint32, nseek_points); + if (seek_bytes == 4) + for (i = 0; i < nseek_points; i++) { + mp3parse->vbri_seek_table[i] = GST_READ_UINT32_BE (data) * scale; + data += 4; + } else if (seek_bytes == 3) + for (i = 0; i < nseek_points; i++) { + mp3parse->vbri_seek_table[i] = GST_READ_UINT24_BE (data) * scale; + data += 3; + } else if (seek_bytes == 2) + for (i = 0; i < nseek_points; i++) { + mp3parse->vbri_seek_table[i] = GST_READ_UINT16_BE (data) * scale; + data += 2; + } else /* seek_bytes == 1 */ + for (i = 0; i < nseek_points; i++) { + mp3parse->vbri_seek_table[i] = GST_READ_UINT8 (data) * scale; + data += 1; + } + } + out_vbri: + + GST_DEBUG_OBJECT (mp3parse, "VBRI header reported %u frames, time %" + GST_TIME_FORMAT ", bytes %u", mp3parse->vbri_frames, + GST_TIME_ARGS (mp3parse->vbri_total_time), mp3parse->vbri_bytes); + + /* check for truncated file */ + if (upstream_total_bytes && mp3parse->vbri_bytes && + mp3parse->vbri_bytes * 0.8 > upstream_total_bytes) { + GST_WARNING_OBJECT (mp3parse, "File appears to have been truncated; " + "invalidating VBRI header duration and size"); + mp3parse->vbri_valid = FALSE; + } else { + mp3parse->vbri_valid = TRUE; + } + } else { + GST_DEBUG_OBJECT (mp3parse, + "Xing, LAME or VBRI header not found in first frame"); + } +} + +static void +gst_mp3parse_check_seekability (GstMPEGAudioParse * mp3parse) +{ + GstQuery *query; + gboolean seekable = FALSE; + gint64 start = -1, stop = -1; + guint idx_interval = 0; + + query = gst_query_new_seeking (GST_FORMAT_BYTES); + if (!gst_pad_peer_query (mp3parse->sinkpad, query)) { + GST_DEBUG_OBJECT (mp3parse, "seeking query failed"); + goto done; + } + + gst_query_parse_seeking (query, NULL, &seekable, &start, &stop); + + /* try harder to query upstream size if we didn't get it the first time */ + if (seekable && stop == -1) { + GstFormat fmt = GST_FORMAT_BYTES; + + GST_DEBUG_OBJECT (mp3parse, "doing duration query to fix up unset stop"); + gst_pad_query_peer_duration (mp3parse->sinkpad, &fmt, &stop); + } + + /* if upstream doesn't know the size, it's likely that it's not seekable in + * practice even if it technically may be seekable */ + if (seekable && (start != 0 || stop <= start)) { + GST_DEBUG_OBJECT (mp3parse, "seekable but unknown start/stop -> disable"); + seekable = FALSE; + } + + /* let's not put every single frame into our index */ + if (seekable) { + if (stop < 10 * 1024 * 1024) + idx_interval = 100; + else if (stop < 100 * 1024 * 1024) + idx_interval = 500; + else + idx_interval = 1000; + } + +done: + + GST_INFO_OBJECT (mp3parse, "seekable: %d (%" G_GUINT64_FORMAT " - %" + G_GUINT64_FORMAT ")", seekable, start, stop); + mp3parse->seekable = seekable; + + GST_INFO_OBJECT (mp3parse, "idx_interval: %ums", idx_interval); + mp3parse->idx_interval = idx_interval * GST_MSECOND; + + gst_query_unref (query); +} + +/* Flush some number of bytes and update tracked offsets */ +static void +gst_mp3parse_flush_bytes (GstMPEGAudioParse * mp3parse, int bytes) +{ + gst_adapter_flush (mp3parse->adapter, bytes); + if (mp3parse->cur_offset != -1) + mp3parse->cur_offset += bytes; + mp3parse->tracked_offset += bytes; +} + +/* Perform extended validation to check that subsequent headers match + the first header given here in important characteristics, to avoid + false sync. We look for a minimum of MIN_RESYNC_FRAMES consecutive + frames to match their major characteristics. + + If at_eos is set to TRUE, we just check that we don't find any invalid + frames in whatever data is available, rather than requiring a full + MIN_RESYNC_FRAMES of data. + + Returns TRUE if we've seen enough data to validate or reject the frame. + If TRUE is returned, then *valid contains TRUE if it validated, or false + if we decided it was false sync. + */ +static gboolean +gst_mp3parse_validate_extended (GstMPEGAudioParse * mp3parse, guint32 header, + int bpf, gboolean at_eos, gboolean * valid) +{ + guint32 next_header; + const guint8 *data; + guint available; + int frames_found = 1; + int offset = bpf; + + while (frames_found < MIN_RESYNC_FRAMES) { + /* Check if we have enough data for all these frames, plus the next + frame header. */ + available = gst_adapter_available (mp3parse->adapter); + if (available < offset + 4) { + if (at_eos) { + /* Running out of data at EOS is fine; just accept it */ + *valid = TRUE; + return TRUE; + } else { + return FALSE; + } + } + + data = gst_adapter_peek (mp3parse->adapter, offset + 4); + next_header = GST_READ_UINT32_BE (data + offset); + GST_DEBUG_OBJECT (mp3parse, "At %d: header=%08X, header2=%08X, bpf=%d", + offset, (unsigned int) header, (unsigned int) next_header, bpf); + +/* mask the bits which are allowed to differ between frames */ +#define HDRMASK ~((0xF << 12) /* bitrate */ | \ + (0x1 << 9) /* padding */ | \ + (0xf << 4) /* mode|mode extension */ | \ + (0xf)) /* copyright|emphasis */ + + if ((next_header & HDRMASK) != (header & HDRMASK)) { + /* If any of the unmasked bits don't match, then it's not valid */ + GST_DEBUG_OBJECT (mp3parse, "next header doesn't match " + "(header=%08X (%08X), header2=%08X (%08X), bpf=%d)", + (guint) header, (guint) header & HDRMASK, (guint) next_header, + (guint) next_header & HDRMASK, bpf); + *valid = FALSE; + return TRUE; + } else if ((((next_header >> 12) & 0xf) == 0) || + (((next_header >> 12) & 0xf) == 0xf)) { + /* The essential parts were the same, but the bitrate held an + invalid value - also reject */ + GST_DEBUG_OBJECT (mp3parse, "next header invalid (bitrate)"); + *valid = FALSE; + return TRUE; + } + + bpf = mp3_type_frame_length_from_header (mp3parse, next_header, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + offset += bpf; + frames_found++; + } + + *valid = TRUE; + return TRUE; +} + +static GstFlowReturn +gst_mp3parse_handle_data (GstMPEGAudioParse * mp3parse, gboolean at_eos) +{ + GstFlowReturn flow = GST_FLOW_OK; + const guchar *data; + guint32 header; + int bpf; + guint available; + guint bitrate, layer, rate, channels, version, mode, crc; + gboolean caps_change; + + /* while we still have at least 4 bytes (for the header) available */ + while (gst_adapter_available (mp3parse->adapter) >= 4) { + /* Get the header bytes, check if they're potentially valid */ + data = gst_adapter_peek (mp3parse->adapter, 4); + header = GST_READ_UINT32_BE (data); + + if (!head_check (mp3parse, header)) { + /* Not a valid MP3 header; we start looking forward byte-by-byte trying to + find a place to resync */ + if (!mp3parse->resyncing) + mp3parse->sync_offset = mp3parse->tracked_offset; + mp3parse->resyncing = TRUE; + gst_mp3parse_flush_bytes (mp3parse, 1); + GST_DEBUG_OBJECT (mp3parse, "wrong header, skipping byte"); + continue; + } + + /* We have a potentially valid header. + If this is just a normal 'next frame', we go ahead and output it. + + However, sometimes, we do additional validation to ensure we haven't + got false sync (common with mp3 due to the short sync word). + The additional validation requires that we find several consecutive mp3 + frames with the same major parameters, or reach EOS with a smaller + number of valid-looking frames. + + We do this if: + - This is the very first frame we've processed + - We're resyncing after a non-accurate seek, or after losing sync + due to invalid data. + - The format of the stream changes in a major way (number of channels, + sample rate, layer, or mpeg version). + */ + available = gst_adapter_available (mp3parse->adapter); + + if (G_UNLIKELY (mp3parse->resyncing && + mp3parse->tracked_offset - mp3parse->sync_offset > 2 * 1024 * 1024)) + goto sync_failure; + + bpf = mp3_type_frame_length_from_header (mp3parse, header, + &version, &layer, &channels, &bitrate, &rate, &mode, &crc); + g_assert (bpf != 0); + + if (channels != mp3parse->channels || + rate != mp3parse->rate || layer != mp3parse->layer || + version != mp3parse->version) + caps_change = TRUE; + else + caps_change = FALSE; + + if (mp3parse->resyncing || caps_change) { + gboolean valid; + if (!gst_mp3parse_validate_extended (mp3parse, header, bpf, at_eos, + &valid)) { + /* Not enough data to validate; wait for more */ + break; + } + + if (!valid) { + /* Extended validation failed; we probably got false sync. + Continue searching from the next byte in the stream */ + if (!mp3parse->resyncing) + mp3parse->sync_offset = mp3parse->tracked_offset; + mp3parse->resyncing = TRUE; + gst_mp3parse_flush_bytes (mp3parse, 1); + continue; + } + } + + /* if we don't have the whole frame... */ + if (available < bpf) { + GST_DEBUG_OBJECT (mp3parse, "insufficient data available, need " + "%d bytes, have %d", bpf, available); + break; + } + + if (caps_change) { + GstCaps *caps; + + caps = mp3_caps_create (version, layer, channels, rate); + gst_pad_set_caps (mp3parse->srcpad, caps); + gst_caps_unref (caps); + + mp3parse->channels = channels; + mp3parse->rate = rate; + + mp3parse->layer = layer; + mp3parse->version = version; + + /* see http://www.codeproject.com/audio/MPEGAudioInfo.asp */ + if (mp3parse->layer == 1) + mp3parse->spf = 384; + else if (mp3parse->layer == 2) + mp3parse->spf = 1152; + else if (mp3parse->version == 1) { + mp3parse->spf = 1152; + } else { + /* MPEG-2 or "2.5" */ + mp3parse->spf = 576; + } + + mp3parse->max_bitreservoir = gst_util_uint64_scale (GST_SECOND, + ((version == 1) ? 10 : 30) * mp3parse->spf, mp3parse->rate); + } + + mp3parse->bit_rate = bitrate; + + /* Check the first frame for a Xing header to get our total length */ + if (mp3parse->frame_count == 0) { + /* For the first frame in the file, look for a Xing frame after + * the header, and output a codec tag */ + gst_mp3parse_handle_first_frame (mp3parse); + + /* Check if we're seekable */ + gst_mp3parse_check_seekability (mp3parse); + } + + /* Update VBR stats */ + mp3parse->bitrate_sum += mp3parse->bit_rate; + mp3parse->frame_count++; + /* Compute the average bitrate, rounded up to the nearest 1000 bits */ + mp3parse->avg_bitrate = + (mp3parse->bitrate_sum / mp3parse->frame_count + 500); + mp3parse->avg_bitrate -= mp3parse->avg_bitrate % 1000; + + if (!mp3parse->skip) { + mp3parse->resyncing = FALSE; + flow = gst_mp3parse_emit_frame (mp3parse, bpf, mode, crc); + if (GST_FLOW_IS_FATAL (flow)) + break; + } else { + GST_DEBUG_OBJECT (mp3parse, "skipping buffer of %d bytes", bpf); + gst_mp3parse_flush_bytes (mp3parse, bpf); + mp3parse->skip--; + } + } + + return flow; + + /* ERRORS */ +sync_failure: + { + GST_ELEMENT_ERROR (mp3parse, STREAM, DECODE, + ("Failed to parse stream"), (NULL)); + return GST_FLOW_ERROR; + } +} + +static GstFlowReturn +gst_mp3parse_chain (GstPad * pad, GstBuffer * buf) +{ + GstMPEGAudioParse *mp3parse; + GstClockTime timestamp; + + mp3parse = GST_MP3PARSE (GST_PAD_PARENT (pad)); + + GST_LOG_OBJECT (mp3parse, "buffer of %d bytes", GST_BUFFER_SIZE (buf)); + + timestamp = GST_BUFFER_TIMESTAMP (buf); + + mp3parse->discont |= GST_BUFFER_IS_DISCONT (buf); + + /* If we don't yet have a next timestamp, save it and the incoming offset + * so we can apply it to the right outgoing buffer */ + if (GST_CLOCK_TIME_IS_VALID (timestamp)) { + gint64 avail = gst_adapter_available (mp3parse->adapter); + + mp3parse->pending_ts = timestamp; + mp3parse->pending_offset = mp3parse->tracked_offset + avail; + + /* If we have no data pending and the next timestamp is + * invalid we can use the upstream timestamp for the next frame. + * + * This will give us a timestamp if we're resyncing and upstream + * gave us -1 as offset. */ + if (avail == 0 && !GST_CLOCK_TIME_IS_VALID (mp3parse->next_ts)) + mp3parse->next_ts = timestamp; + + GST_LOG_OBJECT (mp3parse, "Have pending ts %" GST_TIME_FORMAT + " to apply in %" G_GINT64_FORMAT " bytes (@ off %" G_GINT64_FORMAT ")", + GST_TIME_ARGS (mp3parse->pending_ts), avail, mp3parse->pending_offset); + } + + /* Update the cur_offset we'll apply to outgoing buffers */ + if (mp3parse->cur_offset == -1 && GST_BUFFER_OFFSET (buf) != -1) + mp3parse->cur_offset = GST_BUFFER_OFFSET (buf); + + /* And add the data to the pool */ + gst_adapter_push (mp3parse->adapter, buf); + + return gst_mp3parse_handle_data (mp3parse, FALSE); +} + +static gboolean +head_check (GstMPEGAudioParse * mp3parse, unsigned long head) +{ + GST_DEBUG_OBJECT (mp3parse, "checking mp3 header 0x%08lx", head); + /* if it's not a valid sync */ + if ((head & 0xffe00000) != 0xffe00000) { + GST_WARNING_OBJECT (mp3parse, "invalid sync"); + return FALSE; + } + /* if it's an invalid MPEG version */ + if (((head >> 19) & 3) == 0x1) { + GST_WARNING_OBJECT (mp3parse, "invalid MPEG version: 0x%lx", + (head >> 19) & 3); + return FALSE; + } + /* if it's an invalid layer */ + if (!((head >> 17) & 3)) { + GST_WARNING_OBJECT (mp3parse, "invalid layer: 0x%lx", (head >> 17) & 3); + return FALSE; + } + /* if it's an invalid bitrate */ + if (((head >> 12) & 0xf) == 0x0) { + GST_WARNING_OBJECT (mp3parse, "invalid bitrate: 0x%lx." + "Free format files are not supported yet", (head >> 12) & 0xf); + return FALSE; + } + if (((head >> 12) & 0xf) == 0xf) { + GST_WARNING_OBJECT (mp3parse, "invalid bitrate: 0x%lx", (head >> 12) & 0xf); + return FALSE; + } + /* if it's an invalid samplerate */ + if (((head >> 10) & 0x3) == 0x3) { + GST_WARNING_OBJECT (mp3parse, "invalid samplerate: 0x%lx", + (head >> 10) & 0x3); + return FALSE; + } + + if ((head & 0x3) == 0x2) { + /* Ignore this as there are some files with emphasis 0x2 that can + * be played fine. See BGO #537235 */ + GST_WARNING_OBJECT (mp3parse, "invalid emphasis: 0x%lx", head & 0x3); + } + + return TRUE; +} + +static void +gst_mp3parse_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) +{ + GstMPEGAudioParse *src; + + src = GST_MP3PARSE (object); + + switch (prop_id) { + case ARG_SKIP: + src->skip = g_value_get_int (value); + break; + default: + break; + } +} + +static void +gst_mp3parse_get_property (GObject * object, guint prop_id, GValue * value, + GParamSpec * pspec) +{ + GstMPEGAudioParse *src; + + src = GST_MP3PARSE (object); + + switch (prop_id) { + case ARG_SKIP: + g_value_set_int (value, src->skip); + break; + case ARG_BIT_RATE: + g_value_set_int (value, src->bit_rate * 1000); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static GstStateChangeReturn +gst_mp3parse_change_state (GstElement * element, GstStateChange transition) +{ + GstMPEGAudioParse *mp3parse; + GstStateChangeReturn result; + + mp3parse = GST_MP3PARSE (element); + + result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + + switch (transition) { + case GST_STATE_CHANGE_PAUSED_TO_READY: + gst_mp3parse_reset (mp3parse); + break; + default: + break; + } + + return result; +} + +static gboolean +mp3parse_total_bytes (GstMPEGAudioParse * mp3parse, gint64 * total) +{ + GstFormat fmt = GST_FORMAT_BYTES; + + if (gst_pad_query_peer_duration (mp3parse->sinkpad, &fmt, total)) + return TRUE; + + if (mp3parse->xing_flags & XING_BYTES_FLAG) { + *total = mp3parse->xing_bytes; + return TRUE; + } + + if (mp3parse->vbri_bytes != 0 && mp3parse->vbri_valid) { + *total = mp3parse->vbri_bytes; + return TRUE; + } + + return FALSE; +} + +static gboolean +mp3parse_total_time (GstMPEGAudioParse * mp3parse, GstClockTime * total) +{ + gint64 total_bytes; + + *total = GST_CLOCK_TIME_NONE; + + if (mp3parse->xing_flags & XING_FRAMES_FLAG) { + *total = mp3parse->xing_total_time; + return TRUE; + } + + if (mp3parse->vbri_total_time != 0 && mp3parse->vbri_valid) { + *total = mp3parse->vbri_total_time; + return TRUE; + } + + /* Calculate time from the measured bitrate */ + if (!mp3parse_total_bytes (mp3parse, &total_bytes)) + return FALSE; + + if (total_bytes != -1 + && !mp3parse_bytepos_to_time (mp3parse, total_bytes, total, TRUE)) + return FALSE; + + return TRUE; +} + +/* Convert a timestamp to the file position required to start decoding that + * timestamp. For now, this just uses the avg bitrate. Later, use an + * incrementally accumulated seek table */ +static gboolean +mp3parse_time_to_bytepos (GstMPEGAudioParse * mp3parse, GstClockTime ts, + gint64 * bytepos) +{ + gint64 total_bytes; + GstClockTime total_time; + + /* -1 always maps to -1 */ + if (ts == -1) { + *bytepos = -1; + return TRUE; + } + + /* If XING seek table exists use this for time->byte conversion */ + if ((mp3parse->xing_flags & XING_TOC_FLAG) && + (total_bytes = mp3parse->xing_bytes) && + (total_time = mp3parse->xing_total_time)) { + gdouble fa, fb, fx; + gdouble percent = + CLAMP ((100.0 * gst_util_guint64_to_gdouble (ts)) / + gst_util_guint64_to_gdouble (total_time), 0.0, 100.0); + gint index = CLAMP (percent, 0, 99); + + fa = mp3parse->xing_seek_table[index]; + if (index < 99) + fb = mp3parse->xing_seek_table[index + 1]; + else + fb = 256.0; + + fx = fa + (fb - fa) * (percent - index); + + *bytepos = (1.0 / 256.0) * fx * total_bytes; + + return TRUE; + } + + if (mp3parse->vbri_seek_table && (total_bytes = mp3parse->vbri_bytes) && + (total_time = mp3parse->vbri_total_time)) { + gint i, j; + gdouble a, b, fa, fb; + + i = gst_util_uint64_scale (ts, mp3parse->vbri_seek_points - 1, total_time); + i = CLAMP (i, 0, mp3parse->vbri_seek_points - 1); + + a = gst_guint64_to_gdouble (gst_util_uint64_scale (i, total_time, + mp3parse->vbri_seek_points)); + fa = 0.0; + for (j = i; j >= 0; j--) + fa += mp3parse->vbri_seek_table[j]; + + if (i + 1 < mp3parse->vbri_seek_points) { + b = gst_guint64_to_gdouble (gst_util_uint64_scale (i + 1, total_time, + mp3parse->vbri_seek_points)); + fb = fa + mp3parse->vbri_seek_table[i + 1]; + } else { + b = gst_guint64_to_gdouble (total_time); + fb = total_bytes; + } + + *bytepos = fa + ((fb - fa) / (b - a)) * (gst_guint64_to_gdouble (ts) - a); + + return TRUE; + } + + if (mp3parse->avg_bitrate == 0) + goto no_bitrate; + + *bytepos = + gst_util_uint64_scale (ts, mp3parse->avg_bitrate, (8 * GST_SECOND)); + return TRUE; +no_bitrate: + GST_DEBUG_OBJECT (mp3parse, "Cannot seek yet - no average bitrate"); + return FALSE; +} + +static gboolean +mp3parse_bytepos_to_time (GstMPEGAudioParse * mp3parse, + gint64 bytepos, GstClockTime * ts, gboolean from_total_time) +{ + gint64 total_bytes; + GstClockTime total_time; + + if (bytepos == -1) { + *ts = GST_CLOCK_TIME_NONE; + return TRUE; + } + + if (bytepos == 0) { + *ts = 0; + return TRUE; + } + + /* If XING seek table exists use this for byte->time conversion */ + if (!from_total_time && (mp3parse->xing_flags & XING_TOC_FLAG) && + (total_bytes = mp3parse->xing_bytes) && + (total_time = mp3parse->xing_total_time)) { + gdouble fa, fb, fx; + gdouble pos; + gint index; + + pos = CLAMP ((bytepos * 256.0) / total_bytes, 0.0, 256.0); + index = CLAMP (pos, 0, 255); + fa = mp3parse->xing_seek_table_inverse[index]; + if (index < 255) + fb = mp3parse->xing_seek_table_inverse[index + 1]; + else + fb = 10000.0; + + fx = fa + (fb - fa) * (pos - index); + + *ts = (1.0 / 10000.0) * fx * gst_util_guint64_to_gdouble (total_time); + + return TRUE; + } + + if (!from_total_time && mp3parse->vbri_seek_table && + (total_bytes = mp3parse->vbri_bytes) && + (total_time = mp3parse->vbri_total_time)) { + gint i = 0; + guint64 sum = 0; + gdouble a, b, fa, fb; + + do { + sum += mp3parse->vbri_seek_table[i]; + i++; + } while (i + 1 < mp3parse->vbri_seek_points + && sum + mp3parse->vbri_seek_table[i] < bytepos); + i--; + + a = gst_guint64_to_gdouble (sum); + fa = gst_guint64_to_gdouble (gst_util_uint64_scale (i, total_time, + mp3parse->vbri_seek_points)); + + if (i + 1 < mp3parse->vbri_seek_points) { + b = a + mp3parse->vbri_seek_table[i + 1]; + fb = gst_guint64_to_gdouble (gst_util_uint64_scale (i + 1, total_time, + mp3parse->vbri_seek_points)); + } else { + b = total_bytes; + fb = gst_guint64_to_gdouble (total_time); + } + + *ts = gst_gdouble_to_guint64 (fa + ((fb - fa) / (b - a)) * (bytepos - a)); + + return TRUE; + } + + /* Cannot convert anything except 0 if we don't have a bitrate yet */ + if (mp3parse->avg_bitrate == 0) + return FALSE; + + *ts = (GstClockTime) gst_util_uint64_scale (GST_SECOND, bytepos * 8, + mp3parse->avg_bitrate); + return TRUE; +} + +static gboolean +mp3parse_handle_seek (GstMPEGAudioParse * mp3parse, GstEvent * event) +{ + GstFormat format; + gdouble rate; + GstSeekFlags flags; + GstSeekType cur_type, stop_type; + gint64 cur, stop; + gint64 byte_cur, byte_stop; + MPEGAudioPendingAccurateSeek *seek; + GstClockTime start; + + gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur, + &stop_type, &stop); + + GST_DEBUG_OBJECT (mp3parse, "Performing seek to %" GST_TIME_FORMAT, + GST_TIME_ARGS (cur)); + + /* For any format other than TIME, see if upstream handles + * it directly or fail. For TIME, try upstream, but do it ourselves if + * it fails upstream */ + if (format != GST_FORMAT_TIME) { + gst_event_ref (event); + return gst_pad_push_event (mp3parse->sinkpad, event); + } else { + gst_event_ref (event); + if (gst_pad_push_event (mp3parse->sinkpad, event)) + return TRUE; + } + + seek = g_new0 (MPEGAudioPendingAccurateSeek, 1); + + seek->segment = mp3parse->segment; + + gst_segment_set_seek (&seek->segment, rate, GST_FORMAT_TIME, + flags, cur_type, cur, stop_type, stop, NULL); + + /* Handle TIME based seeks by converting to a BYTE position */ + + /* For accurate seeking get the frame 9 (MPEG1) or 29 (MPEG2) frames + * before the one we want to seek to and push them all to the decoder. + * + * This is necessary because of the bit reservoir. See + * http://www.mars.org/mailman/public/mad-dev/2002-May/000634.html + * + */ + + if (flags & GST_SEEK_FLAG_ACCURATE) { + if (!mp3parse->seek_table) { + byte_cur = 0; + byte_stop = -1; + start = 0; + } else { + MPEGAudioSeekEntry *entry = NULL, *start_entry = NULL, *stop_entry = NULL; + GList *start_node, *stop_node; + gint64 seek_ts = (cur > mp3parse->max_bitreservoir) ? + (cur - mp3parse->max_bitreservoir) : 0; + + for (start_node = mp3parse->seek_table; start_node; + start_node = start_node->next) { + entry = start_node->data; + + if (seek_ts >= entry->timestamp) { + start_entry = entry; + break; + } + } + + if (!start_entry) { + start_entry = mp3parse->seek_table->data; + start = start_entry->timestamp; + byte_cur = start_entry->byte; + } else { + start = start_entry->timestamp; + byte_cur = start_entry->byte; + } + + for (stop_node = mp3parse->seek_table; stop_node; + stop_node = stop_node->next) { + entry = stop_node->data; + + if (stop >= entry->timestamp) { + stop_node = stop_node->prev; + stop_entry = (stop_node) ? stop_node->data : NULL; + break; + } + } + + if (!stop_entry) { + byte_stop = -1; + } else { + byte_stop = stop_entry->byte; + } + + } + event = gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, cur_type, + byte_cur, stop_type, byte_stop); + g_mutex_lock (mp3parse->pending_seeks_lock); + seek->upstream_start = byte_cur; + seek->timestamp_start = start; + mp3parse->pending_accurate_seeks = + g_slist_prepend (mp3parse->pending_accurate_seeks, seek); + g_mutex_unlock (mp3parse->pending_seeks_lock); + if (gst_pad_push_event (mp3parse->sinkpad, event)) { + mp3parse->exact_position = TRUE; + return TRUE; + } else { + mp3parse->exact_position = TRUE; + g_mutex_lock (mp3parse->pending_seeks_lock); + mp3parse->pending_accurate_seeks = + g_slist_remove (mp3parse->pending_accurate_seeks, seek); + g_mutex_unlock (mp3parse->pending_seeks_lock); + g_free (seek); + return FALSE; + } + } + + mp3parse->exact_position = FALSE; + + /* Convert the TIME to the appropriate BYTE position at which to resume + * decoding. */ + if (!mp3parse_time_to_bytepos (mp3parse, (GstClockTime) cur, &byte_cur)) + goto no_pos; + if (!mp3parse_time_to_bytepos (mp3parse, (GstClockTime) stop, &byte_stop)) + goto no_pos; + + GST_DEBUG_OBJECT (mp3parse, "Seeking to byte range %" G_GINT64_FORMAT + " to %" G_GINT64_FORMAT, byte_cur, byte_stop); + + /* Send BYTE based seek upstream */ + event = gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, cur_type, + byte_cur, stop_type, byte_stop); + + GST_LOG_OBJECT (mp3parse, "Storing pending seek"); + g_mutex_lock (mp3parse->pending_seeks_lock); + seek->upstream_start = byte_cur; + seek->timestamp_start = cur; + mp3parse->pending_nonaccurate_seeks = + g_slist_prepend (mp3parse->pending_nonaccurate_seeks, seek); + g_mutex_unlock (mp3parse->pending_seeks_lock); + if (gst_pad_push_event (mp3parse->sinkpad, event)) { + return TRUE; + } else { + g_mutex_lock (mp3parse->pending_seeks_lock); + mp3parse->pending_nonaccurate_seeks = + g_slist_remove (mp3parse->pending_nonaccurate_seeks, seek); + g_mutex_unlock (mp3parse->pending_seeks_lock); + g_free (seek); + return FALSE; + } + +no_pos: + GST_DEBUG_OBJECT (mp3parse, + "Could not determine byte position for desired time"); + return FALSE; +} + +static gboolean +mp3parse_src_event (GstPad * pad, GstEvent * event) +{ + GstMPEGAudioParse *mp3parse; + gboolean res = FALSE; + + mp3parse = GST_MP3PARSE (gst_pad_get_parent (pad)); + + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_SEEK: + res = mp3parse_handle_seek (mp3parse, event); + gst_event_unref (event); + break; + default: + res = gst_pad_event_default (pad, event); + break; + } + + gst_object_unref (mp3parse); + return res; +} + +static gboolean +mp3parse_src_query (GstPad * pad, GstQuery * query) +{ + GstFormat format; + GstClockTime total; + GstMPEGAudioParse *mp3parse; + gboolean res = FALSE; + GstPad *peer; + + mp3parse = GST_MP3PARSE (gst_pad_get_parent (pad)); + + GST_LOG_OBJECT (pad, "%s query", GST_QUERY_TYPE_NAME (query)); + + switch (GST_QUERY_TYPE (query)) { + case GST_QUERY_POSITION: + gst_query_parse_position (query, &format, NULL); + + if (format == GST_FORMAT_BYTES || format == GST_FORMAT_DEFAULT) { + if (mp3parse->cur_offset != -1) { + gst_query_set_position (query, GST_FORMAT_BYTES, + mp3parse->cur_offset); + res = TRUE; + } + } else if (format == GST_FORMAT_TIME) { + if (mp3parse->next_ts == GST_CLOCK_TIME_NONE) + goto out; + gst_query_set_position (query, GST_FORMAT_TIME, mp3parse->next_ts); + res = TRUE; + } + + /* If no answer above, see if upstream knows */ + if (!res) { + if ((peer = gst_pad_get_peer (mp3parse->sinkpad)) != NULL) { + res = gst_pad_query (peer, query); + gst_object_unref (peer); + if (res) + goto out; + } + } + break; + case GST_QUERY_DURATION: + gst_query_parse_duration (query, &format, NULL); + + /* First, see if upstream knows */ + if ((peer = gst_pad_get_peer (mp3parse->sinkpad)) != NULL) { + res = gst_pad_query (peer, query); + gst_object_unref (peer); + if (res) + goto out; + } + + if (format == GST_FORMAT_TIME) { + if (!mp3parse_total_time (mp3parse, &total) || total == -1) + goto out; + gst_query_set_duration (query, format, total); + res = TRUE; + } + break; + case GST_QUERY_SEEKING: + gst_query_parse_seeking (query, &format, NULL, NULL, NULL); + + /* does upstream handle ? */ + if ((peer = gst_pad_get_peer (mp3parse->sinkpad)) != NULL) { + res = gst_pad_query (peer, query); + gst_object_unref (peer); + } + /* we may be able to help if in TIME */ + if (format == GST_FORMAT_TIME) { + gboolean seekable; + + gst_query_parse_seeking (query, &format, &seekable, NULL, NULL); + /* already OK if upstream takes care */ + if (!(res && seekable)) { + gint64 pos; + + seekable = TRUE; + if (!mp3parse_total_time (mp3parse, &total) || total == -1) { + seekable = FALSE; + } else if (!mp3parse_time_to_bytepos (mp3parse, 0, &pos)) { + seekable = FALSE; + } else { + GstQuery *q; + + q = gst_query_new_seeking (GST_FORMAT_BYTES); + if (!gst_pad_peer_query (mp3parse->sinkpad, q)) { + seekable = FALSE; + } else { + gst_query_parse_seeking (q, &format, &seekable, NULL, NULL); + } + gst_query_unref (q); + } + gst_query_set_seeking (query, GST_FORMAT_TIME, seekable, 0, total); + res = TRUE; + } + } + break; + default: + res = gst_pad_query_default (pad, query); + break; + } + +out: + gst_object_unref (mp3parse); + return res; +} + +static const GstQueryType * +mp3parse_get_query_types (GstPad * pad G_GNUC_UNUSED) +{ + static const GstQueryType query_types[] = { + GST_QUERY_POSITION, + GST_QUERY_DURATION, + 0 + }; + + return query_types; +} diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/gst/mpegaudioparse/gstmpegaudioparse.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gst_plugins_good/gst/mpegaudioparse/gstmpegaudioparse.h Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,154 @@ +/* GStreamer + * Copyright (C) <1999> Erik Walthinsen + * + * 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. + */ + + +#ifndef __MP3PARSE_H__ +#define __MP3PARSE_H__ + + +#include +#include + +G_BEGIN_DECLS + +#define GST_TYPE_MP3PARSE \ + (gst_mp3parse_get_type()) +#define GST_MP3PARSE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MP3PARSE,GstMPEGAudioParse)) +#define GST_MP3PARSE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MP3PARSE,GstMPEGAudioParseClass)) +#define GST_IS_MP3PARSE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MP3PARSE)) +#define GST_IS_MP3PARSE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MP3PARSE)) + +typedef struct _GstMPEGAudioParse GstMPEGAudioParse; +typedef struct _GstMPEGAudioParseClass GstMPEGAudioParseClass; +typedef struct _MPEGAudioSeekEntry MPEGAudioSeekEntry; +typedef struct _MPEGAudioPendingAccurateSeek MPEGAudioPendingAccurateSeek; + + +struct _MPEGAudioSeekEntry { + gint64 byte; + GstClockTime timestamp; +}; + +struct _MPEGAudioPendingAccurateSeek { + GstSegment segment; + gint64 upstream_start; + GstClockTime timestamp_start; +}; + +struct _GstMPEGAudioParse { + GstElement element; + + GstPad *sinkpad, *srcpad; + + GstSegment segment; + GstClockTime next_ts; + gboolean discont; + + /* Offset as supplied by incoming buffers */ + gint64 cur_offset; + + /* Upcoming timestamp given on an incoming buffer and + * the offset at which it becomes active */ + GstClockTime pending_ts; + gint64 pending_offset; + /* Offset since the last newseg */ + gint64 tracked_offset; + /* tracked_offset when resyncing started */ + gint64 sync_offset; + + GstAdapter *adapter; + + guint skip; /* number of frames to skip */ + guint bit_rate; /* in kbps */ + gint channels, rate, layer, version; + GstClockTime max_bitreservoir; + gint spf; /* Samples per frame */ + + gboolean resyncing; /* True when attempting to resync (stricter checks are + performed) */ + gboolean sent_codec_tag; + + /* VBR tracking */ + guint avg_bitrate; + guint64 bitrate_sum; + guint frame_count; + guint last_posted_bitrate; + gint last_posted_crc; + guint last_posted_channel_mode; + + /* Xing info */ + guint32 xing_flags; + guint32 xing_frames; + GstClockTime xing_total_time; + guint32 xing_bytes; + /* percent -> filepos mapping */ + guchar xing_seek_table[100]; + /* filepos -> percent mapping */ + guint16 xing_seek_table_inverse[256]; + guint32 xing_vbr_scale; + guint xing_bitrate; + + /* VBRI info */ + guint32 vbri_frames; + GstClockTime vbri_total_time; + guint32 vbri_bytes; + guint vbri_bitrate; + guint vbri_seek_points; + guint32 *vbri_seek_table; + gboolean vbri_valid; + + /* Accurate seeking */ + GList *seek_table; + GMutex *pending_seeks_lock; + GSList *pending_accurate_seeks; + gboolean exact_position; + + GSList *pending_nonaccurate_seeks; + + /* Track whether we're seekable (in BYTES format, if upstream operates in + * TIME format, we don't care about seekability and assume upstream handles + * it). The seek table for accurate seeking is not maintained if we're not + * seekable. */ + gboolean seekable; + + /* minimum distance between two index entries */ + GstClockTimeDiff idx_interval; + + /* pending segment */ + GstEvent *pending_segment; + /* pending events */ + GList *pending_events; +}; + +struct _GstMPEGAudioParseClass { + GstElementClass parent_class; +}; + +#ifdef __SYMBIAN32__ +IMPORT_C +#endif +GType gst_mp3parse_get_type(void); + +G_END_DECLS + +#endif /* __MP3PARSE_H__ */ diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/gst/mpegaudioparse/gstxingmux.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gst_plugins_good/gst/mpegaudioparse/gstxingmux.c Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,681 @@ +/* + * Copyright (c) 2006 Christophe Fergeau + * Copyright (c) 2008 Sebastian Dröge + * + * 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. + */ + +/* Xing SDK: http://www.mp3-tech.org/programmer/sources/vbrheadersdk.zip */ + + +/** + * SECTION:element-xingmux + * + * xingmux adds a Xing header to MP3 files. This contains information about the duration and size + * of the file and a seek table and is very useful for getting an almost correct duration and better + * seeking on VBR MP3 files. + * + * This element will remove any existing Xing, LAME or VBRI headers from the beginning of the file. + * + * + * Example launch line + * |[ + * gst-launch audiotestsrc num-buffers=1000 ! audioconvert ! lame ! xingmux ! filesink location=test.mp3 + * gst-launch filesrc location=test.mp3 ! xingmux ! filesink location=test2.mp3 + * gst-launch filesrc location=test.mp3 ! mp3parse ! xingmux ! filesink location=test2.mp3 + * ]| + * + */ + +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + +#include +#include "gstxingmux.h" + +GST_DEBUG_CATEGORY_STATIC (xing_mux_debug); +#define GST_CAT_DEFAULT xing_mux_debug + +GST_BOILERPLATE (GstXingMux, gst_xing_mux, GstElement, GST_TYPE_ELEMENT); + +/* Xing Header stuff */ +#define GST_XING_FRAME_FIELD (1 << 0) +#define GST_XING_BYTES_FIELD (1 << 1) +#define GST_XING_TOC_FIELD (1 << 2) +#define GST_XING_QUALITY_FIELD (1 << 3) + +typedef struct _GstXingSeekEntry +{ + gint64 timestamp; + gint byte; +} GstXingSeekEntry; + +static inline GstXingSeekEntry * +gst_xing_seek_entry_new () +{ + return g_slice_new (GstXingSeekEntry); +} + +static inline void +gst_xing_seek_entry_free (GstXingSeekEntry * entry) +{ + g_slice_free (GstXingSeekEntry, entry); +} + +static void gst_xing_mux_finalize (GObject * obj); +static GstStateChangeReturn +gst_xing_mux_change_state (GstElement * element, GstStateChange transition); +static GstFlowReturn gst_xing_mux_chain (GstPad * pad, GstBuffer * buffer); +static gboolean gst_xing_mux_sink_event (GstPad * pad, GstEvent * event); + +static GstStaticPadTemplate gst_xing_mux_sink_template = +GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("audio/mpeg, " + "mpegversion = (int) 1, " "layer = (int) [ 1, 3 ]")); + + +static GstStaticPadTemplate gst_xing_mux_src_template = +GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("audio/mpeg, " + "mpegversion = (int) 1, " "layer = (int) [ 1, 3 ]")); +static const guint mp3types_bitrates[2][3][16] = { + { + {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448,}, + {0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384,}, + {0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320,} + }, + { + {0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256,}, + {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160,}, + {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160,} + }, +}; + +static const guint mp3types_freqs[3][3] = { {44100, 48000, 32000}, +{22050, 24000, 16000}, +{11025, 12000, 8000} +}; + +static gboolean +parse_header (guint32 header, guint * ret_size, guint * ret_spf, + gulong * ret_rate) +{ + guint length, spf; + gulong samplerate, bitrate, layer, padding; + gint lsf, mpg25; + + if ((header & 0xffe00000) != 0xffe00000) { + g_warning ("invalid sync"); + return FALSE; + } + + if (((header >> 19) & 3) == 0x01) { + g_warning ("invalid MPEG version"); + return FALSE; + } + + if (((header >> 17) & 3) == 0x00) { + g_warning ("invalid MPEG layer"); + return FALSE; + } + + if (((header >> 12) & 0xf) == 0xf || ((header >> 12) & 0xf) == 0x0) { + g_warning ("invalid bitrate"); + return FALSE; + } + + if (((header >> 10) & 0x3) == 0x3) { + g_warning ("invalid sampling rate"); + return FALSE; + } + + if (header & 0x00000002) { + g_warning ("invalid emphasis"); + return FALSE; + } + + if (header & (1 << 20)) { + lsf = (header & (1 << 19)) ? 0 : 1; + mpg25 = 0; + } else { + lsf = 1; + mpg25 = 1; + } + + layer = 4 - ((header >> 17) & 0x3); + + bitrate = (header >> 12) & 0xF; + bitrate = mp3types_bitrates[lsf][layer - 1][bitrate] * 1000; + if (bitrate == 0) + return 0; + + samplerate = (header >> 10) & 0x3; + samplerate = mp3types_freqs[lsf + mpg25][samplerate]; + + padding = (header >> 9) & 0x1; + + switch (layer) { + case 1: + length = 4 * ((bitrate * 12) / samplerate + padding); + break; + case 2: + length = (bitrate * 144) / samplerate + padding; + break; + default: + case 3: + length = (bitrate * 144) / (samplerate << lsf) + padding; + break; + } + + if (layer == 1) + spf = 384; + else if (layer == 2 || lsf == 0) + spf = 1152; + else + spf = 576; + + if (ret_size) + *ret_size = length; + if (ret_spf) + *ret_spf = spf; + if (ret_rate) + *ret_rate = samplerate; + + return TRUE; +} + +static guint +get_xing_offset (guint32 header) +{ + guint mpeg_version = (header >> 19) & 0x3; + guint channel_mode = (header >> 6) & 0x3; + + if (mpeg_version == 0x3) { + if (channel_mode == 0x3) { + return 0x11; + } else { + return 0x20; + } + } else { + if (channel_mode == 0x3) { + return 0x09; + } else { + return 0x11; + } + } +} + +static gboolean +has_xing_header (guint32 header, guchar * data, gsize size) +{ + data += 4; + data += get_xing_offset (header); + + if (memcmp (data, "Xing", 4) == 0 || + memcmp (data, "Info", 4) == 0 || memcmp (data, "VBRI", 4) == 0) + return TRUE; + else + return FALSE; +} + +static GstBuffer * +generate_xing_header (GstXingMux * xing) +{ + guint8 *xing_flags; + guint32 xing_flags_tmp = 0; + GstBuffer *xing_header; + guchar *data; + + guint32 header; + guint32 header_be; + guint size, spf, xing_offset; + gulong rate; + guint bitrate = 0x00; + + gint64 duration; + gint64 byte_count; + + header = xing->first_header; + + /* Set bitrate and choose lowest possible size */ + do { + bitrate++; + + header &= 0xffff0fff; + header |= bitrate << 12; + + parse_header (header, &size, &spf, &rate); + xing_offset = get_xing_offset (header); + } while (size < (4 + xing_offset + 4 + 4 + 4 + 4 + 100) && bitrate < 0xe); + + if (bitrate == 0xe) { + GST_ERROR ("No usable bitrate found!"); + return NULL; + } + + if (gst_pad_alloc_buffer_and_set_caps (xing->srcpad, 0, size, + GST_PAD_CAPS (xing->srcpad), &xing_header) != GST_FLOW_OK) { + xing_header = gst_buffer_new_and_alloc (size); + gst_buffer_set_caps (xing_header, GST_PAD_CAPS (xing->srcpad)); + } + + data = GST_BUFFER_DATA (xing_header); + memset (data, 0, size); + header_be = GUINT32_TO_BE (header); + memcpy (data, &header_be, 4); + + data += 4; + data += xing_offset; + + memcpy (data, "Xing", 4); + data += 4; + + xing_flags = data; + data += 4; + + if (xing->duration != GST_CLOCK_TIME_NONE) { + duration = xing->duration; + } else { + GstFormat fmt = GST_FORMAT_TIME; + + if (!gst_pad_query_peer_duration (xing->sinkpad, &fmt, &duration)) + duration = GST_CLOCK_TIME_NONE; + } + + if (duration != GST_CLOCK_TIME_NONE) { + guint32 number_of_frames; + + /* The Xing Header contains a NumberOfFrames field, which verifies to: + * Duration = NumberOfFrames *SamplesPerFrame/SamplingRate + * SamplesPerFrame and SamplingRate are values for the current frame. + */ + number_of_frames = gst_util_uint64_scale (duration, rate, GST_SECOND) / spf; + GST_DEBUG ("Setting number of frames to %u", number_of_frames); + number_of_frames = GUINT32_TO_BE (number_of_frames); + memcpy (data, &number_of_frames, 4); + xing_flags_tmp |= GST_XING_FRAME_FIELD; + data += 4; + } + + if (xing->byte_count != 0) { + byte_count = xing->byte_count; + } else { + GstFormat fmt = GST_FORMAT_BYTES; + + if (!gst_pad_query_peer_duration (xing->sinkpad, &fmt, &byte_count)) + byte_count = 0; + if (byte_count == -1) + byte_count = 0; + } + + if (byte_count != 0) { + guint32 nbytes; + + if (byte_count > G_MAXUINT32) { + GST_DEBUG ("Too large stream: %" G_GINT64_FORMAT " > %u bytes", + byte_count, G_MAXUINT32); + } else { + nbytes = byte_count; + GST_DEBUG ("Setting number of bytes to %u", nbytes); + nbytes = GUINT32_TO_BE (nbytes); + memcpy (data, &nbytes, 4); + xing_flags_tmp |= GST_XING_BYTES_FIELD; + data += 4; + } + } + + if (xing->seek_table != NULL && byte_count != 0 + && duration != GST_CLOCK_TIME_NONE) { + GList *it; + gint percent = 0; + + xing_flags_tmp |= GST_XING_TOC_FIELD; + + GST_DEBUG ("Writing seek table"); + for (it = xing->seek_table; it != NULL && percent < 100; it = it->next) { + GstXingSeekEntry *entry = (GstXingSeekEntry *) it->data; + gint64 pos; + guchar byte; + + while ((entry->timestamp * 100) / duration >= percent) { + pos = (entry->byte * 256) / byte_count; + GST_DEBUG (" %d %% -- %" G_GINT64_FORMAT " 1/256", percent, pos); + byte = (guchar) pos; + memcpy (data, &byte, 1); + data++; + percent++; + } + } + + if (percent < 100) { + guchar b; + gint i; + + memcpy (&b, data - 1, 1); + + for (i = percent; i < 100; i++) { + GST_DEBUG (" %d %% -- %d 1/256", i, b); + memcpy (data, &b, 1); + data++; + } + } + } + + GST_DEBUG ("Setting Xing flags to 0x%x\n", xing_flags_tmp); + xing_flags_tmp = GUINT32_TO_BE (xing_flags_tmp); + memcpy (xing_flags, &xing_flags_tmp, 4); + return xing_header; +} + +static void +gst_xing_mux_base_init (gpointer g_class) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); + + static const GstElementDetails gst_xing_mux_details = + GST_ELEMENT_DETAILS ("MP3 Xing muxer", + "Formatter/Metadata", + "Adds a Xing header to the beginning of a VBR MP3 file", + "Christophe Fergeau "); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_xing_mux_src_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_xing_mux_sink_template)); + + GST_DEBUG_CATEGORY_INIT (xing_mux_debug, "xingmux", 0, "Xing Header Muxer"); + + gst_element_class_set_details (element_class, &gst_xing_mux_details); +} + +static void +gst_xing_mux_class_init (GstXingMuxClass * klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + + gobject_class = (GObjectClass *) klass; + gstelement_class = (GstElementClass *) klass; + + gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_xing_mux_finalize); + gstelement_class->change_state = + GST_DEBUG_FUNCPTR (gst_xing_mux_change_state); +} + +static void +gst_xing_mux_finalize (GObject * obj) +{ + GstXingMux *xing = GST_XING_MUX (obj); + + if (xing->adapter) { + g_object_unref (xing->adapter); + xing->adapter = NULL; + } + + if (xing->seek_table) { + g_list_foreach (xing->seek_table, (GFunc) gst_xing_seek_entry_free, NULL); + g_list_free (xing->seek_table); + xing->seek_table = NULL; + } + + G_OBJECT_CLASS (parent_class)->finalize (obj); +} + +static void +xing_reset (GstXingMux * xing) +{ + xing->duration = GST_CLOCK_TIME_NONE; + xing->byte_count = 0; + + gst_adapter_clear (xing->adapter); + + if (xing->seek_table) { + g_list_foreach (xing->seek_table, (GFunc) gst_xing_seek_entry_free, NULL); + g_list_free (xing->seek_table); + xing->seek_table = NULL; + } + + xing->sent_xing = FALSE; +} + + +static void +gst_xing_mux_init (GstXingMux * xing, GstXingMuxClass * xingmux_class) +{ + GstElementClass *klass = GST_ELEMENT_CLASS (xingmux_class); + + /* pad through which data comes in to the element */ + xing->sinkpad = + gst_pad_new_from_template (gst_element_class_get_pad_template (klass, + "sink"), "sink"); + gst_pad_set_setcaps_function (xing->sinkpad, + GST_DEBUG_FUNCPTR (gst_pad_proxy_setcaps)); + gst_pad_set_chain_function (xing->sinkpad, + GST_DEBUG_FUNCPTR (gst_xing_mux_chain)); + gst_pad_set_event_function (xing->sinkpad, + GST_DEBUG_FUNCPTR (gst_xing_mux_sink_event)); + gst_element_add_pad (GST_ELEMENT (xing), xing->sinkpad); + + /* pad through which data goes out of the element */ + xing->srcpad = + gst_pad_new_from_template (gst_element_class_get_pad_template (klass, + "src"), "src"); + gst_element_add_pad (GST_ELEMENT (xing), xing->srcpad); + + xing->adapter = gst_adapter_new (); + + xing_reset (xing); +} + +static GstFlowReturn +gst_xing_mux_chain (GstPad * pad, GstBuffer * buffer) +{ + GstXingMux *xing = GST_XING_MUX (GST_PAD_PARENT (pad)); + GstFlowReturn ret = GST_FLOW_OK; + + gst_adapter_push (xing->adapter, buffer); + + while (gst_adapter_available (xing->adapter) >= 4) { + const guchar *data = gst_adapter_peek (xing->adapter, 4); + guint32 header; + GstBuffer *outbuf; + GstClockTime duration; + guint size, spf; + gulong rate; + GstXingSeekEntry *seek_entry; + + header = GST_READ_UINT32_BE (data); + + if (!parse_header (header, &size, &spf, &rate)) { + GST_DEBUG ("Lost sync, resyncing"); + gst_adapter_flush (xing->adapter, 1); + continue; + } + + if (gst_adapter_available (xing->adapter) < size) + break; + + outbuf = gst_adapter_take_buffer (xing->adapter, size); + gst_buffer_set_caps (outbuf, GST_PAD_CAPS (xing->srcpad)); + + if (!xing->sent_xing) { + if (has_xing_header (header, GST_BUFFER_DATA (outbuf), size)) { + GST_LOG_OBJECT (xing, "Dropping old Xing header"); + gst_buffer_unref (outbuf); + continue; + } else { + GstBuffer *xing_header; + guint64 xing_header_size; + + xing->first_header = header; + + xing_header = generate_xing_header (xing); + + if (xing_header == NULL) { + GST_ERROR ("Can't generate Xing header"); + gst_buffer_unref (outbuf); + return GST_FLOW_ERROR; + } + + xing_header_size = GST_BUFFER_SIZE (xing_header); + + if (GST_FLOW_IS_FATAL (ret = gst_pad_push (xing->srcpad, xing_header))) { + GST_ERROR_OBJECT (xing, "Failed to push Xing header: %s", + gst_flow_get_name (ret)); + gst_buffer_unref (xing_header); + gst_buffer_unref (outbuf); + return ret; + } + + xing->byte_count += xing_header_size; + xing->sent_xing = TRUE; + } + } + + seek_entry = gst_xing_seek_entry_new (); + seek_entry->timestamp = + (xing->duration == GST_CLOCK_TIME_NONE) ? 0 : xing->duration; + /* Workaround for parsers checking that the first seek table entry is 0 */ + seek_entry->byte = (seek_entry->timestamp == 0) ? 0 : xing->byte_count; + xing->seek_table = g_list_append (xing->seek_table, seek_entry); + + duration = gst_util_uint64_scale (spf, GST_SECOND, rate); + + GST_BUFFER_TIMESTAMP (outbuf) = + (xing->duration == GST_CLOCK_TIME_NONE) ? 0 : xing->duration; + GST_BUFFER_DURATION (outbuf) = duration; + GST_BUFFER_OFFSET (outbuf) = xing->byte_count; + GST_BUFFER_OFFSET_END (outbuf) = + xing->byte_count + GST_BUFFER_SIZE (outbuf); + + xing->byte_count += GST_BUFFER_SIZE (outbuf); + + if (xing->duration == GST_CLOCK_TIME_NONE) + xing->duration = duration; + else + xing->duration += duration; + + if (GST_FLOW_IS_FATAL (ret = gst_pad_push (xing->srcpad, outbuf))) { + GST_ERROR_OBJECT (xing, "Failed to push MP3 frame: %s", + gst_flow_get_name (ret)); + return ret; + } + } + + return ret; +} + +static gboolean +gst_xing_mux_sink_event (GstPad * pad, GstEvent * event) +{ + GstXingMux *xing; + gboolean result; + + xing = GST_XING_MUX (gst_pad_get_parent (pad)); + + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_NEWSEGMENT: + if (xing->sent_xing) { + GST_ERROR ("Already sent Xing header, dropping NEWSEGMENT event!"); + gst_event_unref (event); + result = FALSE; + } else { + GstFormat fmt; + + gst_event_parse_new_segment (event, NULL, NULL, &fmt, NULL, NULL, NULL); + + if (fmt == GST_FORMAT_BYTES) { + result = gst_pad_push_event (xing->srcpad, event); + } else { + gst_event_unref (event); + + event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES, + 0, GST_CLOCK_TIME_NONE, 0); + + result = gst_pad_push_event (xing->srcpad, event); + } + } + break; + + case GST_EVENT_EOS:{ + GstEvent *n_event; + + GST_DEBUG_OBJECT (xing, "handling EOS event"); + + if (xing->sent_xing) { + + n_event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES, + 0, GST_CLOCK_TIME_NONE, 0); + + if (G_UNLIKELY (!gst_pad_push_event (xing->srcpad, n_event))) { + GST_WARNING + ("Failed to seek to position 0 for pushing the Xing header"); + } else { + GstBuffer *header; + GstFlowReturn ret; + + header = generate_xing_header (xing); + + if (header == NULL) { + GST_ERROR ("Can't generate Xing header"); + } else { + + GST_INFO ("Writing real Xing header to beginning of stream"); + + if (GST_FLOW_IS_FATAL (ret = gst_pad_push (xing->srcpad, header))) + GST_WARNING ("Failed to push updated Xing header: %s\n", + gst_flow_get_name (ret)); + } + } + } + result = gst_pad_push_event (xing->srcpad, event); + break; + } + default: + result = gst_pad_event_default (pad, event); + break; + } + gst_object_unref (GST_OBJECT (xing)); + + return result; +} + + +static GstStateChangeReturn +gst_xing_mux_change_state (GstElement * element, GstStateChange transition) +{ + GstXingMux *xing; + GstStateChangeReturn result; + + xing = GST_XING_MUX (element); + + result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + + switch (transition) { + case GST_STATE_CHANGE_PAUSED_TO_READY: + xing_reset (xing); + break; + default: + break; + } + + return result; +} diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/gst/mpegaudioparse/gstxingmux.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gst_plugins_good/gst/mpegaudioparse/gstxingmux.h Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2006 Christophe Fergeau + * Copyright (c) 2008 Sebastian Dröge + * + * 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 + +#ifndef __GST_XINGMUX_H__ +#define __GST_XINGMUX_H__ + +G_BEGIN_DECLS + +/* Standard macros for defining types for this element. */ +#define GST_TYPE_XING_MUX \ + (gst_xing_mux_get_type()) +#define GST_XING_MUX(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_XING_MUX,GstXingMux)) +#define GST_XING_MUX_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_XING_MUX,GstXingMuxClass)) +#define GST_IS_XING_MUX(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_XING_MUX)) +#define GST_IS_XING_MUX_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_XING_MUX)) + +typedef struct _GstXingMux GstXingMux; +typedef struct _GstXingMuxClass GstXingMuxClass; + +/* Definition of structure storing data for this element. */ + +/** + * GstXingMux: + * + * Opaque data structure. + */ +struct _GstXingMux { + GstElement element; + + GstPad *sinkpad, *srcpad; + + /* < private > */ + + GstAdapter *adapter; + GstClockTime duration; + guint64 byte_count; + guint64 frame_count; + GList *seek_table; + gboolean sent_xing; + + /* Copy of the first frame header */ + guint32 first_header; +}; + +/* Standard definition defining a class for this element. */ + +/** + * GstXingMuxClass: + * + * Opaque data structure. + */ +struct _GstXingMuxClass { + GstElementClass parent_class; +}; + +/* Standard function returning type information. */ +#ifdef __SYMBIAN32__ +IMPORT_C +#endif +GType gst_xing_mux_get_type (void); + +G_END_DECLS + +#endif /* __GST_XINGMUX_H__ */ diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/gst/mpegaudioparse/plugin.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gst_plugins_good/gst/mpegaudioparse/plugin.c Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,49 @@ +/* GStreamer + * Copyright (C) <2008> Jan Schmidt + * + * 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. + */ + +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + +#include +#include "gstmpegaudioparse.h" +#include "gstxingmux.h" + +static gboolean +plugin_init (GstPlugin * plugin) +{ + if (!gst_element_register (plugin, "xingmux", GST_RANK_NONE, + GST_TYPE_XING_MUX)) + return FALSE; + if (!gst_element_register (plugin, "mp3parse", GST_RANK_PRIMARY + 1, + GST_TYPE_MP3PARSE)) + return FALSE; + + return TRUE; +} + +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "mpegaudioparse", + "MPEG-1 layer 1/2/3 audio stream elements", + plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); +EXPORT_C GstPluginDesc* _GST_PLUGIN_DESC() +{ + return &gst_plugin_desc; +} diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/gst/qtdemux/gstrtpxqtdepay.h --- a/gst_plugins_good/gst/qtdemux/gstrtpxqtdepay.h Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/gst/qtdemux/gstrtpxqtdepay.h Fri May 14 18:43:44 2010 -0500 @@ -57,6 +57,9 @@ GstBaseRTPDepayloadClass parent_class; }; +#ifdef __SYMBIAN32__ +IMPORT_C +#endif GType gst_rtp_xqt_depay_get_type (void); G_END_DECLS diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/gst/qtdemux/qtdemux.c --- a/gst_plugins_good/gst/qtdemux/qtdemux.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/gst/qtdemux/qtdemux.c Fri May 14 18:43:44 2010 -0500 @@ -4797,7 +4797,10 @@ /* re-route to normal string tag if not 3GP */ if (!qtdemux_is_string_3gp (qtdemux, FOURCC_kywd)) - return qtdemux_tag_add_str (qtdemux, tag, dummy, node); + { + qtdemux_tag_add_str (qtdemux, tag, dummy, node); + return ; + } GST_DEBUG_OBJECT (qtdemux, "found 3gpp keyword tag"); @@ -5013,7 +5016,10 @@ /* re-route to normal string tag if 3GP */ if (qtdemux_is_string_3gp (qtdemux, FOURCC_gnre)) - return qtdemux_tag_add_str (qtdemux, tag, dummy, node); + { + qtdemux_tag_add_str (qtdemux, tag, dummy, node); + return; + } data = qtdemux_tree_get_child_by_type (node, FOURCC_data); if (data) { diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_good/gst/qtdemux/qtdemux.h --- a/gst_plugins_good/gst/qtdemux/qtdemux.h Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_good/gst/qtdemux/qtdemux.h Fri May 14 18:43:44 2010 -0500 @@ -101,6 +101,9 @@ GstElementClass parent_class; }; +#ifdef __SYMBIAN32__ +IMPORT_C +#endif GType gst_qtdemux_get_type (void); G_END_DECLS diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/group/gstamrmux.mmp --- a/gst_plugins_symbian/group/gstamrmux.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/group/gstamrmux.mmp Fri May 14 18:43:44 2010 -0500 @@ -37,14 +37,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE - - -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/group/gstdevsoundext.mmp --- a/gst_plugins_symbian/group/gstdevsoundext.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/group/gstdevsoundext.mmp Fri May 14 18:43:44 2010 -0500 @@ -44,10 +44,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE - -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/audio +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../gst/devsound SOURCE gsterrorconcealment.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/group/gstdevsoundsink.mmp --- a/gst_plugins_symbian/group/gstdevsoundsink.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/group/gstdevsoundsink.mmp Fri May 14 18:43:44 2010 -0500 @@ -44,10 +44,8 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE +MW_LAYER_GSTREAMER_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/audio SOURCEPATH ../gst/devsound SOURCE gstdevsoundsinkaudio.c diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/group/gstdevsoundsrc.mmp --- a/gst_plugins_symbian/group/gstdevsoundsrc.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/group/gstdevsoundsrc.mmp Fri May 14 18:43:44 2010 -0500 @@ -43,10 +43,8 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE +MW_LAYER_GSTREAMER_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/audio SOURCEPATH ../gst/devsound diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/AudioRecordBin/group/GstAudioRecordBin.mmp --- a/gst_plugins_symbian/gst/AudioRecordBin/group/GstAudioRecordBin.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/AudioRecordBin/group/GstAudioRecordBin.mmp Fri May 14 18:43:44 2010 -0500 @@ -39,10 +39,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE - -USERINCLUDE ../../../../include/gstreamer -USERINCLUDE ../../../../include/gstreamer/gst -USERINCLUDE ../../../../include/gstreamer/gst/audio +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../inc diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/AudioRecordBin/src/GstAudioRecordBin.cpp --- a/gst_plugins_symbian/gst/AudioRecordBin/src/GstAudioRecordBin.cpp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/AudioRecordBin/src/GstAudioRecordBin.cpp Fri May 14 18:43:44 2010 -0500 @@ -29,6 +29,10 @@ #include GST_DEBUG_CATEGORY_STATIC (aud_recbin_cat); // define category (statically) +#ifdef GST_CAT_DEFAULT +#undef GST_CAT_DEFAULT +#endif + #define GST_CAT_DEFAULT aud_recbin_cat // set as default /** Macro to enable weak ref monitoring, used to track @@ -56,9 +60,10 @@ /** The caps expected to be supported by a src pad */ GstCaps* srcCaps; } FilterData; - +#ifdef ENABLE_CAPS_FILTER /** Create the capability filter */ static GstElement* sCreateCapsFilter( GstCaps* encCaps); +#endif /** Creates the element , which accepts \a sinkcaps and * provides \a srccaps on the src pad */ @@ -537,6 +542,7 @@ gst_object_unref( encbin ); return NULL; } +#ifdef ENABLE_CAPS_FILTER /** Create the caps filter */ GstElement* sCreateCapsFilter( GstCaps* encCaps) { @@ -552,7 +558,7 @@ return audiofilter; } - +#endif /** Create a filter, which accepts \a encCaps on sink pad and * provides \a muxCaps on the src pad */ GstElement* sCreateCompatibleFilter(GstFactoryListType type, diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/amrmux/gstamrmux.c --- a/gst_plugins_symbian/gst/amrmux/gstamrmux.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/amrmux/gstamrmux.c Fri May 14 18:43:44 2010 -0500 @@ -97,7 +97,7 @@ gst_amrmux_type = g_type_register_static (GST_TYPE_ELEMENT, "GstAmrMux", - &amrmux_info, 0); + &amrmux_info, (GTypeFlags)0); } return gst_amrmux_type; } @@ -138,7 +138,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_HEADER, g_param_spec_boolean ("header", "header", - "For writing AMR header", TRUE, G_PARAM_READWRITE)); + "For writing AMR header", TRUE, (GParamFlags)G_PARAM_READWRITE)); } diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/devsound/devsoundsrcwrapper.cpp --- a/gst_plugins_symbian/gst/devsound/devsoundsrcwrapper.cpp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/devsound/devsoundsrcwrapper.cpp Fri May 14 18:43:44 2010 -0500 @@ -307,7 +307,7 @@ g_list_foreach(ds->fmt, (GFunc) g_free, NULL); g_list_free(ds->fmt); - + ds->fmt = NULL; delete (STATIC_CAST(DevSoundWrapperSrc*, ds->handle))->iAudoInputRecord; delete ds->handle; TRACE_PRN_FN_EXT; diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/devsound/gstdevsoundsink.c --- a/gst_plugins_symbian/gst/devsound/gstdevsoundsink.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/devsound/gstdevsoundsink.c Fri May 14 18:43:44 2010 -0500 @@ -38,6 +38,10 @@ GST_DEBUG_CATEGORY_EXTERN (devsound_debug); +#ifdef GST_CAT_DEFAULT +#undef GST_CAT_DEFAULT +#endif + #define GST_CAT_DEFAULT devsound_debug /* elementfactory information */ @@ -81,7 +85,7 @@ //Error concealment interface impl static void gst_error_concealment_handler_init (gpointer g_iface, gpointer iface_data); -static gint gst_ConcealErrorForNextBuffer(); +static gint gst_ConcealErrorForNextBuffer(void); static gint gst_SetFrameMode(gboolean aFrameMode); static gint gst_FrameModeRqrdForEC(gboolean* aFrameModeRqrd); static void gst_Apply_ErrorConcealment_Update(GstDevsoundSink* dssink); @@ -99,7 +103,7 @@ //G729 interface impl static void gst_g729_decoder_handler_init (gpointer g_iface, gpointer iface_data); -static gint gst_BadLsfNextBuffer(); +static gint gst_BadLsfNextBuffer(void); static void gst_Apply_G729_Decoder_Update(GstDevsoundSink* dssink ); //Ilbc interface impl @@ -207,7 +211,7 @@ "audio/AMR, " "rate = (int) 8000, " "channels = (int) 1 ; " "audio/x-alaw, " "rate = (int) [ 8000, 48000 ], " "channels = (int) [ 1, 2 ]; " "audio/g729, " "rate = (int) [ 8000, 48000 ], " "channels = (int) [ 1, 2 ]; " - "audio/mp3, " "rate = (int) [ 8000, 48000 ], " "channels = (int) [ 1, 2 ]; " + "audio/mpeg, mpegversion = (int) 1, layer = (int) [ 1, 3 ], rate = (int) [ 8000, 48000 ], channels = (int) [ 1, 2 ]; " "audio/ilbc, " "rate = (int) [ 8000, 48000 ], " "channels = (int) [ 1, 2 ]; " "audio/x-mulaw, " "rate = (int) [ 8000, 48000 ], " "channels = (int) [ 1, 2 ]") ); @@ -260,7 +264,7 @@ devsoundsink_type = g_type_register_static (GST_TYPE_BASE_SINK, "GstDevsoundSink", - &devsoundsink_info, 0); + &devsoundsink_info, (GTypeFlags)0); g_type_add_interface_static (devsoundsink_type, GST_TYPE_ERROR_CONCEALMENT, @@ -334,15 +338,15 @@ g_object_class_install_property(gobject_class, PROP_DEVICE, g_param_spec_string("device", "Device", "Devsound device ", - DEFAULT_DEVICE, G_PARAM_READWRITE)); + DEFAULT_DEVICE, (GParamFlags)G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, VOLUME, g_param_spec_int("volume", "Volume", "Devsound volume", - -1, G_MAXINT, -1, G_PARAM_READWRITE)); + -1, G_MAXINT, -1, (GParamFlags)G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, VOLUMERAMP, g_param_spec_int("volumeramp", "VolumeRamp", "Devsound volume ramp", - -1, G_MAXINT, -1, G_PARAM_READWRITE)); + -1, G_MAXINT, -1, (GParamFlags)G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, MAXVOLUME, g_param_spec_int("maxvolume", "MaxVolume", "Devsound max volume", @@ -350,11 +354,11 @@ g_object_class_install_property(gobject_class, LEFTBALANCE, g_param_spec_int("leftbalance", "Left Balance", "Left Balance", - -1, G_MAXINT, -1, G_PARAM_READWRITE)); + -1, G_MAXINT, -1, (GParamFlags)G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, RIGHTBALANCE, g_param_spec_int("rightbalance", "Right Balance", "Right Balance", - -1, G_MAXINT, -1, G_PARAM_READWRITE)); + -1, G_MAXINT, -1, (GParamFlags)G_PARAM_READWRITE)); /* g_object_class_install_property(gobject_class, SAMPLESPLAYED, g_param_spec_int("samplesplayed", "Samples Played", "Samples Played", @@ -363,12 +367,12 @@ g_object_class_install_property(gobject_class, PRIORITY, g_param_spec_int("priority", "Priority", "Priority ", -1, G_MAXINT, -1, - G_PARAM_READWRITE)); + (GParamFlags)G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, PREFERENCE, g_param_spec_int("preference", "Preference", "Preference ", -1, G_MAXINT, -1, - G_PARAM_READWRITE)); + (GParamFlags)G_PARAM_READWRITE)); /* g_object_class_install_property(gobject_class, RATE, g_param_spec_int("rate", "Rate", "Rate ", -1, @@ -383,7 +387,7 @@ g_object_class_install_property(gobject_class, OUTPUTDEVICE, g_param_spec_int("outputdevice", "Output Device", "Output Device ", -1, G_MAXINT, -1, - G_PARAM_READWRITE)); + (GParamFlags)G_PARAM_READWRITE)); #ifdef AV_SYNC gstelement_class->provide_clock = GST_DEBUG_FUNCPTR (gst_devsound_sink_provide_clock); @@ -821,7 +825,7 @@ { devsoundsink->fourcc = 0x39323747; //KMccFourCCIdG729 } - else if (!strncmp(mimetype, "audio/mp3", 9)) + else if (!strncmp(mimetype, "audio/mpeg", 10)) { devsoundsink->fourcc = 0x33504d20; //KMMFFourCCCodeMP3 } @@ -1221,6 +1225,7 @@ static gint gst_BadLsfNextBuffer() { customInfaceUpdate.g729badlsfnextbufferupdate = TRUE; + return 0; } static void gst_Apply_G729_Decoder_Update(GstDevsoundSink* dssink ) diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/devsound/gstdevsoundsrc.c --- a/gst_plugins_symbian/gst/devsound/gstdevsoundsrc.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/devsound/gstdevsoundsrc.c Fri May 14 18:43:44 2010 -0500 @@ -36,6 +36,10 @@ #include "string.h" GST_DEBUG_CATEGORY_EXTERN (devsoundsrc_debug); +#ifdef GST_CAT_DEFAULT +#undef GST_CAT_DEFAULT +#endif + #define GST_CAT_DEFAULT devsoundsrc_debug /* elementfactory information */ @@ -284,7 +288,7 @@ devsoundsrc_type = g_type_register_static (GST_TYPE_PUSH_SRC, "GstDevsoundSrc", - &devsoundsrc_info, 0); + &devsoundsrc_info, (GTypeFlags)0); g_type_add_interface_static (devsoundsrc_type, GST_TYPE_SPEECH_ENCODER_CONFIG, &speech_encoder_config_info); @@ -331,11 +335,11 @@ g_object_class_install_property(gobject_class, PROP_DEVICE, g_param_spec_string("device", "Device", "Devsound device ", - DEFAULT_DEVICE, G_PARAM_READWRITE)); + DEFAULT_DEVICE, (GParamFlags)G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, GAIN, g_param_spec_int( "gain", "Gain", "Devsound src gain", -1, G_MAXINT, -1, - G_PARAM_READWRITE)); + (GParamFlags)G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, MAXGAIN, g_param_spec_int( "maxgain", "MaxGain", "Devsound src max gain", -1, G_MAXINT, -1, @@ -343,11 +347,11 @@ g_object_class_install_property(gobject_class, LEFTBALANCE, g_param_spec_int("leftbalance", "Left Balance", "Left Balance", - -1, G_MAXINT, -1, G_PARAM_READWRITE)); + -1, G_MAXINT, -1, (GParamFlags)G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, RIGHTBALANCE, g_param_spec_int("rightbalance", "Right Balance", - "Right Balance", -1, G_MAXINT, -1, G_PARAM_READWRITE)); + "Right Balance", -1, G_MAXINT, -1, (GParamFlags)G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, SAMPLESRECORDED, g_param_spec_int("samplesrecorded", "Samples Recorded", @@ -356,22 +360,22 @@ g_object_class_install_property(gobject_class, PRIORITY, g_param_spec_int("priority", "Priority", "Priority ", -1, G_MAXINT, -1, - G_PARAM_READWRITE)); + (GParamFlags)G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, PREFERENCE, g_param_spec_int("preference", "Preference", "Preference ", -1, G_MAXINT, -1, - G_PARAM_READWRITE)); + (GParamFlags)G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, RATE, g_param_spec_int("rate", "Rate", "Rate ", -1, G_MAXINT, -1, - G_PARAM_READWRITE)); + (GParamFlags)G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, CHANNELS, g_param_spec_int("channels", "Channels", "Channels ", -1, G_MAXINT, -1, - G_PARAM_READWRITE)); + (GParamFlags)G_PARAM_READWRITE)); gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_devsound_src_start); gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_devsound_src_stop); @@ -390,8 +394,9 @@ devsoundsrc->handle=NULL; devsoundsrc->preference = 0; //default=>EMdaPriorityPreferenceNone; devsoundsrc->priority = 0; //default=>EMdaPriorityNormal; - pthread_mutex_init(&create_mutex1, NULL); - pthread_cond_init(&create_condition1, NULL); + devsoundsrc->firstimecreatecalled = 0; +// pthread_mutex_init(&create_mutex1, NULL); +// pthread_cond_init(&create_condition1, NULL); //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) devsoundsrc, "gst_devsound_src_init EXIT ",NULL); } @@ -495,6 +500,7 @@ pthread_mutex_unlock(&(create_mutex1)); // TODO obtain mutex here consumer_thread_state = CONSUMER_THREAD_UNINITIALIZED; + devsoundsrc->firstimecreatecalled = 0; pthread_exit(NULL); } break; @@ -684,7 +690,9 @@ GstBuffer *tmp_gstbuffer=NULL; GstDevsoundSrc *src= GST_DEVSOUND_SRC(bsrc); //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) src, "gst_devsound_src_start ENTER ",NULL); - + pthread_mutex_init(&create_mutex1, NULL); + pthread_cond_init(&create_condition1, NULL); + if(dataqueue) { while (g_queue_get_length(dataqueue)) @@ -763,6 +771,7 @@ pthread_cond_destroy(&(create_condition1)); g_free(src->device); + src->device = NULL; //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) src, "gst_devsound_src_stop EXIT "); return TRUE; } @@ -905,6 +914,11 @@ popBuffer = NULL; } } + if( dsrc->firstimecreatecalled < 2 ) + {/// nitin changes + ++dsrc->firstimecreatecalled; + return GST_FLOW_OK; + } } //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) dsrc, "gst_devsound_src_create EXIT ",NULL); return GST_FLOW_OK; diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/devsound/gstdevsoundsrc.h --- a/gst_plugins_symbian/gst/devsound/gstdevsoundsrc.h Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/devsound/gstdevsoundsrc.h Fri May 14 18:43:44 2010 -0500 @@ -86,6 +86,7 @@ gboolean g729vadmode; gint ilbcencodemode; gboolean ilbcvadmode; + gint firstimecreatecalled; }; diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/devsound/gsterrorconcealment.c --- a/gst_plugins_symbian/gst/devsound/gsterrorconcealment.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/devsound/gsterrorconcealment.c Fri May 14 18:43:44 2010 -0500 @@ -54,7 +54,7 @@ error_concealment_type = g_type_register_static (G_TYPE_INTERFACE, "GstErrorConcealment", - &error_concealment_info, 0); + &error_concealment_info, (GTypeFlags)0); } diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/devsound/gstg711decoderinterface.c --- a/gst_plugins_symbian/gst/devsound/gstg711decoderinterface.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/devsound/gstg711decoderinterface.c Fri May 14 18:43:44 2010 -0500 @@ -56,7 +56,7 @@ g711_decoder_type = g_type_register_static (G_TYPE_INTERFACE, "GstG711DecoderInterface", - &g711_decoder_info, 0); + &g711_decoder_info, (GTypeFlags)0); } diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/devsound/gstg711encoderinterface.c --- a/gst_plugins_symbian/gst/devsound/gstg711encoderinterface.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/devsound/gstg711encoderinterface.c Fri May 14 18:43:44 2010 -0500 @@ -55,7 +55,7 @@ g711_encoder_type = g_type_register_static (G_TYPE_INTERFACE, "GstG711EncoderInterface", - &g711_encoder_info, 0); + &g711_encoder_info, (GTypeFlags)0); } diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/devsound/gstg729decoderinterface.c --- a/gst_plugins_symbian/gst/devsound/gstg729decoderinterface.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/devsound/gstg729decoderinterface.c Fri May 14 18:43:44 2010 -0500 @@ -55,7 +55,7 @@ g729_decoder_type = g_type_register_static (G_TYPE_INTERFACE, "GstG729DecoderInterface", - &g729_decoder_info, 0); + &g729_decoder_info, (GTypeFlags)0); } diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/devsound/gstg729encoderinterface.c --- a/gst_plugins_symbian/gst/devsound/gstg729encoderinterface.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/devsound/gstg729encoderinterface.c Fri May 14 18:43:44 2010 -0500 @@ -54,7 +54,7 @@ g729_encoder_type = g_type_register_static (G_TYPE_INTERFACE, "GstG729EncoderInterface", - &g729_encoder_info, 0); + &g729_encoder_info, (GTypeFlags)0); } diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/devsound/gstilbcdecoderinterface.c --- a/gst_plugins_symbian/gst/devsound/gstilbcdecoderinterface.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/devsound/gstilbcdecoderinterface.c Fri May 14 18:43:44 2010 -0500 @@ -55,7 +55,7 @@ ilbc_decoder_type = g_type_register_static (G_TYPE_INTERFACE, "GstIlbcDecoderInterface", - &ilbc_decoder_info, 0); + &ilbc_decoder_info, (GTypeFlags)0); } diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/devsound/gstilbcencoderinterface.c --- a/gst_plugins_symbian/gst/devsound/gstilbcencoderinterface.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/devsound/gstilbcencoderinterface.c Fri May 14 18:43:44 2010 -0500 @@ -55,7 +55,7 @@ ilbc_encoder_type = g_type_register_static (G_TYPE_INTERFACE, "GstIlbcEncoderInterface", - &ilbc_encoder_info, 0); + &ilbc_encoder_info, (GTypeFlags)0); } diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/gst/devsound/gstspeechencoderconfig.c --- a/gst_plugins_symbian/gst/devsound/gstspeechencoderconfig.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/gst/devsound/gstspeechencoderconfig.c Fri May 14 18:43:44 2010 -0500 @@ -24,7 +24,7 @@ #include "config.h" #endif -#include "gstregistry.h" +#include "gst/gstregistry.h" #include "gstspeechencoderconfig.h" @@ -55,7 +55,7 @@ speech_encoder_config_type = g_type_register_static (G_TYPE_INTERFACE, "GstSpeechEncoderConfig", - &speech_encoder_config_info, 0); + &speech_encoder_config_info, (GTypeFlags)0); } diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/tsrc/gstreamertestmodule/group/GStreamerTestClass.mmp --- a/gst_plugins_symbian/tsrc/gstreamertestmodule/group/GStreamerTestClass.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/tsrc/gstreamertestmodule/group/GStreamerTestClass.mmp Fri May 14 18:43:44 2010 -0500 @@ -50,10 +50,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE - -USERINCLUDE ../../../../include/gstreamer -USERINCLUDE ../../../../include/gstreamer/gst -USERINCLUDE ../../../../include/gstreamer/gst/base +MW_LAYER_GSTREAMER_SYSTEMINCLUDE // FIXME Fix this path when we check in this project. USERINCLUDE ../../../gst/devsound diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/tsrc/gstreamertestmodule/inc/GStreamerTestClass.h --- a/gst_plugins_symbian/tsrc/gstreamertestmodule/inc/GStreamerTestClass.h Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/tsrc/gstreamertestmodule/inc/GStreamerTestClass.h Fri May 14 18:43:44 2010 -0500 @@ -468,6 +468,7 @@ TInt SetMainLoopRun( CStifItemParser& aItem ); TInt GetConfigureData(); TInt SetConfigureData(); + TInt PlayBack( CStifItemParser& aItem ); diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gst_plugins_symbian/tsrc/gstreamertestmodule/src/GStreamerTestClassBlocks.cpp --- a/gst_plugins_symbian/tsrc/gstreamertestmodule/src/GStreamerTestClassBlocks.cpp Fri Apr 30 19:11:56 2010 -0500 +++ b/gst_plugins_symbian/tsrc/gstreamertestmodule/src/GStreamerTestClassBlocks.cpp Fri May 14 18:43:44 2010 -0500 @@ -281,6 +281,7 @@ ENTRY( "CheckProperties", CGStreamerTestClass::CheckProperties ), ENTRY( "GstReliabilitytestPlaypause", CGStreamerTestClass::GstReliabilitytestPlaypause ), ENTRY( "GstReliabilitytestRecording", CGStreamerTestClass::GstReliabilitytestRecording ), + ENTRY( "PlayBack", CGStreamerTestClass::PlayBack ), }; const TInt count = sizeof( KFunctions ) / @@ -593,6 +594,142 @@ return KErrNone; } +/*** block b from ../../../docs/manual/highlevel-components.xml ***/ +static gboolean +my_bus_callback (GstBus *bus, + GstMessage *message, + gpointer data) +{ + + GMainLoop *loop = ( GMainLoop * )data; + + switch (GST_MESSAGE_TYPE (message)) { + case GST_MESSAGE_ERROR: { + GError *err; + gchar *debug; + + gst_message_parse_error (message, &err, &debug); + g_print ("Error: %s\n", err->message); + g_error_free (err); + g_free (debug); + + g_main_loop_quit (loop); + break; + } + case GST_MESSAGE_EOS: + + /* end-of-stream */ + g_main_loop_quit (loop); + break; + default: + /* unhandled message */ + break; + } + + /* remove message from the queue */ + return TRUE; +} + +/*** block c from ../../../docs/manual/highlevel-components.xml ***/ +GstElement *pipeline; +GstPad* devsoundsinkpad = NULL; + +static void +cb_newpad (GstElement *decodebin, + GstPad *pad, + gboolean last, + gpointer data) +{ + GstCaps *caps; + GstStructure *str; + GstPadLinkReturn linkret= GST_PAD_LINK_OK ; + + /* check media type */ + caps = gst_pad_get_caps (pad); + str = gst_caps_get_structure (caps, 0); + if (!g_strrstr (gst_structure_get_name (str), "audio")) { + gst_caps_unref (caps); + return; + } + gst_caps_unref (caps); + + /* link'n'play */ + linkret = gst_pad_link (pad, devsoundsinkpad); +} + + +gboolean cb_autoplug( GstBin * *bin, + GstPad *pad, + GstCaps *caps, + gpointer user_data) +{ + + GstCaps* sinkcaps = NULL; + gboolean supported = FALSE; + + sinkcaps = gst_pad_get_caps( devsoundsinkpad ); + + supported = gst_caps_is_subset( caps, sinkcaps ); + + if( supported ) + { + return FALSE; + } + + return TRUE; + +} + + + +TInt CGStreamerTestClass::PlayBack( CStifItemParser& aItem ) +{ + GMainLoop *loop; + GstElement *src, *dec, *sink; + GstBus *bus; + + FTRACE(FPrint(_L("CGStreamerTestClass::PlayBack"))); + + iLog->Log(_L(">>filesrc creation ")); + + src = gst_element_factory_make ("filesrc", "source"); + + iLog->Log(_L("<iPipeline),src, NULL); + + iLog->Log(_L(">>decodebin2 creation ")); + dec = gst_element_factory_make ("decodebin2", "decoder"); + iLog->Log(_L("<iPipeline), src, dec, sink, NULL); + + devsoundsinkpad = gst_element_get_pad( sink, "sink"); + + g_signal_connect (dec, "new-decoded-pad", G_CALLBACK (cb_newpad), NULL); + g_signal_connect (dec, "autoplug-continue", G_CALLBACK (cb_autoplug), NULL); + + gst_element_link (src, dec); + + iLog->Log(_L("< #else #include #endif diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/libs/gst/check/gstcheck.h --- a/gstreamer_core/libs/gst/check/gstcheck.h Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/libs/gst/check/gstcheck.h Fri May 14 18:43:44 2010 -0500 @@ -29,10 +29,10 @@ #include #include -#include "check.h" + #include "libgstreamer_wsd_solution.h" - +#include #include G_BEGIN_DECLS diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/libs/gst/controller/gstcontroller.h --- a/gstreamer_core/libs/gst/controller/gstcontroller.h Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/libs/gst/controller/gstcontroller.h Fri May 14 18:43:44 2010 -0500 @@ -30,8 +30,8 @@ #include #include -#include "gstcontrolsource.h" -#include "gstinterpolationcontrolsource.h" +#include +#include G_BEGIN_DECLS diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/libs/gst/controller/gstcontrolsource.c --- a/gstreamer_core/libs/gst/controller/gstcontrolsource.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/libs/gst/controller/gstcontrolsource.c Fri May 14 18:43:44 2010 -0500 @@ -44,7 +44,7 @@ #include #include -#include "gstcontrolsource.h" +#include "gst/controller/gstcontrolsource.h" #define GST_CAT_DEFAULT controller_debug GST_DEBUG_CATEGORY_EXTERN (GST_CAT_DEFAULT); diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/libs/gst/controller/gstinterpolationcontrolsource.h --- a/gstreamer_core/libs/gst/controller/gstinterpolationcontrolsource.h Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/libs/gst/controller/gstinterpolationcontrolsource.h Fri May 14 18:43:44 2010 -0500 @@ -27,7 +27,7 @@ #include #include -#include "gstcontrolsource.h" +#include "gst/controller/gstcontrolsource.h" G_BEGIN_DECLS diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/libs/gst/controller/gstlfocontrolsource.h --- a/gstreamer_core/libs/gst/controller/gstlfocontrolsource.h Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/libs/gst/controller/gstlfocontrolsource.h Fri May 14 18:43:44 2010 -0500 @@ -27,7 +27,7 @@ #include #include -#include "gstcontrolsource.h" +//#include "gstcontrolsource.h" G_BEGIN_DECLS diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tools/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gstreamer_core/tools/group/bld.inf Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,28 @@ + +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser 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 +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser 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. +* +* Description: +* +*/ + + +PRJ_MMPFILES +gst-inspect.mmp +gst-typefind.mmp +gst-launch.mmp \ No newline at end of file diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tools/group/gst-inspect.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gstreamer_core/tools/group/gst-inspect.mmp Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,79 @@ +//createelementcore.mmp +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser 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 +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser 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. +* +* Description: +* +*/ + +#include + +TARGET gst-inspect.exe +TARGETTYPE exe +UID 0 0x0AB230B2 + +#ifdef EKA2 +LANG SC +CAPABILITY All -Tcb +//VENDORID VID_DEFAULT +#endif + + +MACRO __SYMBIAN32__ +MACRO HAVE_CONFIG_H +MACRO DISABLE_FAULT_HANDLER + + + + +MW_LAYER_SYSTEMINCLUDE +OS_LAYER_LIBC_SYSTEMINCLUDE + +OS_LAYER_GLIB_SYSTEMINCLUDE +MW_LAYER_GSTREAMER_SYSTEMINCLUDE + + +USERINCLUDE ../ +USERINCLUDE ../../ +USERINCLUDE ../../gst +SOURCEPATH ../ +SOURCE gst-inspect.c + +LIBRARY libgstreamer.lib +LIBRARY euser.lib +LIBRARY libc.lib +LIBRARY libpthread.lib +LIBRARY libdl.lib +LIBRARY libm.lib +LIBRARY libz.lib +LIBRARY libglib.lib +LIBRARY libgmodule.lib +LIBRARY libgobject.lib +LIBRARY libgthread.lib + + +LIBRARY libgstnet.lib +LIBRARY libgstbase.lib +LIBRARY libgstcontroller.lib +LIBRARY libgstdataprotocol.lib + +STATICLIBRARY libcrt0.lib + +EPOCSTACKSIZE 0x5000 + +EPOCHEAPSIZE 0x500 0x1000000 diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tools/group/gst-launch.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gstreamer_core/tools/group/gst-launch.mmp Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,77 @@ +//createelementcore.mmp +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser 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 +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser 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. +* +* Description: +* +*/ + +#include + +TARGET gst-launch.exe +TARGETTYPE exe +UID 0 0x0AB230B3 + +#ifdef EKA2 +LANG SC +CAPABILITY All -Tcb +//VENDORID VID_DEFAULT +#endif + + +MACRO __SYMBIAN32__ +MACRO HAVE_CONFIG_H +MACRO __SYMBIAN32__ DISABLE_FAULT_HANDLER + + + +MW_LAYER_SYSTEMINCLUDE +OS_LAYER_LIBC_SYSTEMINCLUDE + +OS_LAYER_GLIB_SYSTEMINCLUDE +MW_LAYER_GSTREAMER_SYSTEMINCLUDE + +USERINCLUDE ../ +USERINCLUDE ../../ +USERINCLUDE ../../gst +SOURCEPATH ../ + +SOURCE gst-launch.c + +LIBRARY libgstreamer.lib +LIBRARY euser.lib +LIBRARY libc.lib +LIBRARY libpthread.lib +LIBRARY libdl.lib +LIBRARY libglib.lib +LIBRARY libgmodule.lib +LIBRARY libgobject.lib +LIBRARY libgthread.lib +LIBRARY libm.lib +LIBRARY libz.lib + +LIBRARY libgstnet.lib +LIBRARY libgstbase.lib +LIBRARY libgstcontroller.lib +LIBRARY libgstdataprotocol.lib + +STATICLIBRARY libcrt0.lib + +EPOCSTACKSIZE 0x5000 + +EPOCHEAPSIZE 0x500 0x1000000 diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tools/group/gst-typefind.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gstreamer_core/tools/group/gst-typefind.mmp Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,78 @@ +//createelementcore.mmp +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser 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 +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser 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. +* +* Description: +* +*/ + +#include + +TARGET gst-typefind.exe +TARGETTYPE exe +UID 0 0x0AB230B4 + +#ifdef EKA2 +LANG SC +CAPABILITY All -Tcb +//VENDORID VID_DEFAULT +#endif + + +MACRO __SYMBIAN32__ +MACRO HAVE_CONFIG_H +MACRO __SYMBIAN32__ DISABLE_FAULT_HANDLER + + + + +MW_LAYER_SYSTEMINCLUDE +OS_LAYER_LIBC_SYSTEMINCLUDE + +OS_LAYER_GLIB_SYSTEMINCLUDE +MW_LAYER_GSTREAMER_SYSTEMINCLUDE + +USERINCLUDE ../ +USERINCLUDE ../../ +USERINCLUDE ../../gst +SOURCEPATH ../ + +SOURCE gst-typefind.c + +LIBRARY libgstreamer.lib +LIBRARY euser.lib +LIBRARY libc.lib +LIBRARY libpthread.lib +LIBRARY libdl.lib +LIBRARY libglib.lib +LIBRARY libgmodule.lib +LIBRARY libgobject.lib +LIBRARY libgthread.lib +LIBRARY libm.lib +LIBRARY libz.lib + +LIBRARY libgstnet.lib +LIBRARY libgstbase.lib +LIBRARY libgstcontroller.lib +LIBRARY libgstdataprotocol.lib + +STATICLIBRARY libcrt0.lib + +EPOCSTACKSIZE 0x5000 + +EPOCHEAPSIZE 0x500 0x1000000 diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tools/group/testgstreamer.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gstreamer_core/tools/group/testgstreamer.pkg Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,36 @@ +; ============================================================================ +; Name : gstreamer.pkg +; Part of : Gstreamer project +; Description : Package file for all gstreamer libraries +; +; Version : %version: da1mmcf#3 % +; +; Copyright © 2002-2006 Nokia. All rights reserved. +; This material, including documentation and any related computer +; programs, is protected by copyright controlled by Nokia. All +; rights are reserved. Copying, including reproducing, storing, +; adapting or translating, any or all of this material requires the +; prior written consent of Nokia. This material also contains +; confidential information which may not be disclosed to others +; without the prior written consent of Nokia. +; ============================================================================ + +;Languages +&EN + +;Header +#{"testgstreamer.pkg"},(0x2001F47C),1,0,0 + +;Supports S60 3.0 +[0x101F7961], 0, 0, 0, {"S60ProductID"} + +;Localised Vendor name +%{"Nokia Testing EN"} + +;Unique Vendor name +:"Vendor" + + +"\epoc32\release\armv5\urel\gst-inspect.exe"-"!:\sys\bin\gst-inspect.exe" +"\epoc32\release\armv5\urel\gst-typefind.exe"-"!:\sys\bin\gst-typefind.exe" +"\epoc32\release\armv5\urel\gst-launch.exe"-"!:\sys\bin\gst-launch.exe" \ No newline at end of file diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tools/group/tools.pkg Binary file gstreamer_core/tools/group/tools.pkg has changed diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tools/gst-inspect.c --- a/gstreamer_core/tools/gst-inspect.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tools/gst-inspect.c Fri May 14 18:43:44 2010 -0500 @@ -25,13 +25,15 @@ # include "config.h" #endif -#include +#include #include "tools.h" #include #include #include +#include +#include static char *_name = NULL; @@ -1297,8 +1299,8 @@ int main (int argc, char *argv[]) { - gboolean print_all = FALSE; - gboolean print_aii = FALSE; + static gboolean print_all = FALSE; + static gboolean print_aii = FALSE; GOptionEntry options[] = { {"print-all", 'a', 0, G_OPTION_ARG_NONE, &print_all, N_("Print all elements"), NULL}, diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tools/gst-launch.c --- a/gstreamer_core/tools/gst-launch.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tools/gst-launch.c Fri May 14 18:43:44 2010 -0500 @@ -40,6 +40,8 @@ #endif #include /* for LC_ALL */ #include "tools.h" +#include +#include "../gst/gst-i18n-app.h" /* FIXME: This is just a temporary hack. We should have a better * check for siginfo handling. */ @@ -47,7 +49,7 @@ #define USE_SIGINFO #endif -extern volatile gboolean glib_on_error_halt; +//extern volatile gboolean glib_on_error_halt; #ifndef DISABLE_FAULT_HANDLER static void fault_restore (void); @@ -581,11 +583,11 @@ main (int argc, char *argv[]) { /* options */ - gboolean verbose = FALSE; - gboolean no_fault = FALSE; - gboolean trace = FALSE; + static gboolean verbose = FALSE; + static gboolean no_fault = FALSE; + static gboolean trace = FALSE; gchar *savefile = NULL; - gchar *exclude_args = NULL; + static gchar *exclude_args = NULL; GOptionEntry options[] = { {"tags", 't', 0, G_OPTION_ARG_NONE, &tags, N_("Output tags (also known as metadata)"), NULL}, diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tools/gst-typefind.c --- a/gstreamer_core/tools/gst-typefind.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tools/gst-typefind.c Fri May 14 18:43:44 2010 -0500 @@ -137,7 +137,7 @@ int main (int argc, char *argv[]) { - gchar **filenames = NULL; + static gchar **filenames = NULL; guint num, i; GError *err = NULL; GOptionContext *ctx; diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tools/tools.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gstreamer_core/tools/tools.bat Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,3 @@ +gst-launch filesrc location=c:\\data\\warning.wav ! wavparse ! audioconvert ! audioresample ! devsoundsink +gst-launch filesrc location=c:\\data\\Crnival.mp3 ! devsoundsink +gst-launch filesrc location=c:\\data\\test.raw ! devsoundsink diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/elements/createelementcore/group/createelementcore.mmp --- a/gstreamer_core/tsrc/check/elements/createelementcore/group/createelementcore.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/elements/createelementcore/group/createelementcore.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/elements/fakesink/group/fakesink.mmp --- a/gstreamer_core/tsrc/check/elements/fakesink/group/fakesink.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/elements/fakesink/group/fakesink.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/elements/fakesink/src/fakesink.c --- a/gstreamer_core/tsrc/check/elements/fakesink/src/fakesink.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/elements/fakesink/src/fakesink.c Fri May 14 18:43:44 2010 -0500 @@ -25,6 +25,7 @@ #include #include + #define LOG_FILE "c:\\logs\\fakesink_log1.txt" #include "std_log_result.h" #define LOG_FILENAME_LINE __FILE__, __LINE__ diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/elements/fakesrc/group/fakesrc.mmp --- a/gstreamer_core/tsrc/check/elements/fakesrc/group/fakesrc.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/elements/fakesrc/group/fakesrc.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/elements/fdsrc/group/fdsrc.mmp --- a/gstreamer_core/tsrc/check/elements/fdsrc/group/fdsrc.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/elements/fdsrc/group/fdsrc.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/elements/filesink/group/filesink.mmp --- a/gstreamer_core/tsrc/check/elements/filesink/group/filesink.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/elements/filesink/group/filesink.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/elements/filesrc/group/filesrc.mmp --- a/gstreamer_core/tsrc/check/elements/filesrc/group/filesrc.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/elements/filesrc/group/filesrc.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/elements/gstqueue/group/gstqueue.mmp --- a/gstreamer_core/tsrc/check/elements/gstqueue/group/gstqueue.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/elements/gstqueue/group/gstqueue.mmp Fri May 14 18:43:44 2010 -0500 @@ -35,12 +35,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/elements/identity/group/identity.mmp --- a/gstreamer_core/tsrc/check/elements/identity/group/identity.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/elements/identity/group/identity.mmp Fri May 14 18:43:44 2010 -0500 @@ -35,12 +35,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/elements/multiqueue/group/multiqueue.mmp --- a/gstreamer_core/tsrc/check/elements/multiqueue/group/multiqueue.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/elements/multiqueue/group/multiqueue.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/elements/tee/group/tee.mmp --- a/gstreamer_core/tsrc/check/elements/tee/group/tee.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/elements/tee/group/tee.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/generic/gststates/group/gststates.mmp --- a/gstreamer_core/tsrc/check/generic/gststates/group/gststates.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/generic/gststates/group/gststates.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/generic/sinks/group/sinks.mmp --- a/gstreamer_core/tsrc/check/generic/sinks/group/sinks.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/generic/sinks/group/sinks.mmp Fri May 14 18:43:44 2010 -0500 @@ -34,12 +34,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gst/group/gst.mmp --- a/gstreamer_core/tsrc/check/gst/gst/group/gst.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gst/group/gst.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstbin/group/gstbin.mmp --- a/gstreamer_core/tsrc/check/gst/gstbin/group/gstbin.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstbin/group/gstbin.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstbuffer/group/gstbuffer.mmp --- a/gstreamer_core/tsrc/check/gst/gstbuffer/group/gstbuffer.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstbuffer/group/gstbuffer.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstbus/group/gstbus.mmp --- a/gstreamer_core/tsrc/check/gst/gstbus/group/gstbus.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstbus/group/gstbus.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstcaps/group/gstcaps.mmp --- a/gstreamer_core/tsrc/check/gst/gstcaps/group/gstcaps.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstcaps/group/gstcaps.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstelement/group/gstelement.mmp --- a/gstreamer_core/tsrc/check/gst/gstelement/group/gstelement.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstelement/group/gstelement.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstevent/group/gstevent.mmp --- a/gstreamer_core/tsrc/check/gst/gstevent/group/gstevent.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstevent/group/gstevent.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstghostpad/group/gstghostpad.mmp --- a/gstreamer_core/tsrc/check/gst/gstghostpad/group/gstghostpad.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstghostpad/group/gstghostpad.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstindex/group/gstindex.mmp --- a/gstreamer_core/tsrc/check/gst/gstindex/group/gstindex.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstindex/group/gstindex.mmp Fri May 14 18:43:44 2010 -0500 @@ -35,12 +35,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstinterface/group/gstinterface.mmp --- a/gstreamer_core/tsrc/check/gst/gstinterface/group/gstinterface.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstinterface/group/gstinterface.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstiterator/group/gstiterator.mmp --- a/gstreamer_core/tsrc/check/gst/gstiterator/group/gstiterator.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstiterator/group/gstiterator.mmp Fri May 14 18:43:44 2010 -0500 @@ -19,12 +19,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstmessage/group/gstmessage.mmp --- a/gstreamer_core/tsrc/check/gst/gstmessage/group/gstmessage.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstmessage/group/gstmessage.mmp Fri May 14 18:43:44 2010 -0500 @@ -35,12 +35,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstminiobject/group/gstminiobject.mmp --- a/gstreamer_core/tsrc/check/gst/gstminiobject/group/gstminiobject.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstminiobject/group/gstminiobject.mmp Fri May 14 18:43:44 2010 -0500 @@ -35,12 +35,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstobject/group/gstobject.mmp --- a/gstreamer_core/tsrc/check/gst/gstobject/group/gstobject.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstobject/group/gstobject.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstpad/group/gstpad.mmp --- a/gstreamer_core/tsrc/check/gst/gstpad/group/gstpad.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstpad/group/gstpad.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstparamspecs/group/gstparamspecs.mmp --- a/gstreamer_core/tsrc/check/gst/gstparamspecs/group/gstparamspecs.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstparamspecs/group/gstparamspecs.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstpipeline/group/gstpipeline.mmp --- a/gstreamer_core/tsrc/check/gst/gstpipeline/group/gstpipeline.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstpipeline/group/gstpipeline.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstplugin/group/gstplugin.mmp --- a/gstreamer_core/tsrc/check/gst/gstplugin/group/gstplugin.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstplugin/group/gstplugin.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstpoll/group/gstpoll.mmp --- a/gstreamer_core/tsrc/check/gst/gstpoll/group/gstpoll.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstpoll/group/gstpoll.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstquery/group/gstquery.mmp --- a/gstreamer_core/tsrc/check/gst/gstquery/group/gstquery.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstquery/group/gstquery.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstregistry/group/gstregistry.mmp --- a/gstreamer_core/tsrc/check/gst/gstregistry/group/gstregistry.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstregistry/group/gstregistry.mmp Fri May 14 18:43:44 2010 -0500 @@ -35,12 +35,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstsegment/group/gstsegment.mmp --- a/gstreamer_core/tsrc/check/gst/gstsegment/group/gstsegment.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstsegment/group/gstsegment.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gststructure/group/gststructure.mmp --- a/gstreamer_core/tsrc/check/gst/gststructure/group/gststructure.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gststructure/group/gststructure.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gststructure/src/gststructure.c --- a/gstreamer_core/tsrc/check/gst/gststructure/src/gststructure.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gststructure/src/gststructure.c Fri May 14 18:43:44 2010 -0500 @@ -36,9 +36,6 @@ #define xmlfile *(get_xmlfile()) #endif - - - #if EMULATOR static GET_GLOBAL_VAR_FROM_TLS(raised_critical,gstcheck,gboolean) #define _gst_check_raised_critical (*GET_GSTREAMER_WSD_VAR_NAME(raised_critical,gstcheck,g)()) diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstsystemclock/group/gstsystemclock.mmp --- a/gstreamer_core/tsrc/check/gst/gstsystemclock/group/gstsystemclock.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstsystemclock/group/gstsystemclock.mmp Fri May 14 18:43:44 2010 -0500 @@ -39,12 +39,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SYSTEMINCLUDE ../../../../../libs diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gsttag/group/gsttag.mmp --- a/gstreamer_core/tsrc/check/gst/gsttag/group/gsttag.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gsttag/group/gsttag.mmp Fri May 14 18:43:44 2010 -0500 @@ -20,12 +20,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gsttagsetter/group/gsttagsetter.mmp --- a/gstreamer_core/tsrc/check/gst/gsttagsetter/group/gsttagsetter.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gsttagsetter/group/gsttagsetter.mmp Fri May 14 18:43:44 2010 -0500 @@ -37,12 +37,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gsttask/group/gsttask.mmp --- a/gstreamer_core/tsrc/check/gst/gsttask/group/gsttask.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gsttask/group/gsttask.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gsturi/group/gsturi.mmp --- a/gstreamer_core/tsrc/check/gst/gsturi/group/gsturi.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gsturi/group/gsturi.mmp Fri May 14 18:43:44 2010 -0500 @@ -21,12 +21,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstutils/group/gstutils.mmp --- a/gstreamer_core/tsrc/check/gst/gstutils/group/gstutils.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstutils/group/gstutils.mmp Fri May 14 18:43:44 2010 -0500 @@ -21,12 +21,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/gst/gstvalue/group/gstvalue.mmp --- a/gstreamer_core/tsrc/check/gst/gstvalue/group/gstvalue.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/gst/gstvalue/group/gstvalue.mmp Fri May 14 18:43:44 2010 -0500 @@ -38,12 +38,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SYSTEMINCLUDE ../../../../../libs diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/libs/adapter/group/adapter.mmp --- a/gstreamer_core/tsrc/check/libs/adapter/group/adapter.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/libs/adapter/group/adapter.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/libs/basesrc/group/basesrc.mmp --- a/gstreamer_core/tsrc/check/libs/basesrc/group/basesrc.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/libs/basesrc/group/basesrc.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/libs/collectpads/group/collectpads.mmp --- a/gstreamer_core/tsrc/check/libs/collectpads/group/collectpads.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/libs/collectpads/group/collectpads.mmp Fri May 14 18:43:44 2010 -0500 @@ -37,12 +37,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/libs/controller/group/controller.mmp --- a/gstreamer_core/tsrc/check/libs/controller/group/controller.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/libs/controller/group/controller.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/libs/gdp/group/gdp.mmp --- a/gstreamer_core/tsrc/check/libs/gdp/group/gdp.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/libs/gdp/group/gdp.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/libs/gstnetclientclock/group/gstnetclientclock.mmp --- a/gstreamer_core/tsrc/check/libs/gstnetclientclock/group/gstnetclientclock.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/libs/gstnetclientclock/group/gstnetclientclock.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/libs/gstnettimeprovider/group/gstnettimeprovider.mmp --- a/gstreamer_core/tsrc/check/libs/gstnettimeprovider/group/gstnettimeprovider.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/libs/gstnettimeprovider/group/gstnettimeprovider.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/libs/libsabi/group/libsabi.mmp --- a/gstreamer_core/tsrc/check/libs/libsabi/group/libsabi.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/libs/libsabi/group/libsabi.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/libs/typefindhelper/group/typefindhelper.mmp --- a/gstreamer_core/tsrc/check/libs/typefindhelper/group/typefindhelper.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/libs/typefindhelper/group/typefindhelper.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/pipelines/cleanup/group/cleanup.mmp --- a/gstreamer_core/tsrc/check/pipelines/cleanup/group/cleanup.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/pipelines/cleanup/group/cleanup.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/pipelines/core-simple-launch-lines/group/core-simple-launch-lines.mmp --- a/gstreamer_core/tsrc/check/pipelines/core-simple-launch-lines/group/core-simple-launch-lines.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/pipelines/core-simple-launch-lines/group/core-simple-launch-lines.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/pipelines/parse-disabled/group/parse-disabled.mmp --- a/gstreamer_core/tsrc/check/pipelines/parse-disabled/group/parse-disabled.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/pipelines/parse-disabled/group/parse-disabled.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/pipelines/parse-launch/group/parse-launch.mmp --- a/gstreamer_core/tsrc/check/pipelines/parse-launch/group/parse-launch.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/pipelines/parse-launch/group/parse-launch.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/check/pipelines/stress/group/stress.mmp --- a/gstreamer_core/tsrc/check/pipelines/stress/group/stress.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/check/pipelines/stress/group/stress.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/adapter/group/testgstadapter.mmp --- a/gstreamer_core/tsrc/examples/adapter/group/testgstadapter.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/adapter/group/testgstadapter.mmp Fri May 14 18:43:44 2010 -0500 @@ -57,12 +57,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../include/gstreamer -USERINCLUDE ../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/controller/group/testaudioexample.mmp --- a/gstreamer_core/tsrc/examples/controller/group/testaudioexample.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/controller/group/testaudioexample.mmp Fri May 14 18:43:44 2010 -0500 @@ -54,12 +54,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../include/gstreamer -USERINCLUDE ../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/group/bld.inf --- a/gstreamer_core/tsrc/examples/group/bld.inf Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/group/bld.inf Fri May 14 18:43:44 2010 -0500 @@ -20,7 +20,7 @@ * */ - +#include "../gstseek/group/bld.inf" #include "../helloworld/group/bld.inf" #include "../controller/group/bld.inf" #include "../adapter/group/bld.inf" diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/gstseek/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gstreamer_core/tsrc/examples/gstseek/group/bld.inf Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,33 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser 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 +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser 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. +* +* Description: +* +*/ + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS + +PRJ_TESTMMPFILES +gstseek.mmp + + + + diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/gstseek/group/gstseek.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gstreamer_core/tsrc/examples/gstseek/group/gstseek.mmp Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,84 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser 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 +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser 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. +* +* Description: +* +*/ + +#include + +TARGET gstseek.exe +TARGETTYPE EXE +UID 0 0x0AB229ED + +EPOCHEAPSIZE 0x10000 0x100000 +#ifdef EKA2 +LANG SC +CAPABILITY All -Tcb +VENDORID VID_DEFAULT + +#endif + + + +MACRO HAVE_CONFIG_H + + +USERINCLUDE .. +USERINCLUDE ../libs/gst/base +USERINCLUDE ../gst +USERINCLUDE ../libs/gst/base +USERINCLUDE ../gst +USERINCLUDE ../../../../.. +USERINCLUDE ../../../../libs/gst/check +USERINCLUDE ../../../../gst +USERINCLUDE ../../../.. +USERINCLUDE ../../../../libs + +MW_LAYER_SYSTEMINCLUDE +OS_LAYER_LIBC_SYSTEMINCLUDE + +OS_LAYER_GLIB_SYSTEMINCLUDE +MW_LAYER_GSTREAMER_SYSTEMINCLUDE + + + + + +SOURCEPATH ../src + +SOURCE gstseek.c + + +LIBRARY euser.lib libc.lib +LIBRARY libpthread.lib +LIBRARY libdl.lib +LIBRARY libglib.lib +LIBRARY libgmodule.lib + +LIBRARY libgobject.lib +LIBRARY libgthread.lib +LIBRARY libm.lib +LIBRARY libz.lib +LIBRARY libgstreamer.lib +LIBRARY libgstbase.lib +LIBRARY libgstcontroller.lib + +STATICLIBRARY libcrt0.lib +//VENDORID VID_DEFAULT +SMPSAFE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/gstseek/src/gstseek.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gstreamer_core/tsrc/examples/gstseek/src/gstseek.c Fri May 14 18:43:44 2010 -0500 @@ -0,0 +1,214 @@ + +#include +#include +#include +#include + +#define LOG_FILE "c:\\logs\\launch_logs.txt" +#include "std_log_result.h" +#define LOG_FILENAME_LINE __FILE__, __LINE__ + + +void create_xml(int result) +{ + + if(result) + { + assert_failed = 1; + } + + testResultXml(xmlfile); + close_log_file(); + + if(result) + { + exit (-1); + } + +} + +GstElement *pipeline, *source, *wavparse,*sink,*conv,*resample,*decoder,*audioconvert,*audioresample ; +GstBus *bus; +GMainLoop *loop; + +static gboolean +bus_call (GstBus *bus, + GstMessage *msg, + gpointer data) +{ + switch (GST_MESSAGE_TYPE (msg)) { + case GST_MESSAGE_EOS: + gst_element_set_state (pipeline, GST_STATE_NULL); + g_main_loop_quit(loop); + gst_object_unref (GST_OBJECT (pipeline)); + std_log(LOG_FILENAME_LINE, "Test Successful"); + create_xml(0); + break; + case GST_MESSAGE_ERROR: { + gchar *debug; + GError *err; + gst_message_parse_error (msg, &err, &debug); + g_free (debug); + g_print ("Error: %s\n", err->message); + g_error_free (err); + std_log(LOG_FILENAME_LINE, "Test Failed"); + create_xml(1); + break; + } + default: + break; + } + + return TRUE; +} + +static void +cb_newpad (GstElement *decodebin, + GstPad *pad, + gboolean last, + gpointer data) +{ + GstCaps *caps; + GstStructure *str; + GstPadLinkReturn linkret= GST_PAD_LINK_OK ; + + + GstPad* sinkpad = NULL; + + + /* check media type */ + caps = gst_pad_get_caps (pad); + str = gst_caps_get_structure (caps, 0); + if (!g_strrstr (gst_structure_get_name (str), "audio")) { + gst_caps_unref (caps); + return; + } + gst_caps_unref (caps); + +// if( link_with_devsoundsink ) +// { + sinkpad = gst_element_get_pad( sink, "sink"); + //gst_bin_add_many (GST_BIN (pipeline),source, decoder,sink, NULL); + +// } +// else +// { +// audioconvert = gst_element_factory_make ("audioconvert", "audioconvert"); +// audioresample = gst_element_factory_make ("audioresample", "audioresample"); +// sinkpad = gst_element_get_pad( audioconvert, "sink"); +// +// gst_bin_add_many (GST_BIN (pipeline),source, decoder,audioconvert,audioresample,sink, NULL); +// +// if (!gst_element_link (audioconvert,audioresample)) +// g_error ("link(audioconvert,audioresample, sink) failed!\n"); +// if (!gst_element_link (audioresample, sink)) +// g_error ("link(audioconvert,audioresample, sink) failed!\n"); +// } + + linkret = gst_pad_link (pad, sinkpad); +} + + +static gboolean +cb_get_position (GstElement* temp /*pipeline*/) +{ + GstFormat fmt = GST_FORMAT_TIME; + gint64 pos = 0, len, time_nanoseconds, diff; + GstState state; + + gst_element_get_state(GST_ELEMENT(pipeline),&state,NULL,-1); + if (gst_element_query_position (pipeline, &fmt, &pos) + && gst_element_query_duration (pipeline, &fmt, &len)) { + g_print ("Time: %" GST_TIME_FORMAT " / %" GST_TIME_FORMAT "\r", + GST_TIME_ARGS (pos), GST_TIME_ARGS (len)); + } + time_nanoseconds = pos + 1000000000; + + if (!gst_element_seek (pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, + GST_SEEK_TYPE_SET, time_nanoseconds, + GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)) { + g_print ("Seek failed!\n"); + } + + gst_element_get_state(GST_ELEMENT(pipeline),&state,NULL,-1); + + if (gst_element_query_position (pipeline, &fmt, &pos) + && gst_element_query_duration (pipeline, &fmt, &len)) { + g_print ("Time: %" GST_TIME_FORMAT " / %" GST_TIME_FORMAT "\r", + GST_TIME_ARGS (pos), GST_TIME_ARGS (len)); + } + + diff = pos - time_nanoseconds; + + if( diff > 1000000 ) + { + create_xml( 1 ); + } + + /* call me again */ + return TRUE; +} + +int main (int argc, char *argv[]) +{ + + xmlfile = "launch_logs"; + std_log(LOG_FILENAME_LINE, "Test Started launch"); + + if (argc != 2) { + g_print ("usage: %s \n", argv[0]); + std_log(LOG_FILENAME_LINE, "Test Failed"); + create_xml(1); + exit (-1); + } + //link_with_devsoundsink = FALSE; + gst_init (&argc, &argv); + loop = g_main_loop_new (NULL, FALSE); + + /* create elements */ + pipeline = gst_pipeline_new ("audio-player"); + source = gst_element_factory_make ("filesrc", "file-source"); + decoder = gst_element_factory_make ("decodebin2", "decodebin2-decoder"); + sink = gst_element_factory_make ("devsoundsink", "sink"); +// audioconvert = gst_element_factory_make ("audioconvert", "audioconvert"); +// audioresample = gst_element_factory_make ("audioresample", "audioresample"); +// sink = gst_element_factory_make ("devsoundsink", "sink"); + + if (!pipeline || !source || !decoder || !sink) { + g_print ("One element could not be created\n"); + return -1; + } + /* set filename property on the file source. Also add a message handler. */ + g_object_set (G_OBJECT (source), "location", argv[1], NULL); + /* put all elements in a bin */ + gst_bin_add_many (GST_BIN (pipeline),source, decoder,sink, NULL); + /* link together - note that we cannot link the parser and decoder yet, because the parser uses dynamic pads. For that, we set a pad-added signal handler. */ + gst_element_link (source, decoder); + + + + + gst_bus_add_watch (gst_pipeline_get_bus (GST_PIPELINE (pipeline)), bus_call, loop); + + g_signal_connect (decoder, "new-decoded-pad", G_CALLBACK (cb_newpad), NULL); + //g_signal_connect (decoder, "autoplug-continue", G_CALLBACK (cb_autoplug), NULL); + + g_timeout_add (1000/*in mili sec*/, (GSourceFunc) cb_get_position, NULL); + + //g_signal_connect (decoder, "pad-added", G_CALLBACK (new_pad_cb),pipeline); + /* Now set to playing and iterate. */ + g_print ("Setting to PLAYING\n"); + gst_element_set_state (pipeline, GST_STATE_PLAYING); + g_print ("Running\n"); + g_main_loop_run (loop); + /* clean up nicely */ + g_print ("Returned, stopping playback\n"); + gst_element_set_state (pipeline, GST_STATE_NULL); + g_print ("Deleting pipeline\n"); + gst_object_unref (GST_OBJECT (pipeline)); + + g_print ("completed palying audio\n"); + //std_log(LOG_FILENAME_LINE, "Test Successful"); + //create_xml(0); + return 0; +} diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/helloworld/group/helloworld.mmp --- a/gstreamer_core/tsrc/examples/helloworld/group/helloworld.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/helloworld/group/helloworld.mmp Fri May 14 18:43:44 2010 -0500 @@ -54,12 +54,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../include/gstreamer -USERINCLUDE ../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/launch/group/launch.mmp --- a/gstreamer_core/tsrc/examples/launch/group/launch.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/launch/group/launch.mmp Fri May 14 18:43:44 2010 -0500 @@ -54,12 +54,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../include/gstreamer -USERINCLUDE ../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/launch/group/mp3launch.mmp --- a/gstreamer_core/tsrc/examples/launch/group/mp3launch.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/launch/group/mp3launch.mmp Fri May 14 18:43:44 2010 -0500 @@ -54,12 +54,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../include/gstreamer -USERINCLUDE ../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/launch/src/launch.c --- a/gstreamer_core/tsrc/examples/launch/src/launch.c Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/launch/src/launch.c Fri May 14 18:43:44 2010 -0500 @@ -3,12 +3,11 @@ #include #include #include - +#include #define LOG_FILE "c:\\logs\\launch_logs.txt" #include "std_log_result.h" #define LOG_FILENAME_LINE __FILE__, __LINE__ - void create_xml(int result) { @@ -30,7 +29,7 @@ GstElement *pipeline, *source, *wavparse,*sink,*conv,*resample,*decoder,*audioconvert,*audioresample ; GstBus *bus; GMainLoop *loop; - +//gboolean link_with_devsoundsink; //audioconvert ! audioresample static gboolean @@ -43,7 +42,7 @@ gst_element_set_state (pipeline, GST_STATE_NULL); g_main_loop_quit(loop); gst_object_unref (GST_OBJECT (pipeline)); - std_log(LOG_FILENAME_LINE, "Test Successful"); + //std_log(LOG_FILENAME_LINE, "Test Successful"); create_xml(0); break; case GST_MESSAGE_ERROR: { @@ -53,7 +52,7 @@ g_free (debug); g_print ("Error: %s\n", err->message); g_error_free (err); - std_log(LOG_FILENAME_LINE, "Test Failed"); + //std_log(LOG_FILENAME_LINE, "Test Failed"); create_xml(1); break; } @@ -64,61 +63,144 @@ return TRUE; } -static void -new_pad_cb (GstElement *wavparse, GstPad *new_pad, gpointer pipeline) - { +//static void +//new_pad_cb (GstElement *wavparse, GstPad *new_pad, gpointer pipeline) +// { +// +// gst_element_set_state (pipeline, GST_STATE_PAUSED); +// +// if (!gst_element_link (wavparse, audioconvert)) +// g_error ("link(wavparse, audioconvert) failed!\n"); +// +// gst_element_set_state (pipeline, GST_STATE_PLAYING); +// } + + +static void +cb_newpad (GstElement *decodebin, + GstPad *pad, + gboolean last, + gpointer data) +{ + GstCaps *caps; + GstStructure *str; + GstPadLinkReturn linkret= GST_PAD_LINK_OK ; - gst_element_set_state (pipeline, GST_STATE_PAUSED); + + GstPad* sinkpad = NULL; - if (!gst_element_link (wavparse, audioconvert)) - g_error ("link(wavparse, audioconvert) failed!\n"); + + /* check media type */ + caps = gst_pad_get_caps (pad); + str = gst_caps_get_structure (caps, 0); + if (!g_strrstr (gst_structure_get_name (str), "audio")) { + gst_caps_unref (caps); + return; + } + gst_caps_unref (caps); + +// if( link_with_devsoundsink ) +// { + sinkpad = gst_element_get_pad( sink, "sink"); + //gst_bin_add_many (GST_BIN (pipeline),source, decoder,sink, NULL); + +// } +// else +// { +// audioconvert = gst_element_factory_make ("audioconvert", "audioconvert"); +// audioresample = gst_element_factory_make ("audioresample", "audioresample"); +// sinkpad = gst_element_get_pad( audioconvert, "sink"); +// +// gst_bin_add_many (GST_BIN (pipeline),source, decoder,audioconvert,audioresample,sink, NULL); +// +// if (!gst_element_link (audioconvert,audioresample)) +// g_error ("link(audioconvert,audioresample, sink) failed!\n"); +// if (!gst_element_link (audioresample, sink)) +// g_error ("link(audioconvert,audioresample, sink) failed!\n"); +// } + + linkret = gst_pad_link (pad, sinkpad); +} - gst_element_set_state (pipeline, GST_STATE_PLAYING); - } +gboolean cb_autoplug( GstBin * *bin, + GstPad *pad, + GstCaps *caps, + gpointer user_data) +{ + GstCaps* sinkcaps = NULL; + gboolean supported = FALSE; + + GstPad* sinkpad = gst_element_get_pad( sink, "sink"); + sinkcaps = gst_pad_get_caps( sinkpad ); + supported = gst_caps_is_subset( caps, sinkcaps ); + + if( supported ) + { + //link_with_devsoundsink = TRUE; + return FALSE; + } + return TRUE; +} int main (int argc, char *argv[]) { - - - xmlfile = "launch_logs"; - std_log(LOG_FILENAME_LINE, "Test Started launch"); + int is_mp3_file = 0; + const char* ext = 0; + //xmlfile = "launch_logs"; + ////std_log(LOG_FILENAME_LINE, "Test Started launch"); if (argc != 2) { - g_print ("usage: %s \n", argv[0]); - std_log(LOG_FILENAME_LINE, "Test Failed"); + g_print ("usage: %s \n", argv[0]); + //std_log(LOG_FILENAME_LINE, "Test Failed"); create_xml(1); exit (-1); } - + ext = strrchr(argv[1],'.'); + if ( ext && ( !strcmp(ext,".mp3") || !strcmp(ext,".Mp3") || !strcmp(ext,".MP3") || !strcmp(ext,".mP3") ) ) + is_mp3_file = 1; + //link_with_devsoundsink = FALSE; gst_init (&argc, &argv); loop = g_main_loop_new (NULL, FALSE); /* create elements */ pipeline = gst_pipeline_new ("audio-player"); source = gst_element_factory_make ("filesrc", "file-source"); - decoder = gst_element_factory_make ("wavparse", "wavparse-decoder"); - sink = gst_element_factory_make ("devsoundsink", "sink"); - audioconvert = gst_element_factory_make ("audioconvert", "audioconvert"); - audioresample = gst_element_factory_make ("audioresample", "audioresample"); - if (!pipeline || !source || !decoder || !audioconvert || !audioresample) { + if (is_mp3_file) + decoder = gst_element_factory_make ("mp3parse", "mp3parse"); + else + decoder = gst_element_factory_make ("decodebin2", "decodebin2-decoder"); + + + sink = gst_element_factory_make ("devsoundsink", "sink"); +// audioconvert = gst_element_factory_make ("audioconvert", "audioconvert"); +// audioresample = gst_element_factory_make ("audioresample", "audioresample"); +// sink = gst_element_factory_make ("devsoundsink", "sink"); + + if (!pipeline || !source || !decoder || !sink) { g_print ("One element could not be created\n"); return -1; } /* set filename property on the file source. Also add a message handler. */ - g_object_set (G_OBJECT (source), "location", "c:\\data\\khuda1.wav", NULL); + g_object_set (G_OBJECT (source), "location", argv[1], NULL); /* put all elements in a bin */ - gst_bin_add_many (GST_BIN (pipeline),source, decoder,audioconvert,audioresample,sink, NULL); - /* link together - note that we cannot link the parser and decoder yet, because the parser uses dynamic pads. For that, we set a pad-added signal handler. */ - gst_element_link (source, decoder); - - if (!gst_element_link (audioconvert,audioresample)) - g_error ("link(audioconvert,audioresample, sink) failed!\n"); - if (!gst_element_link (audioresample, sink)) - g_error ("link(audioconvert,audioresample, sink) failed!\n"); + gst_bin_add_many (GST_BIN (pipeline),source, decoder,sink, NULL); + if (is_mp3_file) + gst_element_link_many (source, decoder, sink, NULL); + else + { + /* link together - note that we cannot link the parser and decoder yet, because the parser uses dynamic pads. For that, we set a pad-added signal handler. */ + gst_element_link (source, decoder); + } + + + gst_bus_add_watch (gst_pipeline_get_bus (GST_PIPELINE (pipeline)), bus_call, loop); + if (!is_mp3_file) + { + g_signal_connect (decoder, "new-decoded-pad", G_CALLBACK (cb_newpad), NULL); + g_signal_connect (decoder, "autoplug-continue", G_CALLBACK (cb_autoplug), NULL); + } - - gst_bus_add_watch (gst_pipeline_get_bus (GST_PIPELINE (pipeline)), bus_call, loop); - g_signal_connect (decoder, "pad-added", G_CALLBACK (new_pad_cb),pipeline); + //g_signal_connect (decoder, "pad-added", G_CALLBACK (new_pad_cb),pipeline); /* Now set to playing and iterate. */ g_print ("Setting to PLAYING\n"); gst_element_set_state (pipeline, GST_STATE_PLAYING); @@ -131,7 +213,7 @@ gst_object_unref (GST_OBJECT (pipeline)); g_print ("completed palying audio\n"); - //std_log(LOG_FILENAME_LINE, "Test Successful"); + ////std_log(LOG_FILENAME_LINE, "Test Successful"); //create_xml(0); return 0; } diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/bin/group/bin.mmp --- a/gstreamer_core/tsrc/examples/manual/bin/group/bin.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/bin/group/bin.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/createelements/group/gstelementcreate.mmp --- a/gstreamer_core/tsrc/examples/manual/createelements/group/gstelementcreate.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/createelements/group/gstelementcreate.mmp Fri May 14 18:43:44 2010 -0500 @@ -41,12 +41,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check @@ -78,8 +73,4 @@ STATICLIBRARY libcrt0.lib - - - - SMPSAFE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/elementfactory/group/elementfactory.mmp --- a/gstreamer_core/tsrc/examples/manual/elementfactory/group/elementfactory.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/elementfactory/group/elementfactory.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/getelements/group/gstelementget.mmp --- a/gstreamer_core/tsrc/examples/manual/getelements/group/gstelementget.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/getelements/group/gstelementget.mmp Fri May 14 18:43:44 2010 -0500 @@ -41,12 +41,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check @@ -79,8 +74,4 @@ STATICLIBRARY libcrt0.lib - - - - SMPSAFE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/init/group/init.mmp --- a/gstreamer_core/tsrc/examples/manual/init/group/init.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/init/group/init.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/linkelements/group/gstelementgetlink.mmp --- a/gstreamer_core/tsrc/examples/manual/linkelements/group/gstelementgetlink.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/linkelements/group/gstelementgetlink.mmp Fri May 14 18:43:44 2010 -0500 @@ -41,12 +41,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check @@ -78,8 +73,4 @@ STATICLIBRARY libcrt0.lib - - - - SMPSAFE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/makeelements/group/gstelementmake.mmp --- a/gstreamer_core/tsrc/examples/manual/makeelements/group/gstelementmake.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/makeelements/group/gstelementmake.mmp Fri May 14 18:43:44 2010 -0500 @@ -41,12 +41,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check @@ -76,8 +71,4 @@ STATICLIBRARY libcrt0.lib - - - - SMPSAFE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/manual_decodebin/group/manual_decodebin.mmp --- a/gstreamer_core/tsrc/examples/manual/manual_decodebin/group/manual_decodebin.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/manual_decodebin/group/manual_decodebin.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/manual_dynamic/group/manual_dynamic.mmp --- a/gstreamer_core/tsrc/examples/manual/manual_dynamic/group/manual_dynamic.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/manual_dynamic/group/manual_dynamic.mmp Fri May 14 18:43:44 2010 -0500 @@ -20,12 +20,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/manual_ghostpad/group/manual_ghostpad.mmp --- a/gstreamer_core/tsrc/examples/manual/manual_ghostpad/group/manual_ghostpad.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/manual_ghostpad/group/manual_ghostpad.mmp Fri May 14 18:43:44 2010 -0500 @@ -23,12 +23,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/manual_helloworld/group/manual_helloworld.mmp --- a/gstreamer_core/tsrc/examples/manual/manual_helloworld/group/manual_helloworld.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/manual_helloworld/group/manual_helloworld.mmp Fri May 14 18:43:44 2010 -0500 @@ -37,12 +37,7 @@ OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/manual_playbin/group/manual_playbin.mmp --- a/gstreamer_core/tsrc/examples/manual/manual_playbin/group/manual_playbin.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/manual_playbin/group/manual_playbin.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/manual_typefind/group/manual_typefind.mmp --- a/gstreamer_core/tsrc/examples/manual/manual_typefind/group/manual_typefind.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/manual_typefind/group/manual_typefind.mmp Fri May 14 18:43:44 2010 -0500 @@ -20,12 +20,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/pad/group/pad.mmp --- a/gstreamer_core/tsrc/examples/manual/pad/group/pad.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/pad/group/pad.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/manual/query/group/query.mmp --- a/gstreamer_core/tsrc/examples/manual/query/group/query.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/manual/query/group/query.mmp Fri May 14 18:43:44 2010 -0500 @@ -36,12 +36,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../../include/gstreamer -USERINCLUDE ../../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE USERINCLUDE ../../../../../libs/gst/check diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/metadata/group/metadata.mmp --- a/gstreamer_core/tsrc/examples/metadata/group/metadata.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/metadata/group/metadata.mmp Fri May 14 18:43:44 2010 -0500 @@ -55,12 +55,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../include/gstreamer -USERINCLUDE ../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/queue/group/queue.mmp --- a/gstreamer_core/tsrc/examples/queue/group/queue.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/queue/group/queue.mmp Fri May 14 18:43:44 2010 -0500 @@ -52,12 +52,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../include/gstreamer -USERINCLUDE ../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/examples/typefind/group/typefind.mmp --- a/gstreamer_core/tsrc/examples/typefind/group/typefind.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/examples/typefind/group/typefind.mmp Fri May 14 18:43:44 2010 -0500 @@ -51,12 +51,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../../../include/gstreamer -USERINCLUDE ../../../../../include/gstreamer/gst -USERINCLUDE ../../../../../include/gstreamer/gst/base -USERINCLUDE ../../../../../include/gstreamer/gst/controller -USERINCLUDE ../../../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_core/tsrc/gstreamertestcases_suite3/conf/gstreamertestcases_suite3.cfg --- a/gstreamer_core/tsrc/gstreamertestcases_suite3/conf/gstreamertestcases_suite3.cfg Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_core/tsrc/gstreamertestcases_suite3/conf/gstreamertestcases_suite3.cfg Fri May 14 18:43:44 2010 -0500 @@ -177,4 +177,484 @@ create gstreamertestcases_suite3 foobar foobar Example parse-launch.exe delayed_link delete foobar -[Endtest] \ No newline at end of file +[Endtest] + +/* playback testing */ + + +[Test] +title launch.exe AAC_8k_64kbps_mono_Queen.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_8k_64kbps_mono_Queen.aac +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\AAC_8k_64kbps_mono_Test3.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_8k_64kbps_mono_Test3.aac +delete foobar +[Endtest] + +[Test] +title launch.exe f:\data\AAC_16k_64kbps_mono_Queen.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_16k_64kbps_mono_Queen.aac +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\AAC_16k_64kbps_mono_Test3.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_16k_64kbps_mono_Test3.aac +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\AAC_32k_VBR_st_Frederik.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_32k_VBR_st_Frederik.aac +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\AAC_32k_VBR_st_Test3.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_32k_VBR_st_Test3.aac +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\AAC_44.1k_128kbps_st_music.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_44.1k_128kbps_st_music.aac +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\AAC_44.1k_241kbps_st_instrumental.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_44.1k_241kbps_st_instrumental.aac +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\AAC_44.1k_264kbps_st_Test3.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_44.1k_264kbps_st_Test3.aac +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\AAC_44.1k_264kbps_st_Yo.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_44.1k_264kbps_st_Yo.aac +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\AAC_44.1k_VBR_st_Test3.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_44.1k_VBR_st_Test3.aac +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\AAC_44.1k_VBR_st_Yo.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_44.1k_VBR_st_Yo.aac +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\AAC_48k_288kbps_st_Test3.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_48k_288kbps_st_Test3.aac +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\AAC_48k_288kbps_st_Test7.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_48k_288kbps_st_Test7.aac +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\AAC_48k_288kbps_st_Yo.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\AAC_48k_288kbps_st_Yo.aac +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\eAAC_48k_24kbps_st_Frederik.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\eAAC_48k_24kbps_st_Frederik.aac +delete foobar +[Endtest] + +[Test] +title launch.exe f:\data\eAAC_48k_24kbps_st_Test8.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\eAAC_48k_24kbps_st_Test8.aac +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\eAAC_48k_32kbps_st_Test8.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\eAAC_48k_32kbps_st_Test8.aac +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\eAAC_48k_40kbps_st_Test8.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\eAAC_48k_40kbps_st_Test8.aac +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\eAAC_48k_48kbps_st_Frederik.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\eAAC_48k_48kbps_st_Frederik.aac +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\eAAC_48k_48kbps_st_Test8.aac +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\eAAC_48k_48kbps_st_Test8.aac +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\Err_MP3_44.1k_64kbps_mono.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\Err_MP3_44.1k_64kbps_mono.mp3 +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\MP3_11.025k_40kbps_mono_Queen.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_11.025k_40kbps_mono_Queen.mp3 +delete foobar +[Endtest] + + +/* +[Test] +title launch.exe f:\data\MP3_11.025k_40kbps_mono_Test2.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_11.025k_40kbps_mono_Test2.mp3 +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\MP3_16k_96-160kbps_mono_Queen.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_16k_96-160kbps_mono_Queen.mp3 +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\MP3_16k_96-160kbps_mono_Test2.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_16k_96-160kbps_mono_Test2.mp3 +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\MP3_22.05k_8kbps_mono_Test1.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_22.05k_8kbps_mono_Test1.mp3 +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\MP3_22.05k_64kbps_joint_st_Kilpi.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_22.05k_64kbps_joint_st_Kilpi.mp3 +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\MP3_24k_160kbps_st_Test2.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_24k_160kbps_st_Test2.mp3 +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\MP3_32k_48-192kbps_st_Test1.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_32k_48-192kbps_st_Test1.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_44.1k_128kbps_mono_0.5k10k_sines.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_44.1k_128kbps_mono_0.5k10k_sines.mp3 +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\MP3_44.1k_128kbps_st_Dire.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_44.1k_128kbps_st_Dire.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_44.1k_128kbps_st_Frederik.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_44.1k_128kbps_st_Frederik.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_44.1k_128kbps_st_Queen.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_44.1k_128kbps_st_Queen.mp3 +delete foobar +[Endtest] + +[Test] +title launch.exe f:\data\MP3_44.1k_128kbps_st_speech3.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_44.1k_128kbps_st_speech3.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_44.1k_128kbps_st_Test2.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_44.1k_128kbps_st_Test2.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_44.1k_128kbps_st_Test3.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_44.1k_128kbps_st_Test3.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_44.1k_128kbps_st_Test4.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_44.1k_128kbps_st_Test4.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_128kbps_st_Rasmus.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_128kbps_st_Rasmus.mp3 +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\MP3_48k_160-256kbps_st_disco.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_160-256kbps_st_disco.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_160-256kbps_st_Test1.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_160-256kbps_st_Test1.mp3 +delete foobar +[Endtest] + + + +[Test] +title launch.exe f:\data\MP3_48k_256kbps_mono_1kHzsine.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_256kbps_mono_1kHzsine.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_256kbps_mono_1kHzsine.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_256kbps_mono_1kHzsine.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_256kbps_st_1kHzsine.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_256kbps_st_1kHzsine.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_256kbps_st_1kHzsine_st2mono.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_256kbps_st_1kHzsine_st2mono.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_256kbps_st_dinner_bell.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_256kbps_st_dinner_bell.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_256kbps_st_drums.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_256kbps_st_drums.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_256kbps_st_flute.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_256kbps_st_flute.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_256kbps_st_jingle_bells.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_256kbps_st_jingle_bells.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_320kbps_st_ascending.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_320kbps_st_ascending.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_320kbps_st_Queen.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_320kbps_st_Queen.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_320kbps_st_reverb.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_320kbps_st_reverb.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_320kbps_st_stw.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_320kbps_st_stw.mp3 +delete foobar +[Endtest] + + +[Test] +title launch.exe f:\data\MP3_48k_320kbps_st_Test3.mp3 +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\MP3_48k_320kbps_st_Test3.mp3 +delete foobar +[Endtest] + +[Test] +title launch.exe mp3 Reliabity testcase +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\LivingFromMomentToMoment.mp3 +foobar SetTimeout 20 +delete foobar +[Endtest] + +[Test] +title launch.exe AAC Reliabity testcase +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\LivingFromMomentToMoment.aac +foobar SetTimeout 20 +delete foobar +[Endtest] + +[Test] +title launch.exe EAAC Reliabity testcase +create gstreamertestcases_suite3 foobar +foobar Example launch.exe f:\data\LivingFromMomentToMoment.m4a +foobar SetTimeout 20 +delete foobar +[Endtest] + +*/ \ No newline at end of file diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_test_apps/GLib-Liboil-Sisx/liboil.sisx Binary file gstreamer_test_apps/GLib-Liboil-Sisx/liboil.sisx has changed diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_test_apps/GLib-Liboil-Sisx/openc_glib_sp.sisx Binary file gstreamer_test_apps/GLib-Liboil-Sisx/openc_glib_sp.sisx has changed diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_test_apps/QtGSTPlayer/QtGSTPlayer.pro --- a/gstreamer_test_apps/QtGSTPlayer/QtGSTPlayer.pro Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_test_apps/QtGSTPlayer/QtGSTPlayer.pro Fri May 14 18:43:44 2010 -0500 @@ -7,7 +7,7 @@ # Name : QtGSTPlayer.pro # Part of : LibHb / gstplayer # Description : Project definition file for simple gstplayer -# Version : %version: 1 % +# Version : %version: 2 % # # Copyright ? 2008 Nokia. All rights reserved. # This material, including documentation and any related computer @@ -21,13 +21,35 @@ # TEMPLATE = app -TARGET = +TARGET = QtGSTPlayer DEPENDPATH += . -INCLUDEPATH += . - -# Input +HEADERS += folderview.h record_play.h views.h + SOURCES += main.cpp folderview.cpp views.cpp record_play.c -HEADERS += folderview.h views.h RESOURCES += QtGSTPlayer.qrc +DEFINES += HB_GESTURE_FW HB_EFFECTS +INCLUDEPATH += /epoc32/include/mw/hb/hbcore \ + /epoc32/include/mw/hb/hbfeedback \ + /epoc32/include/mw/hb/hbinput \ + /epoc32/include/mw/hb/hbutils \ + /epoc32/include/mw/hb/hbwidgets \ + MW_LAYER_SYSTEMINCLUDE \ + OS_LAYER_LIBC_SYSTEMINCLUDE \ + OS_LAYER_GLIB_SYSTEMINCLUDE \ + MW_LAYER_GSTREAMER_SYSTEMINCLUDE + +#UNIX style Lib inclusion +LIBS += -lhbcore -lhbwidgets -llibglib -llibgobject -llibgthread \ + -llibgstreamer -llibgstbase -llibgstcontroller + + +symbian { + TARGET.UID2 = 0x2002c391 + TARGET.UID3 = 0x2002c392 + TARGET.EPOCHEAPSIZE = 0x100000 0x10000000 + TARGET.CAPABILITY += All -Tcb + } + + diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_test_apps/QtGSTPlayer/folderview.cpp --- a/gstreamer_test_apps/QtGSTPlayer/folderview.cpp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_test_apps/QtGSTPlayer/folderview.cpp Fri May 14 18:43:44 2010 -0500 @@ -118,11 +118,6 @@ mainWindow()->setCurrentView(Views::folderView()); } -/*void FolderView::settingsViewTriggered() -{ - mainWindow()->setCurrentView(Views::settingsView()); -}*/ - void FolderView::showNote(const int err) { if(err) diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_test_apps/QtGSTPlayer/views.cpp --- a/gstreamer_test_apps/QtGSTPlayer/views.cpp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_test_apps/QtGSTPlayer/views.cpp Fri May 14 18:43:44 2010 -0500 @@ -18,14 +18,5 @@ // 0 since folderView was added first to the main window return win->viewAt(0); } - -/*! - Returns the pointer to settings view. -*/ - /* HbFormView *settingsView() - { - // 1 since settingsView was the second view added - return static_cast(win->viewAt(1)); - } - */ + } diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_test_apps/gstplayer/group/gstplayer.mmp --- a/gstreamer_test_apps/gstplayer/group/gstplayer.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_test_apps/gstplayer/group/gstplayer.mmp Fri May 14 18:43:44 2010 -0500 @@ -74,12 +74,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../../include/gstreamer -USERINCLUDE ../../../include/gstreamer/gst -USERINCLUDE ../../../include/gstreamer/gst/base -USERINCLUDE ../../../include/gstreamer/gst/controller -USERINCLUDE ../../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../../include/gstreamer/gst/net +MW_LAYER_GSTREAMER_SYSTEMINCLUDE LIBRARY euser.lib LIBRARY apparc.lib diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_test_apps/miscfiles/GStreamer_udeb_STUB_SIS.bat --- a/gstreamer_test_apps/miscfiles/GStreamer_udeb_STUB_SIS.bat Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_test_apps/miscfiles/GStreamer_udeb_STUB_SIS.bat Fri May 14 18:43:44 2010 -0500 @@ -1,18 +1,24 @@ -rem -rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -rem All rights reserved. -rem This component and the accompanying materials are made available -rem under the terms of the License "Symbian Foundation License v1.0" -rem which accompanies this distribution, and is available -rem at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". -rem -rem Initial Contributors: -rem Nokia Corporation - initial contribution. -rem -rem Contributors: -rem -rem Description: GStreamer SisStub -rem +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser 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 +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser 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. +* +* Description: +* +*/ @echo off echo ---------------------------- diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_test_apps/miscfiles/GStreamer_urel_STUB_SIS.bat --- a/gstreamer_test_apps/miscfiles/GStreamer_urel_STUB_SIS.bat Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_test_apps/miscfiles/GStreamer_urel_STUB_SIS.bat Fri May 14 18:43:44 2010 -0500 @@ -1,18 +1,24 @@ -rem -rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -rem All rights reserved. -rem This component and the accompanying materials are made available -rem under the terms of the License "Symbian Foundation License v1.0" -rem which accompanies this distribution, and is available -rem at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". -rem -rem Initial Contributors: -rem Nokia Corporation - initial contribution. -rem -rem Contributors: -rem -rem Description: GStreamer Sis Stub for UREL -rem +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser 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 +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser 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. +* +* Description: +* +*/ @echo off echo ---------------------------- diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_test_apps/miscfiles/copyplugins.bat --- a/gstreamer_test_apps/miscfiles/copyplugins.bat Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_test_apps/miscfiles/copyplugins.bat Fri May 14 18:43:44 2010 -0500 @@ -1,3 +1,25 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser 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 +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser 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. +* +* Description: +* +*/ + md \epoc32\release\winscw\udeb\z\sys\bin\plugins COPY \epoc32\release\winscw\udeb\libgstcoreelements.dll \epoc32\release\winscw\udeb\z\sys\bin\plugins\libgstcoreelements.dll diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstreamer_test_apps/miscfiles/createsis.bat --- a/gstreamer_test_apps/miscfiles/createsis.bat Fri Apr 30 19:11:56 2010 -0500 +++ b/gstreamer_test_apps/miscfiles/createsis.bat Fri May 14 18:43:44 2010 -0500 @@ -1,3 +1,25 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser 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 +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser 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. +* +* Description: +* +*/ + del ..\..\SIS\gstreamer*.sis* call GStreamer_udeb_STUB_SIS.bat diff -r 24ed0baaf8e5 -r 7e3786c5ed27 gstregistrygenerator/group/gstregistrygenerator.mmp --- a/gstregistrygenerator/group/gstregistrygenerator.mmp Fri Apr 30 19:11:56 2010 -0500 +++ b/gstregistrygenerator/group/gstregistrygenerator.mmp Fri May 14 18:43:44 2010 -0500 @@ -50,13 +50,7 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_GLIB_SYSTEMINCLUDE -USERINCLUDE ../../include/gstreamer -USERINCLUDE ../../include/gstreamer/gst -USERINCLUDE ../../include/gstreamer/gst/base -USERINCLUDE ../../include/gstreamer/gst/controller -USERINCLUDE ../../include/gstreamer/gst/dataprotocol -USERINCLUDE ../../include/gstreamer/gst/net - +MW_LAYER_GSTREAMER_SYSTEMINCLUDE SOURCEPATH ../src diff -r 24ed0baaf8e5 -r 7e3786c5ed27 rom/gstreamer.iby --- a/rom/gstreamer.iby Fri Apr 30 19:11:56 2010 -0500 +++ b/rom/gstreamer.iby Fri May 14 18:43:44 2010 -0500 @@ -29,6 +29,7 @@ #define GSTREAMER_IBY #include +#include #ifdef FF_GSTREAMER @@ -77,11 +78,13 @@ file=ABI_DIR\BUILD_DIR\libgstrtp.dll SHARED_LIB_DIR\libgstrtp.dll file=ABI_DIR\BUILD_DIR\libgstgdp.dll SHARED_LIB_DIR\libgstgdp.dll file=ABI_DIR\BUILD_DIR\libgstvolume.dll SHARED_LIB_DIR\libgstvolume.dll +file=ABI_DIR\BUILD_DIR\libgstmpegaudioparse.dll SHARED_LIB_DIR\libgstmpegaudioparse.dll +file=ABI_DIR\BUILD_DIR\libgstnokiaaacdec.dll SHARED_LIB_DIR\libgstnokiaaacdec.dll +file=ABI_DIR\BUILD_DIR\libgstqtdemux.dll SHARED_LIB_DIR\libgstqtdemux.dll file=ABI_DIR\BUILD_DIR\libgstamrmux.dll SHARED_LIB_DIR\libgstamrmux.dll -file=ABI_DIR\BUILD_DIR\libgstnokiaaacenc.dll SHARED_LIB_DIR\libgstnokiaaacenc.dll file=ABI_DIR\BUILD_DIR\gstqtmux.dll SHARED_LIB_DIR\gstqtmux.dll +file=ABI_DIR\BUILD_DIR\libgstnokiaaacenc.dll SHARED_LIB_DIR\libgstnokiaaacenc.dll file=ABI_DIR\BUILD_DIR\GstAudioRecordBin.dll SHARED_LIB_DIR\GstAudioRecordBin.dll -//file=ABI_DIR\BUILD_DIR\liboil.dll SHARED_LIB_DIR\liboil.dll //GStreamer_Stub data=ZSYSTEM\install\gstreamer_stub.sis System\Install\gstreamer_stub.sis diff -r 24ed0baaf8e5 -r 7e3786c5ed27 sis/gstreamer_framework.pkg Binary file sis/gstreamer_framework.pkg has changed