head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.8 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.6 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.4 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.2 pkgsrc-2011Q2-base:1.9 pkgsrc-2010Q2:1.8.0.2 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.7.0.4 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.2 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.6.0.6 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.4 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.2 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.5.0.6 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.4 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.2 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.4.0.8 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.6 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.4 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.2 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.3.0.4 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.2 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.2.0.8 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2; locks; strict; comment @# @; 1.9 date 2010.07.13.17.52.17; author drochner; state dead; branches; next 1.8; 1.8 date 2010.05.14.16.30.57; author drochner; state Exp; branches; next 1.7; 1.7 date 2009.11.20.11.51.32; author drochner; state Exp; branches; next 1.6; 1.6 date 2009.02.27.21.10.43; author wiz; state Exp; branches; next 1.5; 1.5 date 2008.08.06.18.17.24; author drochner; state Exp; branches; next 1.4; 1.4 date 2007.07.06.19.13.13; author drochner; state dead; branches; next 1.3; 1.3 date 2007.01.13.09.18.21; author wiz; state Exp; branches; next 1.2; 1.2 date 2006.02.13.19.22.33; author wiz; state dead; branches; next 1.1; 1.1 date 2006.01.30.21.20.42; author rillig; state Exp; branches; next ; desc @@ 1.9 log @update to 0.10.23 changes: -support more colour spaces and pixel formats in multiple plugins -VP8 support in various demuxers -deinterlace: make automatic detection of interlacing the default -implement push mode seeking in various demuxers -video filter consolidation -misc fixes and improvements @ text @$NetBSD: patch-ac,v 1.8 2010/05/14 16:30:57 drochner Exp $ --- gst/udp/Makefile.in.orig 2010-04-28 01:49:05.000000000 +0000 +++ gst/udp/Makefile.in @@@@ -903,7 +903,7 @@@@ $(glib_gen_basename)-enumtypes.h: $(glib $^ > $@@ $(glib_gen_basename)-enumtypes.c: $(glib_enum_headers) - @@if test "x$(glib_enum_headers)" == "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi + @@if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi $(AM_V_GEN)glib-mkenums \ --fhead "#include \"$(glib_gen_basename)-enumtypes.h\"\n$(enum_headers)" \ --fprod "\n/* enumerations from \"@@filename@@\" */" \ @ 1.8 log @update to 0.10.22 many fixes and improvements, for detailed information see the changelog @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @update to 0.10.17 changes: RTP improvements Support automatic cropping in videobox Add TTL multicast UDP property AVI demux push mode fixes and performance improvements Support large and unusual chunks sizes in wav Quicktime demuxer improvements JPEG decode fixes and speedups Support interlaced Y4M file output DV demuxer improvements Pulseaudio fixes and improvements Support Pulseaudio PLAY/PAUSE requests speexdec improvements FLV demuxer improvements Fix audio noise in the Equalizer plugin, and other improvements Fix compilation on OS/X Snow Leopard AVI muxer fixes Support MPEG V4L2 devices and improve timestamping Better jpeg2k support Many other bug fixes and improvements @ text @d3 1 a3 1 --- gst/udp/Makefile.in.orig 2009-11-16 23:41:11.000000000 +0100 d5 1 a5 1 @@@@ -880,7 +880,7 @@@@ $(glib_gen_basename)-enumtypes.h: $(glib d11 1 a11 1 glib-mkenums \ @ 1.6 log @Update to 0.10.14: This is GStreamer Good Plug-ins 0.10.14, "Disaffected Affectation" Changes since 0.10.13: * Add autodetect source elements * Improvements in RTP payload/depayload and RTSP * Support float input in wav, and require depth == width * Support inverted RGB video in avi * Compilation fixes and smarter format selection in V4L2 support * Use libv4l when available * Don't install static plugin libraries any more * Matroska muxing: Add Dirac, fix AAC * Improve qtdemux segment handling * Add presets to equalizer * OS/X video and audio output improvements * Rework Pulseaudio audio output * Support basic and digest auth in souphttpsrc * Use libsoup-gnome instead of libsoup when available * DV demuxer fixes * New IIR and FIR base classes and echo filter in audiofx plugin * Improved spectrum analysis plugin * 8 bit greyscale support in v4l2src and videocrop * New aspectratiocrop element * Many other bug fixes and improvements Bugs fixed since 0.10.13: * 561502 : Not-negociated error in udpsrc * 522183 : add preset suport to gstequalizer * 523813 : [autodetect] add autovideosrc and autoaudiosrc * 557709 : goom should have license headers in all source files * 560155 : segfault when trying to set tag to NULL with avimux * 527951 : [new element] aspectratiocrop * 529379 : RTSP seeks when pipeline is in STATE_PAUSED * 532409 : RTP payload/depayloader for G.729 * 537539 : [pulse] Rhythmbox starts using 100% of CPU time when puls... * 537540 : [pulse] Causes a deadlock when the pulseserver dies * 537543 : [pulse] sink/src should have " volume " property (was GstMi... * 545033 : [v4l2src] Add support for camera specific formats * 552140 : [soup] use libsoup-gnome for proxy configuration if avail... * 556019 : Add the ability to make souphttpsrc act as a live source * 556484 : Implement getcaps in rtpL16pay * 556641 : rtpL16depay doesn't support multichannel audio * 556802 : Misspelled messages * 556955 : [videocrop] fails to renegotiate * 556986 : pulsesink deadlocks when raising an error * 557260 : [equalizer] Calculates coefficients for every buffer * 557293 : Argument type mismatch on Windows * 557294 : cross mingw32 gcc: getaddrinfo is not in ws2_32.dll befor... * 557710 : Memory leak related to matroskamux's request pads * 558427 : rtpmpapay/depay are too wide * 558638 : Compiler error on v4l2 * 558711 : gst-plugins-good-0.10.11 compile fails * 559288 : [qtdemux] deadly embrace! * 559545 : rtspsrc could not receive data from RTSP server because o... * 559547 : Seek bugs when playing rtsp video in m.youtube.com * 560641 : rtp mp4 payloader doesn't flush the last frame upon EOS * 560756 : New Plugin: JPEG RTP Payloader * 561625 : Rtspsrc set segment's last_stop incorrectly * 561775 : souphttpsrc patch to support basic and digest authentication * 561802 : DLNA specific HTTP header missing * 561990 : qtdemux build fails on mingw due to missing definition of... * 562434 : [wavenc] Add support for a-law and mu-law encoded wav files * 562572 : multiudpsink handles errors in _render() too aggressively * 563414 : Fix for SunAudioMixer plugin * 563504 : add libv4l2 support to v4l2 gst plugin - required for mos... * 563509 : [rtp_data_test] Complains about negotiation errors with m... * 563510 : [videocrop] 1x1 unit test fails * 564437 : rtpjpegdepay was unable to handle frame dimensions greate... * 564948 : Fix and clean up osxaudio * 565850 : mov files can contain xvid, fmp4 and ac3 tracks * 566616 : v4l2src: b/w support * 566843 : [pulse] Terminating an audio stream hangs the application * 567577 : [audiofx] Add generic IIR/FIR audio filter elements * 567642 : spectrum element has undocumented arbitrary limitation on... * 567746 : fix for 547227 created a ref loop * 567794 : [PATCH] Rework pulse plugin * 567800 : Mp4 created by Avidemux don't play. * 567853 : osxaudiosrc does not build on 10.4 * 567874 : [audiofx] Echo/Reverb filter * 567955 : [spectrum] Need compensation for rounding errors * 567992 : [videocrop] wrong mouse navigation commands while cropping * 568395 : [audiofx] Rename audioreverb to audioecho * 568780 : elements/videocrop check fails * 568809 : Patch needed for building gst-plugins-good 0.10.13 on Sol... * 569820 : In some cases v4l2src element does not return correct norm * 570343 : equalizer bands != specified parameters * 570435 : Read Title element of Matroska files * 571038 : [osxvideosink] build fail * 571150 : aspectratiocrop : Memory leak * 571153 : [pulsemixer] compiler warnings (on ARM) * 571204 : [pulsesink] PA assertion failure triggers abort * 570581 : osxvideosink: non-embedded mode is badly broken and shoul... * 341752 : [rtspsrc] 500 Internal Server Error response with tagessc... * 420658 : gconfaudiosink is not behaving normally * 558554 : [avidemux] avidemux not recognizing certain uncompressed ... * 561580 : GStreamer does not play a specific WAV file * 563056 : " rtpjpegdepay ! jpegdec " doesnt works * 565441 : Smoke encoder doesn't set caps correctly * 567952 : videocrop: add b/w support @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 2008/08/06 18:17:24 drochner Exp $ d3 1 a3 1 --- gst/udp/Makefile.in.orig 2009-02-19 11:46:06.000000000 +0000 d5 1 a5 1 @@@@ -824,7 +824,7 @@@@ uninstall-am: uninstall-pluginLTLIBRARIE d8 1 a8 1 %-enumtypes.c: $(glib_enum_headers) d12 1 a12 1 --fhead "#include \"$*-enumtypes.h\"\n$(enum_headers)" \ @ 1.5 log @update to 0.10.9 changes: Replaygain elements moved from Bad Interleave/Deinterleave elements moved from Bad Pulseaudio plugin http://pulseaudio.org is now integrated New simple Karaoke audio effect plugin Improvements in v4l2src Multi-channel FLAC file fixes AVI and Quicktime reverse playback support AVI and Matroska muxing improvements New element for rendering SMPTE transitions into alpha channels Many improvements in the Win32 directdraw elements Error out cleanly for encrypted streams RTP/UDP handling improvements RTSP digest authentatication implemented. New RTP Pay/Depay-loaders for Speex, G.729, DV & raw video/audio Error concealment for Speex Many other bug-fixes and enhancements @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- gst/udp/Makefile.in.orig 2008-08-04 16:38:33.000000000 +0200 d5 1 a5 1 @@@@ -987,7 +987,7 @@@@ uninstall-am: uninstall-info-am uninstal @ 1.4 log @update to 0.10.6 changes: -Much improved RTSP/RTP and V4l2 support -New plugins - audiopanorama, audioinvert, audiodynamic, audioamplify -qtdemux, videocrop and wavpack elements moved from Bad Plugins -Fixes in avi and matroska muxing -Fixes in wavparse, sunaudio, AVI demuxing, ID3 tag handling -gamma element ported to 0.10 @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2007/01/13 09:18:21 wiz Exp $ d3 11 a13 486 --- ext/flac/gstflacdec.c.orig 2006-10-16 18:22:46.000000000 +0000 +++ ext/flac/gstflacdec.c @@@@ -56,6 +56,12 @@@@ #include +#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 +#define LEGACY_FLAC +#else +#undef LEGACY_FLAC +#endif + GST_DEBUG_CATEGORY_STATIC (flacdec_debug); #define GST_CAT_DEFAULT flacdec_debug @@@@ -93,9 +99,13 @@@@ static void gst_flac_dec_reset_decoders static void gst_flac_dec_setup_seekable_decoder (GstFlacDec * flacdec); static void gst_flac_dec_setup_stream_decoder (GstFlacDec * flacdec); +#ifdef LEGACY_FLAC static FLAC__SeekableStreamDecoderReadStatus gst_flac_dec_read_seekable (const FLAC__SeekableStreamDecoder * decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); +static FLAC__StreamDecoderReadStatus +gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, + FLAC__byte buffer[], unsigned *bytes, void *client_data); static FLAC__SeekableStreamDecoderSeekStatus gst_flac_dec_seek (const FLAC__SeekableStreamDecoder * decoder, FLAC__uint64 position, void *client_data); @@@@ -107,9 +117,6 @@@@ gst_flac_dec_length (const FLAC__Seekabl FLAC__uint64 * length, void *client_data); static FLAC__bool gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * decoder, void *client_data); -static FLAC__StreamDecoderReadStatus -gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, - FLAC__byte buffer[], unsigned *bytes, void *client_data); static FLAC__StreamDecoderWriteStatus gst_flac_dec_write_seekable (const FLAC__SeekableStreamDecoder * decoder, const FLAC__Frame * frame, @@@@ -123,13 +130,38 @@@@ static void gst_flac_dec_metadata_callba const FLAC__StreamMetadata * metadata, void *client_data); static void gst_flac_dec_metadata_callback_stream (const FLAC__StreamDecoder * decoder, const FLAC__StreamMetadata * metadata, void *client_data); -static void gst_flac_dec_metadata_callback (GstFlacDec * flacdec, - const FLAC__StreamMetadata * metadata); static void gst_flac_dec_error_callback_seekable (const FLAC__SeekableStreamDecoder * decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); static void gst_flac_dec_error_callback_stream (const FLAC__StreamDecoder * decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); +#else +static FLAC__StreamDecoderReadStatus +gst_flac_dec_read_seekable (const FLAC__StreamDecoder * decoder, + FLAC__byte buffer[], size_t *bytes, void *client_data); +static FLAC__StreamDecoderReadStatus +gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, + FLAC__byte buffer[], size_t *bytes, void *client_data); +static FLAC__StreamDecoderSeekStatus +gst_flac_dec_seek (const FLAC__StreamDecoder * decoder, + FLAC__uint64 position, void *client_data); +static FLAC__StreamDecoderTellStatus +gst_flac_dec_tell (const FLAC__StreamDecoder * decoder, + FLAC__uint64 * position, void *client_data); +static FLAC__StreamDecoderLengthStatus +gst_flac_dec_length (const FLAC__StreamDecoder * decoder, + FLAC__uint64 * length, void *client_data); +static FLAC__bool gst_flac_dec_eof (const FLAC__StreamDecoder * decoder, + void *client_data); +static FLAC__StreamDecoderWriteStatus +gst_flac_dec_write_stream (const FLAC__StreamDecoder * decoder, + const FLAC__Frame * frame, + const FLAC__int32 * const buffer[], void *client_data); +static void gst_flac_dec_metadata_callback_stream (const FLAC__StreamDecoder * + decoder, const FLAC__StreamMetadata * metadata, void *client_data); +static void gst_flac_dec_error_callback_stream (const FLAC__StreamDecoder * + decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); +#endif GST_BOILERPLATE (GstFlacDec, gst_flac_dec, GstElement, GST_TYPE_ELEMENT); #define GST_FLAC_DEC_SRC_CAPS \ @@@@ -212,7 +244,11 @@@@ static void gst_flac_dec_reset_decoders (GstFlacDec * flacdec) { if (flacdec->seekable_decoder) { +#ifdef LEGACY_FLAC FLAC__seekable_stream_decoder_delete (flacdec->seekable_decoder); +#else + FLAC__stream_decoder_delete (flacdec->seekable_decoder); +#endif flacdec->seekable_decoder = NULL; } @@@@ -238,6 +274,7 @@@@ gst_flac_dec_setup_seekable_decoder (Gst { gst_flac_dec_reset_decoders (dec); +#ifdef LEGACY_FLAC dec->seekable_decoder = FLAC__seekable_stream_decoder_new (); FLAC__seekable_stream_decoder_set_read_callback (dec->seekable_decoder, @@@@ -259,6 +296,12 @@@@ gst_flac_dec_setup_seekable_decoder (Gst FLAC__seekable_stream_decoder_set_error_callback (dec->seekable_decoder, gst_flac_dec_error_callback_seekable); FLAC__seekable_stream_decoder_set_client_data (dec->seekable_decoder, dec); +#else + dec->seekable_decoder = FLAC__stream_decoder_new (); + + FLAC__stream_decoder_set_metadata_respond (dec->seekable_decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); + FLAC__stream_decoder_set_md5_checking (dec->seekable_decoder, false); /* no point calculating since it's never checked here */ +#endif } static void @@@@ -270,17 +313,21 @@@@ gst_flac_dec_setup_stream_decoder (GstFl dec->stream_decoder = FLAC__stream_decoder_new (); +#ifdef LEGACY_FLAC FLAC__stream_decoder_set_read_callback (dec->stream_decoder, gst_flac_dec_read_stream); FLAC__stream_decoder_set_write_callback (dec->stream_decoder, gst_flac_dec_write_stream); - FLAC__stream_decoder_set_metadata_respond (dec->stream_decoder, - FLAC__METADATA_TYPE_VORBIS_COMMENT); FLAC__stream_decoder_set_metadata_callback (dec->stream_decoder, gst_flac_dec_metadata_callback_stream); FLAC__stream_decoder_set_error_callback (dec->stream_decoder, gst_flac_dec_error_callback_stream); FLAC__stream_decoder_set_client_data (dec->stream_decoder, dec); +#else + FLAC__stream_decoder_set_md5_checking (dec->stream_decoder, false); /* no point calculating since it's never checked here */ +#endif + FLAC__stream_decoder_set_metadata_respond (dec->stream_decoder, + FLAC__METADATA_TYPE_VORBIS_COMMENT); } static void @@@@ -544,6 +591,7 @@@@ gst_flac_dec_metadata_callback (GstFlacD } } +#ifdef LEGACY_FLAC static void gst_flac_dec_metadata_callback_seekable (const FLAC__SeekableStreamDecoder * d, const FLAC__StreamMetadata * metadata, void *client_data) @@@@ -552,6 +600,7 @@@@ gst_flac_dec_metadata_callback_seekable gst_flac_dec_metadata_callback (dec, metadata); } +#endif static void gst_flac_dec_metadata_callback_stream (const FLAC__StreamDecoder * decoder, @@@@ -587,12 +636,14 @@@@ gst_flac_dec_error_callback (GstFlacDec dec->last_flow = GST_FLOW_ERROR; } +#ifdef LEGACY_FLAC static void gst_flac_dec_error_callback_seekable (const FLAC__SeekableStreamDecoder * d, FLAC__StreamDecoderErrorStatus status, void *client_data) { gst_flac_dec_error_callback (GST_FLAC_DEC (client_data), status); } +#endif static void gst_flac_dec_error_callback_stream (const FLAC__StreamDecoder * d, @@@@ -601,9 +652,15 @@@@ gst_flac_dec_error_callback_stream (cons gst_flac_dec_error_callback (GST_FLAC_DEC (client_data), status); } +#ifdef LEGACY_FLAC static FLAC__SeekableStreamDecoderSeekStatus gst_flac_dec_seek (const FLAC__SeekableStreamDecoder * decoder, FLAC__uint64 position, void *client_data) +#else +static FLAC__StreamDecoderSeekStatus +gst_flac_dec_seek (const FLAC__StreamDecoder * decoder, + FLAC__uint64 position, void *client_data) +#endif { GstFlacDec *flacdec; @@@@ -612,12 +669,22 @@@@ gst_flac_dec_seek (const FLAC__SeekableS GST_DEBUG ("seek %" G_GINT64_FORMAT, position); flacdec->offset = position; +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK; +#else + return FLAC__STREAM_DECODER_SEEK_STATUS_OK; +#endif } +#ifdef LEGACY_FLAC static FLAC__SeekableStreamDecoderTellStatus gst_flac_dec_tell (const FLAC__SeekableStreamDecoder * decoder, FLAC__uint64 * position, void *client_data) +#else +static FLAC__StreamDecoderTellStatus +gst_flac_dec_tell (const FLAC__StreamDecoder * decoder, + FLAC__uint64 * position, void *client_data) +#endif { GstFlacDec *flacdec; @@@@ -627,12 +694,22 @@@@ gst_flac_dec_tell (const FLAC__SeekableS GST_DEBUG ("tell %" G_GINT64_FORMAT, *position); +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK; +#else + return FLAC__STREAM_DECODER_TELL_STATUS_OK; +#endif } +#ifdef LEGACY_FLAC static FLAC__SeekableStreamDecoderLengthStatus gst_flac_dec_length (const FLAC__SeekableStreamDecoder * decoder, FLAC__uint64 * length, void *client_data) +#else +static FLAC__StreamDecoderLengthStatus +gst_flac_dec_length (const FLAC__StreamDecoder * decoder, + FLAC__uint64 * length, void *client_data) +#endif { GstFlacDec *flacdec; GstFormat fmt = GST_FORMAT_BYTES; @@@@ -642,22 +719,40 @@@@ gst_flac_dec_length (const FLAC__Seekabl flacdec = GST_FLAC_DEC (client_data); if (!(peer = gst_pad_get_peer (flacdec->sinkpad))) +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR; +#else + return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR; +#endif gst_pad_query_duration (peer, &fmt, &len); gst_object_unref (peer); if (fmt != GST_FORMAT_BYTES || len == -1) +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR; +#else + return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR; +#endif *length = len; GST_DEBUG ("length %" G_GINT64_FORMAT, *length); +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK; +#else + return FLAC__STREAM_DECODER_LENGTH_STATUS_OK; +#endif } +#ifdef LEGACY_FLAC static FLAC__bool gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * decoder, void *client_data) +#else +static FLAC__bool +gst_flac_dec_eof (const FLAC__StreamDecoder * decoder, + void *client_data) +#endif { GstFlacDec *flacdec; GstFormat fmt; @@@@ -685,9 +780,15 @@@@ gst_flac_dec_eof (const FLAC__SeekableSt return ret; } +#ifdef LEGACY_FLAC static FLAC__SeekableStreamDecoderReadStatus gst_flac_dec_read_seekable (const FLAC__SeekableStreamDecoder * decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) +#else +static FLAC__StreamDecoderReadStatus +gst_flac_dec_read_seekable (const FLAC__StreamDecoder * decoder, + FLAC__byte buffer[], size_t *bytes, void *client_data) +#endif { GstFlacDec *flacdec; GstBuffer *buf; @@@@ -696,7 +797,11 @@@@ gst_flac_dec_read_seekable (const FLAC__ if (gst_pad_pull_range (flacdec->sinkpad, flacdec->offset, *bytes, &buf) != GST_FLOW_OK) +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR; +#else + return FLAC__STREAM_DECODER_READ_STATUS_ABORT; +#endif GST_DEBUG ("Read %d bytes at %" G_GUINT64_FORMAT, GST_BUFFER_SIZE (buf), flacdec->offset); @@@@ -705,12 +810,22 @@@@ gst_flac_dec_read_seekable (const FLAC__ gst_buffer_unref (buf); flacdec->offset += *bytes; +#ifdef LEGACY_FLAC return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK; +#else + return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; +#endif } +#ifdef LEGACY_FLAC static FLAC__StreamDecoderReadStatus gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) +#else +static FLAC__StreamDecoderReadStatus +gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, + FLAC__byte buffer[], size_t *bytes, void *client_data) +#endif { GstFlacDec *dec = GST_FLAC_DEC (client_data); guint len; @@@@ -880,6 +995,7 @@@@ done: return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; } +#ifdef LEGACY_FLAC static FLAC__StreamDecoderWriteStatus gst_flac_dec_write_seekable (const FLAC__SeekableStreamDecoder * decoder, const FLAC__Frame * frame, @@@@ -887,6 +1003,7 @@@@ gst_flac_dec_write_seekable (const FLAC_ { return gst_flac_dec_write (GST_FLAC_DEC (client_data), frame, buffer); } +#endif static FLAC__StreamDecoderWriteStatus gst_flac_dec_write_stream (const FLAC__StreamDecoder * decoder, @@@@ -900,7 +1017,12 @@@@ static void gst_flac_dec_loop (GstPad * sinkpad) { GstFlacDec *flacdec; +#ifdef LEGACY_FLAC FLAC__SeekableStreamDecoderState s; +#else + FLAC__StreamDecoderState s; + FLAC__StreamDecoderInitStatus is; +#endif flacdec = GST_FLAC_DEC (GST_OBJECT_PARENT (sinkpad)); @@@@ -908,9 +1030,15 @@@@ gst_flac_dec_loop (GstPad * sinkpad) if (flacdec->init) { GST_DEBUG_OBJECT (flacdec, "initializing decoder"); +#ifdef LEGACY_FLAC s = FLAC__seekable_stream_decoder_init (flacdec->seekable_decoder); if (s != FLAC__SEEKABLE_STREAM_DECODER_OK) goto analyze_state; +#else + is = FLAC__stream_decoder_init_stream (flacdec->seekable_decoder, gst_flac_dec_read_seekable, gst_flac_dec_seek, gst_flac_dec_tell, gst_flac_dec_length, gst_flac_dec_eof, gst_flac_dec_write_stream, gst_flac_dec_metadata_callback_stream, gst_flac_dec_error_callback_stream, flacdec); + if (is != FLAC__STREAM_DECODER_INIT_STATUS_OK) + goto analyze_state; +#endif /* FLAC__seekable_stream_decoder_process_metadata (flacdec->seekable_decoder); */ flacdec->init = FALSE; } @@@@ -920,15 +1048,31 @@@@ gst_flac_dec_loop (GstPad * sinkpad) flacdec->last_flow = GST_FLOW_OK; GST_LOG_OBJECT (flacdec, "processing single"); +#ifdef LEGACY_FLAC FLAC__seekable_stream_decoder_process_single (flacdec->seekable_decoder); +#else + FLAC__stream_decoder_process_single (flacdec->seekable_decoder); +#endif analyze_state: GST_LOG_OBJECT (flacdec, "done processing, checking encoder state"); +#ifdef LEGACY_FLAC s = FLAC__seekable_stream_decoder_get_state (flacdec->seekable_decoder); +#else + s = FLAC__stream_decoder_get_state (flacdec->seekable_decoder); +#endif switch (s) { +#ifdef LEGACY_FLAC case FLAC__SEEKABLE_STREAM_DECODER_OK: - case FLAC__SEEKABLE_STREAM_DECODER_SEEKING:{ + case FLAC__SEEKABLE_STREAM_DECODER_SEEKING: +#else + case FLAC__STREAM_DECODER_SEARCH_FOR_METADATA: + case FLAC__STREAM_DECODER_READ_METADATA: + case FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC: + case FLAC__STREAM_DECODER_READ_FRAME: +#endif + { GST_DEBUG_OBJECT (flacdec, "everything ok"); if (flacdec->last_flow != GST_FLOW_OK && @@@@ -956,9 +1100,18 @@@@ analyze_state: return; } - case FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM:{ +#ifdef LEGACY_FLAC + case FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM: +#else + case FLAC__STREAM_DECODER_END_OF_STREAM: +#endif + { GST_DEBUG_OBJECT (flacdec, "EOS"); +#ifdef LEGACY_FLAC FLAC__seekable_stream_decoder_reset (flacdec->seekable_decoder); +#else + FLAC__stream_decoder_reset (flacdec->seekable_decoder); +#endif if ((flacdec->segment.flags & GST_SEEK_FLAG_SEGMENT) != 0) { if (flacdec->segment.duration > 0) { @@@@ -972,6 +1125,7 @@@@ analyze_state: goto eos_and_pause; } +#ifdef LEGACY_FLAC case FLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR: case FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR: case FLAC__SEEKABLE_STREAM_DECODER_READ_ERROR: @@@@ -979,11 +1133,23 @@@@ analyze_state: case FLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED: case FLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK: case FLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED: +#else + case FLAC__STREAM_DECODER_OGG_ERROR: + case FLAC__STREAM_DECODER_SEEK_ERROR: + case FLAC__STREAM_DECODER_ABORTED: + case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR: + case FLAC__STREAM_DECODER_UNINITIALIZED: +#endif default:{ /* fixme: this error sucks -- should try to figure out when/if an more specific error was already sent via the callback */ +#ifdef LEGACY_FLAC GST_ELEMENT_ERROR (flacdec, STREAM, DECODE, (NULL), ("%s", FLAC__SeekableStreamDecoderStateString[s])); +#else + GST_ELEMENT_ERROR (flacdec, STREAM, DECODE, (NULL), + ("%s", FLAC__StreamDecoderStateString[s])); +#endif goto eos_and_pause; } } @@@@ -1113,11 +1279,19 @@@@ gst_flac_dec_chain (GstPad * pad, GstBuf if (dec->init) { GST_DEBUG_OBJECT (dec, "initializing decoder"); +#ifdef LEGACY_FLAC s = FLAC__stream_decoder_init (dec->stream_decoder); if (s != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA) { GST_ELEMENT_ERROR (GST_ELEMENT (dec), LIBRARY, INIT, (NULL), (NULL)); return GST_FLOW_ERROR; } +#else + s = FLAC__stream_decoder_init_stream (dec->stream_decoder, gst_flac_dec_read_stream, NULL, NULL, NULL, NULL, gst_flac_dec_write_stream, gst_flac_dec_metadata_callback_stream, gst_flac_dec_error_callback_stream, dec); + if (s != FLAC__STREAM_DECODER_INIT_STATUS_OK) { + GST_ELEMENT_ERROR (GST_ELEMENT (dec), LIBRARY, INIT, (NULL), (NULL)); + return GST_FLOW_ERROR; + } +#endif GST_DEBUG_OBJECT (dec, "initialized (framed=%d)", dec->framed); dec->init = FALSE; } @@@@ -1598,8 +1772,13 @@@@ gst_flac_dec_handle_seek_event (GstFlacD flacdec->seeking = TRUE; seek_ok = +#ifdef LEGACY_FLAC FLAC__seekable_stream_decoder_seek_absolute (flacdec->seekable_decoder, segment.start); +#else + FLAC__stream_decoder_seek_absolute (flacdec->seekable_decoder, + segment.start); +#endif flacdec->seeking = FALSE; @ 1.3 log @Add patches for gst-plugins0.10-flac to support flac-1.1.3. From Mandriva Cooker source rpm. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update to 0.10.2: This is GStreamer Good Plug-ins 0.10.2, "Papa was a rolling stone". Changes since 0.10.1: * New libcdio based CDDA reading element * APE tag reader ported * ID3 tag reading fixes * Sun Audio Sink fixes * GOOM and gconf element fixes * lots of bug and leak fixes Bugs fixed since 0.10.1: * 328336 : silence warings which make dvdec / dvdemux unusable * 315557 : Internal event problem with MP3s from vgmix.com * 323327 : [cdio] port cddasrc to 0.10 * 325148 : Bugs in G711 RTP packetization logic * 325649 : apetag plugin needs porting to 0.10 * 326446 : check that all elements in -good pass queries they can't ... * 326602 : id3demux is not compiling without ZLIB * 326683 : build problem caused by AS_LIBTOOL_TAGS([CXX]) * 326736 : gconf(audio|video)sink response to key changes * 326864 : [wavparse] time to bytes format conversion broken * 327009 : [esdsink] won't compile with includes in non-standard prefix * 327765 : [sunaudio] fixes for mixer and stuttering mp3 playback * 327825 : [matroskamux] Matroska muxer deadlock * 327871 : [videobox] crash when cropping * 328241 : id3demux emits NULL date for year tags * 328264 : Fix build with gcc 2.95 * 328531 : [matroskamux] doesn't send newsegment event, critical war... * 329181 : totem crash when using goom effect * 329810 : Fails to read ID3 tag * 330005 : Please use the autodetect sinks by default * 317658 : [cdio] support for cd-text and cd-g @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2006/01/30 21:20:42 rillig Exp $ d3 485 a487 22 Keywords: c90 --- gst/udp/gstdynudpsink.c.orig 2006-01-10 15:01:57.000000000 +0100 +++ gst/udp/gstdynudpsink.c 2006-01-30 21:35:15.000000000 +0100 @@@@ -187,6 +187,8 @@@@ gst_dynudpsink_render (GstBaseSink * bsi guint8 *data; GstNetBuffer *netbuf; struct sockaddr_in theiraddr; + guint16 destport; + guint32 destaddr; memset (&theiraddr, 0, sizeof (theiraddr)); @@@@ -203,9 +205,6 @@@@ gst_dynudpsink_render (GstBaseSink * bsi data = GST_BUFFER_DATA (netbuf); GST_DEBUG ("about to send %d bytes", size); - guint16 destport; - guint32 destaddr; - // let's get the address from the netbuffer gst_netaddress_get_ip4_address (&netbuf->to, &destaddr, &destport); @ 1.1 log @Added some patches for ISO C90 compatibility. @ text @d1 1 a1 1 $NetBSD$ @