Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
3d3bca53
Commit
3d3bca53
authored
Sep 01, 2011
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/oggflac: delete this obsolete plugin
libOggFLAC has been deprecated for 5 years now, and we havn't been testing it for a long time. Let's delete it.
parent
6a3008d7
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
411 deletions
+4
-411
INSTALL
INSTALL
+0
-5
Makefile.am
Makefile.am
+0
-4
NEWS
NEWS
+1
-0
configure.ac
configure.ac
+2
-47
oggflac_decoder_plugin.c
src/decoder/oggflac_decoder_plugin.c
+0
-354
decoder_list.c
src/decoder_list.c
+1
-1
No files found.
INSTALL
View file @
3d3bca53
...
...
@@ -84,11 +84,6 @@ For Ogg Vorbis support. You will need libogg and libvorbis.
FLAC - http://flac.sourceforge.net/
For FLAC support. You will need version 1.1.0 or higher of libflac.
OggFLAC - http://www.xiph.org/ogg/vorbis/ and http://flac.sourceforge.net/
For OggFLAC support. You will need liboggflac, which can be built from the
FLAC sources if libogg is already installed. Versions of flac 1.1.3 and
greater will automatically detect and use OggFLAC if it's available.
Audio File - http://www.68k.org/~michael/audiofile/
For WAVE, AIFF, and AU support. You will need libaudiofile.
...
...
Makefile.am
View file @
3d3bca53
...
...
@@ -532,10 +532,6 @@ if HAVE_FLAC
DECODER_SRC
+=
src/decoder/flac_decoder_plugin.c
endif
if
HAVE_OGGFLAC
DECODER_SRC
+=
src/decoder/oggflac_decoder_plugin.c
endif
if
HAVE_AUDIOFILE
DECODER_SRC
+=
src/decoder/audiofile_decoder_plugin.c
endif
...
...
NEWS
View file @
3d3bca53
...
...
@@ -11,6 +11,7 @@ ver 0.17 (2011/??/??)
- mpg123: implement seeking
- ffmpeg: drop support for pre-0.5 ffmpeg
- ffmpeg: support libavformat 0.7
- oggflac: delete this obsolete plugin
* output:
- osx: allow user to specify other audio devices
- raop: new output plugin
...
...
configure.ac
View file @
3d3bca53
...
...
@@ -301,11 +301,6 @@ AC_ARG_ENABLE(mvp,
[enable support for Hauppauge Media MVP (default: disable)]),,
enable_mvp=no)
AC_ARG_ENABLE(oggflac,
AS_HELP_STRING([--disable-oggflac],
[disable OggFLAC support (default: enable)]),,
enable_oggflac=yes)
AC_ARG_ENABLE(openal,
AS_HELP_STRING([--enable-openal],
[enable OpenAL support (default: disable)]),,
...
...
@@ -792,25 +787,6 @@ MPD_AUTO_PKG(flac, FLAC, [flac >= 1.1],
if test x$enable_flac = xyes; then
AC_DEFINE(HAVE_FLAC, 1, [Define for FLAC support])
oldcflags="$CFLAGS"
oldlibs="$LIBS"
CFLAGS="$CFLAGS $FLAC_CFLAGS"
LIBS="$LIBS $FLAC_LIBS"
if test x$enable_flac = xyes && test x$enable_oggflac = xyes; then
AC_CHECK_DECL(FLAC_API_SUPPORTS_OGG_FLAC,
[enable_oggflac=flac], [],
[#include <FLAC/export.h>])
fi
CFLAGS="$oldcflags"
LIBS="$oldlibs"
if test x$enable_oggflac = xflac; then
PKG_CHECK_MODULES(OGG, [ogg],
[FLAC_LIBS="${FLAC_LIBS} ${OGG_LIBS}" FLAC_CFLAGS="${FLAC_CFLAGS} ${OGG_CFLAGS}"],
[enable_oggflac=yes;
AC_MSG_WARN("FLAC has the ogg API built in, but couldn't find ogg. Disabling oggflac.")])
fi
fi
AM_CONDITIONAL(HAVE_FLAC, test x$enable_flac = xyes)
...
...
@@ -986,25 +962,6 @@ fi
AC_SUBST(TREMOR_CFLAGS)
AC_SUBST(TREMOR_LIBS)
dnl --------------------------------- OggFLAC ---------------------------------
dnl OggFLAC must go after Ogg Tremor
if test x$enable_tremor = xyes && test x$enable_oggflac = xyes; then
AC_MSG_WARN([disabling OggFLAC support because it is incompatible with tremor])
enable_oggflac=no
fi
if test x$enable_oggflac = xyes; then
AC_CHECK_HEADER([OggFLAC/stream_decoder.h],, enable_oggflac=no)
fi
if test x$enable_oggflac = xyes; then
AC_DEFINE(HAVE_OGGFLAC,1,[Define for OggFLAC support])
MPD_LIBS="$MPD_LIBS -lOggFLAC -lFLAC -lm"
fi
AM_CONDITIONAL(HAVE_OGGFLAC, test x$enable_oggflac = xyes)
dnl -------------------------------- Ogg Vorbis -------------------------------
if test x$enable_tremor = xyes; then
...
...
@@ -1104,7 +1061,6 @@ if
test x$enable_mp4 = xno &&
test x$enable_mpc = xno &&
test x$enable_mpg123 = xno &&
test x$enable_oggflac = xno &&
test x$enable_sidplay = xno &&
test x$enable_tremor = xno &&
test x$enable_vorbis = xno &&
...
...
@@ -1115,10 +1071,10 @@ if
fi
AM_CONDITIONAL(HAVE_OGG_COMMON,
test x$enable_vorbis = xyes || test x$enable_tremor = xyes || test x$enable_
oggflac = xyes || test x$enable_
flac = xyes)
test x$enable_vorbis = xyes || test x$enable_tremor = xyes || test x$enable_flac = xyes)
AM_CONDITIONAL(HAVE_FLAC_COMMON,
test x$enable_flac = xyes
|| test x$enable_oggflac = xyes
)
test x$enable_flac = xyes)
dnl ---------------------------------------------------------------------------
dnl Encoders for Streaming Audio Output Plugins
...
...
@@ -1580,7 +1536,6 @@ results(mad, [MAD])
results(mpg123, [MPG123])
results(mp4, [MP4])
results(mpc, [Musepack])
results(oggflac, [OggFLAC], flac)
printf '\n\t'
results(tremor, [OggTremor])
results(vorbis, [OggVorbis])
...
...
src/decoder/oggflac_decoder_plugin.c
deleted
100644 → 0
View file @
6a3008d7
/*
* Copyright (C) 2003-2011 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/*
* OggFLAC support (half-stolen from flac_plugin.c :))
*/
#include "config.h"
/* must be first for large file support */
#include "_flac_common.h"
#include "_ogg_common.h"
#include "flac_metadata.h"
#include <glib.h>
#include <OggFLAC/seekable_stream_decoder.h>
#include <assert.h>
#include <unistd.h>
static
void
oggflac_cleanup
(
OggFLAC__SeekableStreamDecoder
*
decoder
)
{
if
(
decoder
)
OggFLAC__seekable_stream_decoder_delete
(
decoder
);
}
static
OggFLAC__SeekableStreamDecoderReadStatus
of_read_cb
(
G_GNUC_UNUSED
const
OggFLAC__SeekableStreamDecoder
*
decoder
,
FLAC__byte
buf
[],
unsigned
*
bytes
,
void
*
fdata
)
{
struct
flac_data
*
data
=
(
struct
flac_data
*
)
fdata
;
size_t
r
;
r
=
decoder_read
(
data
->
decoder
,
data
->
input_stream
,
(
void
*
)
buf
,
*
bytes
);
*
bytes
=
r
;
if
(
r
==
0
&&
!
input_stream_eof
(
data
->
input_stream
)
&&
decoder_get_command
(
data
->
decoder
)
==
DECODE_COMMAND_NONE
)
return
OggFLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR
;
return
OggFLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK
;
}
static
OggFLAC__SeekableStreamDecoderSeekStatus
of_seek_cb
(
G_GNUC_UNUSED
const
OggFLAC__SeekableStreamDecoder
*
decoder
,
FLAC__uint64
offset
,
void
*
fdata
)
{
struct
flac_data
*
data
=
(
struct
flac_data
*
)
fdata
;
if
(
!
input_stream_seek
(
data
->
input_stream
,
offset
,
SEEK_SET
,
NULL
))
return
OggFLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR
;
return
OggFLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK
;
}
static
OggFLAC__SeekableStreamDecoderTellStatus
of_tell_cb
(
G_GNUC_UNUSED
const
OggFLAC__SeekableStreamDecoder
*
decoder
,
FLAC__uint64
*
offset
,
void
*
fdata
)
{
struct
flac_data
*
data
=
(
struct
flac_data
*
)
fdata
;
*
offset
=
(
long
)(
data
->
input_stream
->
offset
);
return
OggFLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK
;
}
static
OggFLAC__SeekableStreamDecoderLengthStatus
of_length_cb
(
G_GNUC_UNUSED
const
OggFLAC__SeekableStreamDecoder
*
decoder
,
FLAC__uint64
*
length
,
void
*
fdata
)
{
struct
flac_data
*
data
=
(
struct
flac_data
*
)
fdata
;
if
(
data
->
input_stream
->
size
<
0
)
return
OggFLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR
;
*
length
=
(
size_t
)
(
data
->
input_stream
->
size
);
return
OggFLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK
;
}
static
FLAC__bool
of_EOF_cb
(
G_GNUC_UNUSED
const
OggFLAC__SeekableStreamDecoder
*
decoder
,
void
*
fdata
)
{
struct
flac_data
*
data
=
(
struct
flac_data
*
)
fdata
;
return
(
decoder_get_command
(
data
->
decoder
)
!=
DECODE_COMMAND_NONE
&&
decoder_get_command
(
data
->
decoder
)
!=
DECODE_COMMAND_SEEK
)
||
input_stream_eof
(
data
->
input_stream
);
}
static
void
of_error_cb
(
G_GNUC_UNUSED
const
OggFLAC__SeekableStreamDecoder
*
decoder
,
FLAC__StreamDecoderErrorStatus
status
,
void
*
fdata
)
{
flac_error_common_cb
(
"oggflac"
,
status
,
(
struct
flac_data
*
)
fdata
);
}
static
void
oggflacPrintErroredState
(
OggFLAC__SeekableStreamDecoderState
state
)
{
switch
(
state
)
{
case
OggFLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR
:
g_warning
(
"oggflac allocation error
\n
"
);
break
;
case
OggFLAC__SEEKABLE_STREAM_DECODER_READ_ERROR
:
g_warning
(
"oggflac read error
\n
"
);
break
;
case
OggFLAC__SEEKABLE_STREAM_DECODER_SEEK_ERROR
:
g_warning
(
"oggflac seek error
\n
"
);
break
;
case
OggFLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR
:
g_warning
(
"oggflac seekable stream error
\n
"
);
break
;
case
OggFLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED
:
g_warning
(
"oggflac decoder already initialized
\n
"
);
break
;
case
OggFLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK
:
g_warning
(
"invalid oggflac callback
\n
"
);
break
;
case
OggFLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED
:
g_warning
(
"oggflac decoder uninitialized
\n
"
);
break
;
case
OggFLAC__SEEKABLE_STREAM_DECODER_OK
:
case
OggFLAC__SEEKABLE_STREAM_DECODER_SEEKING
:
case
OggFLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM
:
break
;
}
}
static
FLAC__StreamDecoderWriteStatus
oggflac_write_cb
(
G_GNUC_UNUSED
const
OggFLAC__SeekableStreamDecoder
*
decoder
,
const
FLAC__Frame
*
frame
,
const
FLAC__int32
*
const
buf
[],
void
*
vdata
)
{
struct
flac_data
*
data
=
(
struct
flac_data
*
)
vdata
;
return
flac_common_write
(
data
,
frame
,
buf
,
0
);
}
/* used by TagDup */
static
void
of_metadata_dup_cb
(
G_GNUC_UNUSED
const
OggFLAC__SeekableStreamDecoder
*
decoder
,
const
FLAC__StreamMetadata
*
block
,
void
*
vdata
)
{
struct
flac_data
*
data
=
(
struct
flac_data
*
)
vdata
;
assert
(
data
->
tag
!=
NULL
);
flac_tag_apply_metadata
(
data
->
tag
,
NULL
,
block
);
}
/* used by decode */
static
void
of_metadata_decode_cb
(
G_GNUC_UNUSED
const
OggFLAC__SeekableStreamDecoder
*
dec
,
const
FLAC__StreamMetadata
*
block
,
void
*
vdata
)
{
flac_metadata_common_cb
(
block
,
(
struct
flac_data
*
)
vdata
);
}
static
OggFLAC__SeekableStreamDecoder
*
full_decoder_init_and_read_metadata
(
struct
flac_data
*
data
,
unsigned
int
metadata_only
)
{
OggFLAC__SeekableStreamDecoder
*
decoder
=
NULL
;
unsigned
int
s
=
1
;
if
(
!
(
decoder
=
OggFLAC__seekable_stream_decoder_new
()))
return
NULL
;
if
(
metadata_only
)
{
s
&=
OggFLAC__seekable_stream_decoder_set_metadata_callback
(
decoder
,
of_metadata_dup_cb
);
s
&=
OggFLAC__seekable_stream_decoder_set_metadata_respond
(
decoder
,
FLAC__METADATA_TYPE_STREAMINFO
);
}
else
{
s
&=
OggFLAC__seekable_stream_decoder_set_metadata_callback
(
decoder
,
of_metadata_decode_cb
);
}
s
&=
OggFLAC__seekable_stream_decoder_set_read_callback
(
decoder
,
of_read_cb
);
s
&=
OggFLAC__seekable_stream_decoder_set_seek_callback
(
decoder
,
of_seek_cb
);
s
&=
OggFLAC__seekable_stream_decoder_set_tell_callback
(
decoder
,
of_tell_cb
);
s
&=
OggFLAC__seekable_stream_decoder_set_length_callback
(
decoder
,
of_length_cb
);
s
&=
OggFLAC__seekable_stream_decoder_set_eof_callback
(
decoder
,
of_EOF_cb
);
s
&=
OggFLAC__seekable_stream_decoder_set_write_callback
(
decoder
,
oggflac_write_cb
);
s
&=
OggFLAC__seekable_stream_decoder_set_metadata_respond
(
decoder
,
FLAC__METADATA_TYPE_VORBIS_COMMENT
);
s
&=
OggFLAC__seekable_stream_decoder_set_error_callback
(
decoder
,
of_error_cb
);
s
&=
OggFLAC__seekable_stream_decoder_set_client_data
(
decoder
,
(
void
*
)
data
);
if
(
!
s
)
{
g_warning
(
"oggflac problem before init()
\n
"
);
goto
fail
;
}
if
(
OggFLAC__seekable_stream_decoder_init
(
decoder
)
!=
OggFLAC__SEEKABLE_STREAM_DECODER_OK
)
{
g_warning
(
"oggflac problem doing init()
\n
"
);
goto
fail
;
}
if
(
!
OggFLAC__seekable_stream_decoder_process_until_end_of_metadata
(
decoder
))
{
g_warning
(
"oggflac problem reading metadata
\n
"
);
goto
fail
;
}
return
decoder
;
fail:
oggflacPrintErroredState
(
OggFLAC__seekable_stream_decoder_get_state
(
decoder
));
OggFLAC__seekable_stream_decoder_delete
(
decoder
);
return
NULL
;
}
/* public functions: */
static
struct
tag
*
oggflac_stream_tag
(
struct
input_stream
*
is
)
{
OggFLAC__SeekableStreamDecoder
*
decoder
;
struct
flac_data
data
;
struct
tag
*
tag
;
if
(
ogg_stream_type_detect
(
is
)
!=
FLAC
)
return
NULL
;
/* rewind the stream, because ogg_stream_type_detect() has
moved it */
input_stream_seek
(
is
,
0
,
SEEK_SET
,
NULL
);
flac_data_init
(
&
data
,
NULL
,
is
);
data
.
tag
=
tag_new
();
/* errors here won't matter,
* data.tag will be set or unset, that's all we care about */
decoder
=
full_decoder_init_and_read_metadata
(
&
data
,
1
);
oggflac_cleanup
(
decoder
);
if
(
tag_is_defined
(
data
.
tag
))
{
tag
=
data
.
tag
;
data
.
tag
=
NULL
;
}
else
tag
=
NULL
;
flac_data_deinit
(
&
data
);
return
tag
;
}
static
void
oggflac_decode
(
struct
decoder
*
mpd_decoder
,
struct
input_stream
*
input_stream
)
{
OggFLAC__SeekableStreamDecoder
*
decoder
=
NULL
;
struct
flac_data
data
;
struct
audio_format
audio_format
;
if
(
ogg_stream_type_detect
(
input_stream
)
!=
FLAC
)
return
;
/* rewind the stream, because ogg_stream_type_detect() has
moved it */
input_stream_seek
(
input_stream
,
0
,
SEEK_SET
,
NULL
);
flac_data_init
(
&
data
,
mpd_decoder
,
input_stream
);
if
(
!
(
decoder
=
full_decoder_init_and_read_metadata
(
&
data
,
0
)))
{
goto
fail
;
}
if
(
!
data
.
initialized
)
goto
fail
;
decoder_initialized
(
mpd_decoder
,
&
audio_format
,
input_stream
->
seekable
,
(
float
)
data
.
total_frames
/
(
float
)
data
.
audio_format
.
sample_rate
);
while
(
true
)
{
OggFLAC__seekable_stream_decoder_process_single
(
decoder
);
if
(
OggFLAC__seekable_stream_decoder_get_state
(
decoder
)
!=
OggFLAC__SEEKABLE_STREAM_DECODER_OK
)
{
break
;
}
if
(
decoder_get_command
(
mpd_decoder
)
==
DECODE_COMMAND_SEEK
)
{
FLAC__uint64
seek_sample
=
decoder_seek_where
(
mpd_decoder
)
*
data
.
audio_format
.
sample_rate
;
if
(
OggFLAC__seekable_stream_decoder_seek_absolute
(
decoder
,
seek_sample
))
{
data
.
next_frame
=
seek_sample
;
data
.
position
=
0
;
decoder_command_finished
(
mpd_decoder
);
}
else
decoder_seek_error
(
mpd_decoder
);
}
}
if
(
decoder_get_command
(
mpd_decoder
)
==
DECODE_COMMAND_NONE
)
{
oggflacPrintErroredState
(
OggFLAC__seekable_stream_decoder_get_state
(
decoder
));
OggFLAC__seekable_stream_decoder_finish
(
decoder
);
}
fail:
oggflac_cleanup
(
decoder
);
flac_data_deinit
(
&
data
);
}
static
const
char
*
const
oggflac_suffixes
[]
=
{
"ogg"
,
"oga"
,
NULL
};
static
const
char
*
const
oggflac_mime_types
[]
=
{
"application/ogg"
,
"application/x-ogg"
,
"audio/ogg"
,
"audio/x-ogg"
,
"audio/x-flac+ogg"
,
NULL
};
const
struct
decoder_plugin
oggflac_decoder_plugin
=
{
.
name
=
"oggflac"
,
.
stream_decode
=
oggflac_decode
,
.
stream_tag
=
oggflac_stream_tag
,
.
suffixes
=
oggflac_suffixes
,
.
mime_types
=
oggflac_mime_types
};
src/decoder_list.c
View file @
3d3bca53
...
...
@@ -58,7 +58,7 @@ const struct decoder_plugin *const decoder_plugins[] = {
#ifdef ENABLE_VORBIS_DECODER
&
vorbis_decoder_plugin
,
#endif
#if defined(HAVE_FLAC)
|| defined(HAVE_OGGFLAC)
#if defined(HAVE_FLAC)
&
oggflac_decoder_plugin
,
#endif
#ifdef HAVE_FLAC
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment