1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
require 'formula'
class Mpd < Formula
homepage "http://www.musicpd.org/"
stable do
url "http://www.musicpd.org/download/mpd/0.17/mpd-0.17.5.tar.bz2"
sha1 "91e4d8d364a3db02e6f92676dd938880e5bb200a"
# Removes usage of deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE constant
# We're many versions behind; this bug has long since been fixed upstream
patch :DATA
end
head do
url "git://git.musicpd.org/master/mpd.git"
depends_on "autoconf" => :build
depends_on "automake" => :build
end
option "with-wavpack", "Build with wavpack support (for .wv files)"
option "with-lastfm", "Build with last-fm support (for experimental Last.fm radio)"
option "with-lame", "Build with lame support (for MP3 encoding when streaming)"
option "with-two-lame", "Build with two-lame support (for MP2 encoding when streaming)"
option "with-flac", "Build with flac support (for Flac encoding when streaming)"
option "with-vorbis", "Build with vorbis support (for Ogg encoding)"
option "with-yajl", "Build with yajl support (for playing from soundcloud)"
if MacOS.version < :lion
option "with-libwrap", "Build with libwrap (TCP Wrappers) support"
elsif MacOS.version == :lion
option "with-libwrap", "Build with libwrap (TCP Wrappers) support (buggy)"
end
depends_on "pkg-config" => :build
depends_on "glib"
depends_on "libid3tag"
depends_on "sqlite"
depends_on "libsamplerate"
depends_on "ffmpeg" # lots of codecs
# mpd also supports mad, mpg123, libsndfile, and audiofile, but those are
# redundant with ffmpeg
depends_on "fluid-synth" # MIDI
depends_on "faad2" # MP4/AAC
depends_on "wavpack" => :optional # WavPack
depends_on "libshout" => :optional # Streaming (also pulls in Vorbis encoding)
depends_on "lame" => :optional # MP3 encoding
depends_on "two-lame" => :optional # MP2 encoding
depends_on "flac" => :optional # Flac encoding
depends_on "jack" => :optional # Output to JACK
depends_on "libmms" => :optional # MMS input
depends_on "libzzip" => :optional # Reading from within ZIPs
depends_on "yajl" => :optional # JSON library for SoundCloud
depends_on "libvorbis" if build.with? "vorbis" # Vorbis support
def install
if build.include? "lastfm" or build.include? "libwrap" \
or build.include? "enable-soundcloud"
opoo "You are using an option that has been replaced."
opoo "See this formula's caveats for details."
end
if build.with? "libwrap" and MacOS.version > :lion
opoo "Ignoring --with-libwrap: TCP Wrappers were removed in OSX 10.8"
end
system "./autogen.sh" if build.head?
args = %W[
--disable-debug
--disable-dependency-tracking
--prefix=#{prefix}
--enable-bzip2
--enable-ffmpeg
--enable-fluidsynth
]
args << "--disable-mad"
args << "--disable-curl" if MacOS.version <= :leopard
args << "--with-faad=#{Formula["faad2"].opt_prefix}"
args << "--enable-zzip" if build.with? "libzzip"
args << "--enable-lastfm" if build.with? "lastfm"
args << "--disable-libwrap" if build.without? "libwrap"
args << "--disable-lame-encoder" if build.without? "lame"
args << "--disable-soundcloud" if build.without? "yajl"
args << "--enable-vorbis-encoder" if build.with? "vorbis"
system "./configure", *args
system "make"
ENV.j1 # Directories are created in parallel, so let"s not do that
system "make install"
end
def caveats
<<-EOS
As of mpd-0.17.4, this formula no longer enables support for streaming
output by default. If you want streaming output, you must now specify
the --with-libshout, --with-lame, --with-twolame, and/or --with-flac
options explicitly. (Use '--with-libshout --with-lame --with-flac' for
the pre-0.17.4 behavior.)
As of mpd-0.17.4, this formula has renamed options as follows:
--lastfm -> --with-lastfm
--libwrap -> --with-libwrap (unsupported in OSX >= 10.8)
--enable-soundcloud -> --with-yajl
EOS
end
end
__END__
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 58bd2f5..65aa37f 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -299,11 +299,11 @@ ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is,
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,25,0)
- uint8_t aligned_buffer[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2 + 16];
+ uint8_t aligned_buffer[(192000 * 3) / 2 + 16];
const size_t buffer_size = sizeof(aligned_buffer);
#else
/* libavcodec < 0.8 needs an aligned buffer */
- uint8_t audio_buf[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2 + 16];
+ uint8_t audio_buf[(192000 * 3) / 2 + 16];
size_t buffer_size = sizeof(audio_buf);
int16_t *aligned_buffer = align16(audio_buf, &buffer_size);
#endif
|
