[SCM] audacious-plugins/master: Remove ffaudio.diff, not needed anymore.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Thu Sep 6 18:34:41 UTC 2012
The following commit has been merged in the master branch:
commit 18d53c5018eaafb12ff33cd568cec29bfce07d37
Author: Alessio Treglia <alessio at debian.org>
Date: Thu Sep 6 20:27:35 2012 +0200
Remove ffaudio.diff, not needed anymore.
diff --git a/debian/patches/ffaudio.diff b/debian/patches/ffaudio.diff
deleted file mode 100644
index 5fb5375..0000000
--- a/debian/patches/ffaudio.diff
+++ /dev/null
@@ -1,192 +0,0 @@
-Description: Make audacious work with current unstable version of FFAUDIO
-Author: Cyril Lavier <cyril.lavier at davromaniak.eu>
-Last-Update: 2012-01-28
----
- configure.ac | 2
- src/ffaudio/ffaudio-core.c | 105 +++++++++++++++++++++++++++++++++++++++------
- 2 files changed, 94 insertions(+), 13 deletions(-)
-
---- audacious-plugins.orig/configure.ac
-+++ audacious-plugins/configure.ac
-@@ -501,7 +501,7 @@ AC_ARG_ENABLE(ffaudio,
-
- if test $enable_ffaudio = yes ; then
- PKG_CHECK_MODULES([FFMPEG],
-- [libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0],
-+ [libavcodec >= 52.64.0 libavformat >= 52.110.0 libavutil >= 50.42.0],
- [have_ffaudio=yes], [have_ffaudio=no])
- fi
-
---- audacious-plugins.orig/src/ffaudio/ffaudio-core.c
-+++ audacious-plugins/src/ffaudio/ffaudio-core.c
-@@ -36,6 +36,14 @@
- #include <audacious/audtag.h>
- #include <libaudcore/audstrings.h>
-
-+#if ! CHECK_LIBAVFORMAT_VERSION (53, 5, 0)
-+#define avformat_find_stream_info(i, o) av_find_stream_info (i)
-+#endif
-+
-+#if ! CHECK_LIBAVCODEC_VERSION (53, 8, 0)
-+#define avcodec_open2(a, c, o) avcodec_open (a, c)
-+#endif
-+
- static GMutex *ctrl_mutex = NULL;
- static gint64 seek_value = -1;
- static gboolean stop_flag = FALSE;
-@@ -412,8 +420,11 @@ static gboolean ffaudio_play (InputPlayb
- AVCodecContext *c = NULL;
- AVStream *s = NULL;
- AVPacket pkt = {.data = NULL};
-+ guint8 *outbuf = NULL, *resbuf = NULL;
- gint i, stream_id, errcount;
-- gboolean codec_opened = FALSE;
-+ gint in_sample_size, out_sample_size, chunk_size;
-+ ReSampleContext *resctx = NULL;
-+ gboolean codec_opened = FALSE, do_resampling = FALSE;
- gint out_fmt;
- gboolean seekable;
- gboolean error = FALSE;
-@@ -449,14 +460,38 @@ static gboolean ffaudio_play (InputPlayb
-
- codec_opened = TRUE;
-
-+ /* Determine if audio conversion or resampling is needed */
-+ in_sample_size = av_get_bytes_per_sample (c->sample_fmt);
-+ out_sample_size = av_get_bytes_per_sample (SAMPLE_FMT_S16);
-+
-+ chunk_size = out_sample_size * c->channels * (c->sample_rate / 50);
-+
-+
- switch (c->sample_fmt) {
- case AV_SAMPLE_FMT_U8: out_fmt = FMT_U8; break;
- case AV_SAMPLE_FMT_S16: out_fmt = FMT_S16_NE; break;
- case AV_SAMPLE_FMT_S32: out_fmt = FMT_S32_NE; break;
- case AV_SAMPLE_FMT_FLT: out_fmt = FMT_FLOAT; break;
-- default:
-- fprintf (stderr, "ffaudio: Unsupported audio format %d\n", (int) c->sample_fmt);
-- goto error_exit;
-+ default: do_resampling = TRUE; break;
-+ }
-+
-+ if (do_resampling)
-+ {
-+ /* Initialize resampling context */
-+ out_fmt = FMT_S16_NE;
-+
-+ AUDDBG("resampling needed chn=%d, rate=%d, fmt=%d -> chn=%d, rate=%d, fmt=S16NE\n",
-+ c->channels, c->sample_rate, c->sample_fmt,
-+ c->channels, c->sample_rate);
-+
-+ resctx = av_audio_resample_init(
-+ c->channels, c->channels,
-+ c->sample_rate, c->sample_rate,
-+ SAMPLE_FMT_S16, c->sample_fmt,
-+ 16, 10, 0, 0.8);
-+
-+ if (resctx == NULL)
-+ goto error_exit;
- }
-
- /* Open audio output */
-@@ -470,6 +505,10 @@ static gboolean ffaudio_play (InputPlayb
-
- playback->set_gain_from_playlist(playback);
-
-+ /* Allocate output buffer aligned to 16 byte boundary */
-+ outbuf = av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
-+ resbuf = av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
-+
- AUDDBG("setting parameters\n");
-
- if (pause)
-@@ -539,6 +578,9 @@ static gboolean ffaudio_play (InputPlayb
- memcpy(&tmp, &pkt, sizeof(tmp));
- while (tmp.size > 0 && !stop_flag)
- {
-+ gint len, out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+ guint8 *outbuf_p;
-+
- /* Check for seek request and bail out if we have one */
- g_mutex_lock(ctrl_mutex);
- if (seek_value != -1)
-@@ -553,25 +595,60 @@ static gboolean ffaudio_play (InputPlayb
- }
- g_mutex_unlock(ctrl_mutex);
-
-- AVFrame * frame = avcodec_alloc_frame ();
-- int decoded = 0;
-- int len = avcodec_decode_audio4 (c, frame, & decoded, & tmp);
-+ /* Decode whatever we can of the frame data */
-+ len = avcodec_decode_audio3(c, (gint16 *)outbuf, &out_size, &tmp);
-
- if (len < 0)
- {
-- fprintf (stderr, "ffaudio: decode_audio() failed, code %d\n", len);
-+ AUDDBG("codec failure, breaking out of loop\n");
- break;
- }
-
- tmp.size -= len;
- tmp.data += len;
-
-- if (! decoded)
-+ if (out_size <= 0)
- continue;
-
-- playback->output->write_audio (frame->data[0], FMT_SIZEOF (out_fmt)
-- * c->channels * frame->nb_samples);
-- av_free (frame);
-+ /* Perform audio resampling if necessary */
-+ if (do_resampling)
-+ {
-+ out_size = audio_resample(resctx,
-+ (gint16 *)resbuf, (gint16 *)outbuf,
-+ out_size / in_sample_size) * out_sample_size;
-+ outbuf_p = resbuf;
-+ }
-+ else
-+ outbuf_p = outbuf;
-+
-+ /* Output audio in small blocks */
-+ while (out_size > 0 && !stop_flag && (stop_time < 0 ||
-+ playback->output->written_time () < stop_time))
-+ {
-+ gint writeoff = MIN (chunk_size, out_size);
-+
-+ playback->output->write_audio((gint16 *)outbuf_p, writeoff);
-+
-+ outbuf_p += writeoff;
-+ out_size -= writeoff;
-+
-+ /* Check for seek request and bail out if we have one */
-+ g_mutex_lock(ctrl_mutex);
-+ if (seek_value != -1)
-+ {
-+ if (!seekable)
-+ {
-+ seek_value = -1;
-+ g_cond_signal(ctrl_cond);
-+ }
-+ else
-+ {
-+ g_mutex_unlock(ctrl_mutex);
-+ break;
-+ }
-+ }
-+ g_mutex_unlock(ctrl_mutex);
-+ }
- }
-
- if (pkt.data)
-@@ -584,6 +661,10 @@ error_exit:
-
- stop_flag = TRUE;
-
-+ av_free(outbuf);
-+ av_free(resbuf);
-+ if (resctx != NULL)
-+ audio_resample_close(resctx);
- if (pkt.data)
- av_free_packet(&pkt);
- if (codec_opened)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 31008f9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-ffaudio.diff
--
Plugins for audacious
More information about the pkg-multimedia-commits
mailing list