2010-06-30 09:55:14 +00:00
|
|
|
/*
|
|
|
|
* MPEG 1.0/2.0/2.5 audio layer I, II, III decoding with libmpg123
|
|
|
|
*
|
2013-10-04 17:22:22 +00:00
|
|
|
* Copyright (C) 2010-2013 Thomas Orgis <thomas@orgis.org>
|
2010-06-30 09:55:14 +00:00
|
|
|
*
|
|
|
|
* MPlayer 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.
|
|
|
|
*
|
|
|
|
* MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
2013-07-22 12:41:56 +00:00
|
|
|
#include "ad.h"
|
2013-08-06 20:41:30 +00:00
|
|
|
#include "mpvcore/mp_msg.h"
|
2010-06-30 09:55:14 +00:00
|
|
|
|
2012-05-06 16:29:14 +00:00
|
|
|
/* Reducing the ifdeffery to two main variants:
|
|
|
|
* 1. most compatible to any libmpg123 version
|
|
|
|
* 2. fastest variant with recent libmpg123 (>=1.14)
|
|
|
|
* Running variant 2 on older libmpg123 versions may work in
|
|
|
|
* principle, but is not supported.
|
|
|
|
* So, please leave the check for MPG123_API_VERSION there, m-kay?
|
|
|
|
*/
|
2010-06-30 09:55:14 +00:00
|
|
|
#include <mpg123.h>
|
|
|
|
|
2012-05-06 16:29:14 +00:00
|
|
|
/* Enable faster mode of operation with newer libmpg123, avoiding
|
|
|
|
* unnecessary memcpy() calls. */
|
|
|
|
#if (defined MPG123_API_VERSION) && (MPG123_API_VERSION >= 33)
|
|
|
|
#define AD_MPG123_FRAMEWISE
|
|
|
|
#endif
|
2010-06-30 09:55:14 +00:00
|
|
|
|
|
|
|
/* Switch for updating bitrate info of VBR files. Not essential. */
|
|
|
|
#define AD_MPG123_MEAN_BITRATE
|
|
|
|
|
|
|
|
struct ad_mpg123_context {
|
|
|
|
mpg123_handle *handle;
|
2013-10-04 17:22:22 +00:00
|
|
|
char new_format;
|
2010-06-30 09:55:14 +00:00
|
|
|
#ifdef AD_MPG123_MEAN_BITRATE
|
|
|
|
/* Running mean for bit rate, stream length estimation. */
|
|
|
|
float mean_rate;
|
|
|
|
unsigned int mean_count;
|
|
|
|
/* Time delay for updates. */
|
|
|
|
short delay;
|
|
|
|
#endif
|
|
|
|
/* If the stream is actually VBR. */
|
|
|
|
char vbr;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* This initializes libmpg123 and prepares the handle, including funky
|
|
|
|
* parameters. */
|
|
|
|
static int preinit(sh_audio_t *sh)
|
|
|
|
{
|
2013-06-12 22:59:27 +00:00
|
|
|
int err;
|
2010-06-30 09:55:14 +00:00
|
|
|
struct ad_mpg123_context *con;
|
|
|
|
/* Assumption: You always call preinit + init + uninit, on every file.
|
|
|
|
* But you stop at preinit in case it fails.
|
|
|
|
* If that is not true, one must ensure not to call mpg123_init / exit
|
|
|
|
* twice in a row. */
|
|
|
|
if (mpg123_init() != MPG123_OK)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
sh->context = malloc(sizeof(struct ad_mpg123_context));
|
|
|
|
con = sh->context;
|
|
|
|
/* Auto-choice of optimized decoder (first argument NULL). */
|
|
|
|
con->handle = mpg123_new(NULL, &err);
|
|
|
|
if (!con->handle)
|
|
|
|
goto bad_end;
|
|
|
|
|
|
|
|
/* Basic settings.
|
|
|
|
* Don't spill messages, enable better resync with non-seekable streams.
|
|
|
|
* Give both flags individually without error checking to keep going with
|
|
|
|
* old libmpg123. Generally, it is not fatal if the flags are not
|
|
|
|
* honored */
|
|
|
|
mpg123_param(con->handle, MPG123_ADD_FLAGS, MPG123_QUIET, 0.0);
|
2010-07-13 15:11:34 +00:00
|
|
|
/* Do not bail out on malformed streams at all.
|
|
|
|
* MPlayer does not handle a decoder throwing the towel on crappy input. */
|
|
|
|
mpg123_param(con->handle, MPG123_RESYNC_LIMIT, -1, 0.0);
|
2010-06-30 09:55:14 +00:00
|
|
|
|
|
|
|
/* Open decisions: Configure libmpg123 to force encoding (or stay open about
|
|
|
|
* library builds that support only float or int32 output), (de)configure
|
|
|
|
* gapless decoding (won't work with seeking in MPlayer, though).
|
|
|
|
* Don't forget to eventually enable ReplayGain/RVA support, too.
|
|
|
|
* Let's try to run with the default for now. */
|
|
|
|
|
2012-05-06 16:29:14 +00:00
|
|
|
/* That would produce floating point output.
|
2013-10-04 17:22:22 +00:00
|
|
|
* You can get 32 and 24 bit ints, even 8 bit via format matrix.
|
|
|
|
* If wanting a specific encoding here, configure format matrix and
|
|
|
|
* make sure it is in set_format(). */
|
2012-05-06 16:29:14 +00:00
|
|
|
/* mpg123_param(con->handle, MPG123_ADD_FLAGS, MPG123_FORCE_FLOAT, 0.); */
|
|
|
|
|
2010-06-30 09:55:14 +00:00
|
|
|
/* Example for RVA choice (available since libmpg123 1.0.0):
|
|
|
|
mpg123_param(con->handle, MPG123_RVA, MPG123_RVA_MIX, 0.0) */
|
|
|
|
|
2012-05-06 16:29:14 +00:00
|
|
|
#ifdef AD_MPG123_FRAMEWISE
|
|
|
|
/* Prevent funky automatic resampling.
|
|
|
|
* This way, we can be sure that one frame will never produce
|
|
|
|
* more than 1152 stereo samples. */
|
|
|
|
mpg123_param(con->handle, MPG123_REMOVE_FLAGS, MPG123_AUTO_RESAMPLE, 0.);
|
|
|
|
#else
|
|
|
|
/* Older mpg123 is vulnerable to concatenated streams when gapless cutting
|
|
|
|
* is enabled (will only play the jingle of a badly constructed radio
|
|
|
|
* stream). The versions using framewise decoding are fine with that. */
|
|
|
|
mpg123_param(con->handle, MPG123_REMOVE_FLAGS, MPG123_GAPLESS, 0.);
|
|
|
|
#endif
|
|
|
|
|
2010-06-30 09:55:14 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
bad_end:
|
|
|
|
if (!con->handle)
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_ERR, "mpg123 preinit error: %s\n",
|
|
|
|
mpg123_plain_strerror(err));
|
|
|
|
else
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_ERR, "mpg123 preinit error: %s\n",
|
|
|
|
mpg123_strerror(con->handle));
|
|
|
|
|
|
|
|
if (con->handle)
|
|
|
|
mpg123_delete(con->handle);
|
|
|
|
mpg123_exit();
|
|
|
|
free(sh->context);
|
|
|
|
sh->context = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compute bitrate from frame size. */
|
|
|
|
static int compute_bitrate(struct mpg123_frameinfo *i)
|
|
|
|
{
|
|
|
|
static const int samples_per_frame[4][4] = {
|
|
|
|
{-1, 384, 1152, 1152}, /* MPEG 1 */
|
|
|
|
{-1, 384, 1152, 576}, /* MPEG 2 */
|
|
|
|
{-1, 384, 1152, 576}, /* MPEG 2.5 */
|
|
|
|
{-1, -1, -1, -1}, /* Unknown */
|
|
|
|
};
|
|
|
|
return (int) ((i->framesize + 4) * 8 * i->rate * 0.001 /
|
|
|
|
samples_per_frame[i->version][i->layer] + 0.5);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Opted against the header printout from old mp3lib, too much
|
|
|
|
* irrelevant info. This is modelled after the mpg123 app's
|
|
|
|
* standard output line.
|
|
|
|
* If more verbosity is demanded, one can add more detail and
|
|
|
|
* also throw in ID3v2 info which libmpg123 collects anyway. */
|
|
|
|
static void print_header_compact(struct mpg123_frameinfo *i)
|
|
|
|
{
|
|
|
|
static const char *smodes[5] = {
|
|
|
|
"stereo", "joint-stereo", "dual-channel", "mono", "invalid"
|
|
|
|
};
|
|
|
|
static const char *layers[4] = {
|
|
|
|
"Unknown", "I", "II", "III"
|
|
|
|
};
|
|
|
|
static const char *versions[4] = {
|
|
|
|
"1.0", "2.0", "2.5", "x.x"
|
|
|
|
};
|
|
|
|
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_V, "MPEG %s layer %s, ",
|
|
|
|
versions[i->version], layers[i->layer]);
|
|
|
|
switch (i->vbr) {
|
|
|
|
case MPG123_CBR:
|
|
|
|
if (i->bitrate)
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_V, "%d kbit/s", i->bitrate);
|
|
|
|
else
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_V, "%d kbit/s (free format)",
|
|
|
|
compute_bitrate(i));
|
|
|
|
break;
|
|
|
|
case MPG123_VBR:
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_V, "VBR");
|
|
|
|
break;
|
|
|
|
case MPG123_ABR:
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_V, "%d kbit/s ABR", i->abr_rate);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_V, "???");
|
|
|
|
}
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_V, ", %ld Hz %s\n", i->rate,
|
|
|
|
smodes[i->mode]);
|
|
|
|
}
|
|
|
|
|
2013-10-04 17:22:22 +00:00
|
|
|
/* libmpg123 has a new format ready; query and store, return return value
|
|
|
|
of mpg123_getformat() */
|
|
|
|
static int set_format(sh_audio_t *sh, struct ad_mpg123_context *con)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
long rate;
|
|
|
|
int channels;
|
|
|
|
int encoding;
|
|
|
|
ret = mpg123_getformat(con->handle, &rate, &channels, &encoding);
|
|
|
|
if(ret == MPG123_OK) {
|
|
|
|
mp_chmap_from_channels(&sh->channels, channels);
|
|
|
|
sh->samplerate = rate;
|
|
|
|
/* Without external force, mpg123 will always choose signed encoding,
|
|
|
|
* and non-16-bit only on builds that don't support it.
|
|
|
|
* Be reminded that it doesn't matter to the MPEG file what encoding
|
|
|
|
* is produced from it. */
|
|
|
|
switch (encoding) {
|
|
|
|
case MPG123_ENC_SIGNED_8:
|
|
|
|
sh->sample_format = AF_FORMAT_S8;
|
|
|
|
break;
|
|
|
|
case MPG123_ENC_SIGNED_16:
|
|
|
|
sh->sample_format = AF_FORMAT_S16_NE;
|
|
|
|
break;
|
|
|
|
/* To stay compatible with the oldest libmpg123 headers, do not rely
|
|
|
|
* on float and 32 bit encoding symbols being defined.
|
|
|
|
* Those formats came later */
|
|
|
|
case 0x1180: /* MPG123_ENC_SIGNED_32 */
|
|
|
|
sh->sample_format = AF_FORMAT_S32_NE;
|
|
|
|
break;
|
|
|
|
case 0x200: /* MPG123_ENC_FLOAT_32 */
|
|
|
|
sh->sample_format = AF_FORMAT_FLOAT_NE;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* This means we got a funny custom build of libmpg123 that only supports an unknown format. */
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_ERR,
|
|
|
|
"Bad encoding from mpg123: %i.\n", encoding);
|
|
|
|
return MPG123_ERR;
|
|
|
|
}
|
|
|
|
#ifdef AD_MPG123_FRAMEWISE
|
|
|
|
/* Going to decode directly to MPlayer's memory. It is important
|
|
|
|
* to have MPG123_AUTO_RESAMPLE disabled for the buffer size
|
|
|
|
* being an all-time limit. */
|
2013-11-09 22:22:15 +00:00
|
|
|
sh->audio_out_minsize = 1152 * 2 * (af_fmt2bits(sh->sample_format) / 8);
|
2013-10-04 17:22:22 +00:00
|
|
|
#endif
|
|
|
|
con->new_format = 0;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-06-30 09:55:14 +00:00
|
|
|
/* This tries to extract a requested amount of decoded data.
|
|
|
|
* Even when you request 0 bytes, it will feed enough input so that
|
|
|
|
* the decoder _could_ have delivered something.
|
|
|
|
* Returns byte count >= 0, -1 on error.
|
|
|
|
*
|
|
|
|
* Thoughts on exact pts keeping:
|
|
|
|
* We have to assume that MPEG frames are cut in pieces by packet boundaries.
|
|
|
|
* Also, it might be possible that the first packet does not contain enough
|
|
|
|
* data to ensure initial stream sync... or re-sync on erroneous streams.
|
|
|
|
* So we need something robust to relate the decoded byte count to the correct
|
|
|
|
* time stamp. This is tricky, though. From the outside, you cannot tell if,
|
|
|
|
* after having fed two packets until the first output arrives, one should
|
|
|
|
* start counting from the first packet's pts or the second packet's.
|
|
|
|
* So, let's just count from the last fed package's pts. If the packets are
|
|
|
|
* exactly cut to MPEG frames, this will cause one frame mismatch in the
|
|
|
|
* beginning (when mpg123 peeks ahead for the following header), but will
|
|
|
|
* be corrected with the third frame already. One might add special code to
|
|
|
|
* not increment the base pts past the first packet's after a resync before
|
|
|
|
* the first decoded bytes arrived. */
|
|
|
|
static int decode_a_bit(sh_audio_t *sh, unsigned char *buf, int count)
|
|
|
|
{
|
|
|
|
int ret = MPG123_OK;
|
|
|
|
int got = 0;
|
|
|
|
struct ad_mpg123_context *con = sh->context;
|
|
|
|
|
|
|
|
/* There will be one MPG123_NEW_FORMAT message on first open.
|
2012-05-06 16:29:14 +00:00
|
|
|
* This will be handled in init(). */
|
2010-06-30 09:55:14 +00:00
|
|
|
do {
|
|
|
|
size_t got_now = 0;
|
2013-10-04 17:22:22 +00:00
|
|
|
/* Fetch new format now, after old data has been used. */
|
|
|
|
if(con->new_format)
|
|
|
|
ret = set_format(sh, con);
|
2010-06-30 09:55:14 +00:00
|
|
|
|
2012-05-06 16:29:14 +00:00
|
|
|
/* Feed the decoder. This will only fire from the second round on. */
|
2010-06-30 09:55:14 +00:00
|
|
|
if (ret == MPG123_NEED_MORE) {
|
|
|
|
/* Feed more input data. */
|
2013-07-11 17:10:33 +00:00
|
|
|
struct demux_packet *pkt = demux_read_packet(sh->gsh);
|
|
|
|
if (!pkt)
|
2010-06-30 09:55:14 +00:00
|
|
|
break; /* Apparently that's it. EOF. */
|
|
|
|
|
|
|
|
/* Next bytes from that presentation time. */
|
2013-07-11 17:10:33 +00:00
|
|
|
if (pkt->pts != MP_NOPTS_VALUE) {
|
|
|
|
sh->pts = pkt->pts;
|
2010-06-30 09:55:14 +00:00
|
|
|
sh->pts_bytes = 0;
|
|
|
|
}
|
|
|
|
|
2012-05-06 16:29:14 +00:00
|
|
|
#ifdef AD_MPG123_FRAMEWISE
|
|
|
|
/* Have to use mpg123_feed() to avoid decoding here. */
|
2013-07-11 17:10:33 +00:00
|
|
|
ret = mpg123_feed(con->handle, pkt->buffer, pkt->len);
|
2012-05-06 16:29:14 +00:00
|
|
|
#else
|
2010-06-30 09:55:14 +00:00
|
|
|
/* Do not use mpg123_feed(), added in later libmpg123 versions. */
|
2013-07-11 17:10:33 +00:00
|
|
|
ret = mpg123_decode(con->handle, pkt->buffer, pkt->len, NULL, 0, NULL);
|
2012-05-06 16:29:14 +00:00
|
|
|
#endif
|
2013-07-11 17:10:33 +00:00
|
|
|
talloc_free(pkt);
|
2012-05-06 16:29:14 +00:00
|
|
|
if (ret == MPG123_ERR)
|
|
|
|
break;
|
2013-10-04 17:22:22 +00:00
|
|
|
|
|
|
|
/* Indication of format change is possible here (from mpg123_decode()). */
|
|
|
|
if(ret == MPG123_NEW_FORMAT) {
|
|
|
|
con->new_format = 1;
|
|
|
|
if(got)
|
|
|
|
break; /* Do not switch format during a chunk. */
|
|
|
|
|
|
|
|
ret = set_format(sh, con);
|
|
|
|
}
|
2010-06-30 09:55:14 +00:00
|
|
|
}
|
2012-05-06 16:29:14 +00:00
|
|
|
/* Theoretically, mpg123 could return MPG123_DONE, so be prepared.
|
|
|
|
* Should not happen in our usage, but it is a valid return code. */
|
2010-06-30 09:55:14 +00:00
|
|
|
else if (ret == MPG123_ERR || ret == MPG123_DONE)
|
|
|
|
break;
|
|
|
|
|
2012-05-06 16:29:14 +00:00
|
|
|
/* Try to decode a bit. This is the return value that counts
|
|
|
|
* for the loop condition. */
|
|
|
|
#ifdef AD_MPG123_FRAMEWISE
|
|
|
|
if (!buf) { /* fake call just for feeding to get format */
|
2013-10-04 17:22:22 +00:00
|
|
|
ret = set_format(sh, con);
|
2012-05-06 16:29:14 +00:00
|
|
|
} else { /* This is the decoding. One frame at a time. */
|
|
|
|
ret = mpg123_replace_buffer(con->handle, buf, count);
|
|
|
|
if (ret == MPG123_OK)
|
|
|
|
ret = mpg123_decode_frame(con->handle, NULL, NULL, &got_now);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
ret = mpg123_decode(con->handle, NULL, 0, buf + got, count - got,
|
|
|
|
&got_now);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
got += got_now;
|
|
|
|
sh->pts_bytes += got_now;
|
|
|
|
|
2013-10-04 17:22:22 +00:00
|
|
|
/* Indication of format change should happen here. */
|
|
|
|
if(ret == MPG123_NEW_FORMAT) {
|
|
|
|
con->new_format = 1;
|
|
|
|
if(got)
|
|
|
|
break; /* Do not switch format during a chunk. */
|
|
|
|
|
|
|
|
ret = set_format(sh, con);
|
|
|
|
}
|
|
|
|
|
2012-05-06 16:29:14 +00:00
|
|
|
#ifdef AD_MPG123_FRAMEWISE
|
|
|
|
} while (ret == MPG123_NEED_MORE || (got == 0 && count != 0));
|
|
|
|
#else
|
2010-06-30 09:55:14 +00:00
|
|
|
} while (ret == MPG123_NEED_MORE || got < count);
|
2012-05-06 16:29:14 +00:00
|
|
|
#endif
|
2010-06-30 09:55:14 +00:00
|
|
|
|
|
|
|
if (ret == MPG123_ERR) {
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_ERR, "mpg123 decoding failed: %s\n",
|
|
|
|
mpg123_strerror(con->handle));
|
|
|
|
}
|
|
|
|
|
|
|
|
return got;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Close, reopen stream. Feed data until we know the format of the stream.
|
|
|
|
* 1 on success, 0 on error */
|
|
|
|
static int reopen_stream(sh_audio_t *sh)
|
|
|
|
{
|
|
|
|
struct ad_mpg123_context *con = (struct ad_mpg123_context*) sh->context;
|
|
|
|
|
|
|
|
mpg123_close(con->handle);
|
2012-05-06 16:29:14 +00:00
|
|
|
/* No resetting of the context:
|
|
|
|
* We do not want to loose the mean bitrate data. */
|
2010-06-30 09:55:14 +00:00
|
|
|
|
2012-05-06 16:29:14 +00:00
|
|
|
/* Open and make sure we have fed enough data to get stream properties. */
|
|
|
|
if (MPG123_OK == mpg123_open_feed(con->handle) &&
|
2010-06-30 09:55:14 +00:00
|
|
|
/* Feed data until mpg123 is ready (has found stream beginning). */
|
2013-10-04 17:22:22 +00:00
|
|
|
!decode_a_bit(sh, NULL, 0) &&
|
|
|
|
set_format(sh, con) == MPG123_OK) { /* format setting again just for return value */
|
2010-06-30 09:55:14 +00:00
|
|
|
return 1;
|
|
|
|
} else {
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_ERR,
|
|
|
|
"mpg123 failed to reopen stream: %s\n",
|
|
|
|
mpg123_strerror(con->handle));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now we really start accessing some data and determining file format.
|
2013-10-04 17:22:22 +00:00
|
|
|
* Format now is allowed to change on-the-fly. Here is the only point
|
|
|
|
* that has MPlayer react to errors. We have to pray that exceptional
|
|
|
|
* erros in other places simply cannot occur. */
|
core: redo how codecs are mapped, remove codecs.conf
Use codec names instead of FourCCs to identify codecs. Rewrite how
codecs are selected and initialized. Now each decoder exports a list
of decoders (and the codec it supports) via add_decoders(). The order
matters, and the first decoder for a given decoder is preferred over
the other decoders. E.g. all ad_mpg123 decoders are preferred over
ad_lavc, because it comes first in the mpcodecs_ad_drivers array.
Likewise, decoders within ad_lavc that are enumerated first by
libavcodec (using av_codec_next()) are preferred. (This is actually
critical to select h264 software decoding by default instead of vdpau.
libavcodec and ffmpeg/avconv use the same method to select decoders by
default, so we hope this is sane.)
The codec names follow libavcodec's codec names as defined by
AVCodecDescriptor.name (see libavcodec/codec_desc.c). Some decoders
have names different from the canonical codec name. The AVCodecDescriptor
API is relatively new, so we need a compatibility layer for older
libavcodec versions for codec names that are referenced internally,
and which are different from the decoder name. (Add a configure check
for that, because checking versions is getting way too messy.)
demux/codec_tags.c is generated from the former codecs.conf (minus
"special" decoders like vdpau, and excluding the mappings that are the
same as the mappings libavformat's exported RIFF tables). It contains
all the mappings from FourCCs to codec name. This is needed for
demux_mkv, demux_mpg, demux_avi and demux_asf. demux_lavf will set the
codec as determined by libavformat, while the other demuxers have to do
this on their own, using the mp_set_audio/video_codec_from_tag()
functions. Note that the sh_audio/video->format members don't uniquely
identify the codec anymore, and sh->codec takes over this role.
Replace the --ac/--vc/--afm/--vfm with new --vd/--ad options, which
provide cover the functionality of the removed switched.
Note: there's no CODECS_FLAG_FLIP flag anymore. This means some obscure
container/video combinations (e.g. the sample Film_200_zygo_pro.mov)
are played flipped. ffplay/avplay doesn't handle this properly either,
so we don't care and blame ffmeg/libav instead.
2013-02-09 14:15:19 +00:00
|
|
|
static int init(sh_audio_t *sh, const char *decoder)
|
2010-06-30 09:55:14 +00:00
|
|
|
{
|
|
|
|
mpg123_id3v2 *v2;
|
|
|
|
struct mpg123_frameinfo finfo;
|
|
|
|
struct ad_mpg123_context *con = sh->context;
|
|
|
|
|
2013-10-04 17:22:22 +00:00
|
|
|
con->new_format = 0;
|
|
|
|
if (reopen_stream(sh) &&
|
2010-06-30 09:55:14 +00:00
|
|
|
/* Get MPEG header info. */
|
|
|
|
MPG123_OK == mpg123_info(con->handle, &finfo) &&
|
|
|
|
/* Since we queried format, mpg123 should have read past ID3v2 tags.
|
|
|
|
* We need to decide if printing of UTF-8 encoded text info is wanted. */
|
|
|
|
MPG123_OK == mpg123_id3(con->handle, NULL, &v2)) {
|
|
|
|
/* If we are here, we passed all hurdles. Yay! Extract the info. */
|
|
|
|
print_header_compact(&finfo);
|
|
|
|
/* Do we want to print out the UTF-8 Id3v2 info?
|
|
|
|
if (v2)
|
|
|
|
print_id3v2(v2); */
|
|
|
|
|
|
|
|
/* Have kb/s, want B/s
|
|
|
|
* For VBR, the first frame will be a bad estimate. */
|
|
|
|
sh->i_bps = (finfo.bitrate ? finfo.bitrate : compute_bitrate(&finfo))
|
|
|
|
* 1000 / 8;
|
2012-05-06 16:29:14 +00:00
|
|
|
#ifdef AD_MPG123_MEAN_BITRATE
|
|
|
|
con->delay = 1;
|
|
|
|
con->mean_rate = 0.;
|
|
|
|
con->mean_count = 0;
|
|
|
|
#endif
|
2010-06-30 09:55:14 +00:00
|
|
|
con->vbr = (finfo.vbr != MPG123_CBR);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
} else {
|
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_ERR, "mpg123 init error: %s\n",
|
|
|
|
mpg123_strerror(con->handle));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void uninit(sh_audio_t *sh)
|
|
|
|
{
|
|
|
|
struct ad_mpg123_context *con = (struct ad_mpg123_context*) sh->context;
|
|
|
|
|
|
|
|
mpg123_close(con->handle);
|
|
|
|
mpg123_delete(con->handle);
|
|
|
|
free(sh->context);
|
|
|
|
sh->context = NULL;
|
|
|
|
mpg123_exit();
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef AD_MPG123_MEAN_BITRATE
|
|
|
|
/* Update mean bitrate. This could be dropped if accurate time display
|
|
|
|
* on audio file playback is not desired. */
|
|
|
|
static void update_info(sh_audio_t *sh)
|
|
|
|
{
|
|
|
|
struct ad_mpg123_context *con = sh->context;
|
|
|
|
if (con->vbr && --con->delay < 1) {
|
|
|
|
struct mpg123_frameinfo finfo;
|
|
|
|
if (MPG123_OK == mpg123_info(con->handle, &finfo)) {
|
|
|
|
if (++con->mean_count > ((unsigned int) -1) / 2)
|
|
|
|
con->mean_count = ((unsigned int) -1) / 4;
|
|
|
|
|
|
|
|
/* Might not be numerically optimal, but works fine enough. */
|
|
|
|
con->mean_rate = ((con->mean_count - 1) * con->mean_rate +
|
|
|
|
finfo.bitrate) / con->mean_count;
|
|
|
|
sh->i_bps = (int) (con->mean_rate * 1000 / 8);
|
|
|
|
|
|
|
|
con->delay = 10;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static int decode_audio(sh_audio_t *sh, unsigned char *buf, int minlen,
|
|
|
|
int maxlen)
|
|
|
|
{
|
|
|
|
int bytes;
|
|
|
|
|
2012-05-06 16:29:14 +00:00
|
|
|
bytes = decode_a_bit(sh, buf, maxlen);
|
2013-10-04 17:22:22 +00:00
|
|
|
/* This EOF is ignored, apparently, until input data is exhausted. */
|
2010-06-30 09:55:14 +00:00
|
|
|
if (bytes == 0)
|
|
|
|
return -1; /* EOF */
|
|
|
|
|
|
|
|
#ifdef AD_MPG123_MEAN_BITRATE
|
|
|
|
update_info(sh);
|
|
|
|
#endif
|
|
|
|
return bytes;
|
|
|
|
}
|
|
|
|
|
2013-04-12 18:32:10 +00:00
|
|
|
static int control(sh_audio_t *sh, int cmd, void *arg)
|
2010-06-30 09:55:14 +00:00
|
|
|
{
|
|
|
|
switch (cmd) {
|
|
|
|
case ADCTRL_RESYNC_STREAM:
|
|
|
|
/* Close/reopen the stream for mpg123 to make sure it doesn't
|
|
|
|
* think that it still knows the exact stream position.
|
|
|
|
* Otherwise, we would have funny effects from the gapless code.
|
|
|
|
* Oh, and it helps to minimize artifacts from jumping in the stream. */
|
|
|
|
if (reopen_stream(sh)) {
|
|
|
|
#ifdef AD_MPG123_MEAN_BITRATE
|
|
|
|
update_info(sh);
|
|
|
|
#endif
|
|
|
|
return CONTROL_TRUE;
|
|
|
|
} else {
|
2012-05-06 16:29:14 +00:00
|
|
|
/* MPlayer ignores this case! It just keeps on decoding.
|
|
|
|
* So we have to make sure resync never fails ... */
|
2010-06-30 09:55:14 +00:00
|
|
|
mp_msg(MSGT_DECAUDIO, MSGL_ERR,
|
|
|
|
"mpg123 cannot reopen stream for resync.\n");
|
|
|
|
return CONTROL_FALSE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return CONTROL_UNKNOWN;
|
|
|
|
}
|
core: redo how codecs are mapped, remove codecs.conf
Use codec names instead of FourCCs to identify codecs. Rewrite how
codecs are selected and initialized. Now each decoder exports a list
of decoders (and the codec it supports) via add_decoders(). The order
matters, and the first decoder for a given decoder is preferred over
the other decoders. E.g. all ad_mpg123 decoders are preferred over
ad_lavc, because it comes first in the mpcodecs_ad_drivers array.
Likewise, decoders within ad_lavc that are enumerated first by
libavcodec (using av_codec_next()) are preferred. (This is actually
critical to select h264 software decoding by default instead of vdpau.
libavcodec and ffmpeg/avconv use the same method to select decoders by
default, so we hope this is sane.)
The codec names follow libavcodec's codec names as defined by
AVCodecDescriptor.name (see libavcodec/codec_desc.c). Some decoders
have names different from the canonical codec name. The AVCodecDescriptor
API is relatively new, so we need a compatibility layer for older
libavcodec versions for codec names that are referenced internally,
and which are different from the decoder name. (Add a configure check
for that, because checking versions is getting way too messy.)
demux/codec_tags.c is generated from the former codecs.conf (minus
"special" decoders like vdpau, and excluding the mappings that are the
same as the mappings libavformat's exported RIFF tables). It contains
all the mappings from FourCCs to codec name. This is needed for
demux_mkv, demux_mpg, demux_avi and demux_asf. demux_lavf will set the
codec as determined by libavformat, while the other demuxers have to do
this on their own, using the mp_set_audio/video_codec_from_tag()
functions. Note that the sh_audio/video->format members don't uniquely
identify the codec anymore, and sh->codec takes over this role.
Replace the --ac/--vc/--afm/--vfm with new --vd/--ad options, which
provide cover the functionality of the removed switched.
Note: there's no CODECS_FLAG_FLIP flag anymore. This means some obscure
container/video combinations (e.g. the sample Film_200_zygo_pro.mov)
are played flipped. ffplay/avplay doesn't handle this properly either,
so we don't care and blame ffmeg/libav instead.
2013-02-09 14:15:19 +00:00
|
|
|
|
|
|
|
static void add_decoders(struct mp_decoder_list *list)
|
|
|
|
{
|
|
|
|
mp_add_decoder(list, "mpg123", "mp3", "mp3",
|
|
|
|
"High-performance decoder using libmpg123");
|
|
|
|
}
|
2013-07-22 12:41:56 +00:00
|
|
|
|
|
|
|
const struct ad_functions ad_mpg123 = {
|
|
|
|
.name = "mpg123",
|
|
|
|
.add_decoders = add_decoders,
|
|
|
|
.preinit = preinit,
|
|
|
|
.init = init,
|
|
|
|
.uninit = uninit,
|
|
|
|
.control = control,
|
|
|
|
.decode_audio = decode_audio,
|
|
|
|
};
|