mirror of
https://github.com/mpv-player/mpv
synced 2024-12-25 08:12:17 +00:00
81bf9a1963
Before this commit, there was AF_FORMAT_AC3 (the original spdif format, used for AC3 and DTS core), and AF_FORMAT_IEC61937 (used for AC3, DTS and DTS-HD), which was handled as some sort of superset for AF_FORMAT_AC3. There also was AF_FORMAT_MPEG2, which used IEC61937-framing, but still was handled as something "separate". Technically, all of them are pretty similar, but may use different bitrates. Since digital passthrough pretends to be PCM (just with special headers that wrap digital packets), this is easily detectable by the higher samplerate or higher number of channels, so I don't know why you'd need a separate "class" of sample formats (AF_FORMAT_AC3 vs. AF_FORMAT_IEC61937) to distinguish them. Actually, this whole thing is just a mess. Simplify this by handling all these formats the same way. AF_FORMAT_IS_IEC61937() now returns 1 for all spdif formats (even MP3). All AOs just accept all spdif formats now - whether that works or not is not really clear (seems inconsistent due to earlier attempts to make DTS-HD work). But on the other hand, enabling spdif requires manual user interaction, so it doesn't matter much if initialization fails in slightly less graceful ways if it can't work at all. At a later point, we will support passthrough with ao_pulse. It seems the PulseAudio API wants to know the codec type (or maybe not - feeding it DTS while telling it it's AC3 works), add separate formats for each codecs. While this reminds of the earlier chaos, it's stricter, and most code just uses AF_FORMAT_IS_IEC61937(). Also, modify AF_FORMAT_TYPE_MASK (renamed from AF_FORMAT_POINT_MASK) to include special formats, so that it always describes the fundamental sample format type. This also ensures valid AF formats are never 0 (this was probably broken in one of the earlier commits from today).
128 lines
4.5 KiB
C
128 lines
4.5 KiB
C
/*
|
|
* The sample format system used lin libaf is based on bitmasks.
|
|
* The format definition only refers to the storage format,
|
|
* not the resolution.
|
|
*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef MPLAYER_AF_FORMAT_H
|
|
#define MPLAYER_AF_FORMAT_H
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include "misc/bstr.h"
|
|
|
|
// Signed/unsigned
|
|
#define AF_FORMAT_SI (0<<0) // Signed
|
|
#define AF_FORMAT_US (1<<0) // Unsigned
|
|
#define AF_FORMAT_SIGN_MASK (1<<0)
|
|
|
|
// Bits used
|
|
// Some code assumes they're sorted by size.
|
|
#define AF_FORMAT_8BIT (0<<1)
|
|
#define AF_FORMAT_16BIT (1<<1)
|
|
#define AF_FORMAT_24BIT (2<<1)
|
|
#define AF_FORMAT_32BIT (3<<1)
|
|
#define AF_FORMAT_64BIT (4<<1)
|
|
#define AF_FORMAT_BITS_MASK (7<<1)
|
|
|
|
// Fixed/floating point/special
|
|
#define AF_FORMAT_I (1<<4) // Int
|
|
#define AF_FORMAT_F (2<<4) // Foating point
|
|
#define AF_FORMAT_S (4<<4) // special (IEC61937)
|
|
#define AF_FORMAT_TYPE_MASK (7<<4)
|
|
|
|
// Interleaving (planar formats have data for each channel in separate planes)
|
|
#define AF_FORMAT_INTERLEAVED (0<<7) // must be 0
|
|
#define AF_FORMAT_PLANAR (1<<7)
|
|
#define AF_FORMAT_INTERLEAVING_MASK (1<<7)
|
|
|
|
#define AF_FORMAT_S_CODEC(n) ((n)<<8)
|
|
#define AF_FORMAT_S_CODEC_MASK (15 <<8) // 16 codecs max.
|
|
|
|
#define AF_FORMAT_MASK ((1<<12)-1)
|
|
|
|
#define AF_INTP (AF_FORMAT_I|AF_FORMAT_PLANAR)
|
|
#define AF_FLTP (AF_FORMAT_F|AF_FORMAT_PLANAR)
|
|
#define AF_FORMAT_S_(n) (AF_FORMAT_S_CODEC(n)|AF_FORMAT_S|AF_FORMAT_16BIT)
|
|
|
|
// actual sample formats
|
|
enum af_format {
|
|
AF_FORMAT_UNKNOWN = 0,
|
|
|
|
AF_FORMAT_U8 = (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_8BIT),
|
|
AF_FORMAT_S8 = (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_8BIT),
|
|
AF_FORMAT_U16 = (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_16BIT),
|
|
AF_FORMAT_S16 = (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_16BIT),
|
|
AF_FORMAT_U24 = (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_24BIT),
|
|
AF_FORMAT_S24 = (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_24BIT),
|
|
AF_FORMAT_U32 = (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_32BIT),
|
|
AF_FORMAT_S32 = (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_32BIT),
|
|
|
|
AF_FORMAT_FLOAT = (AF_FORMAT_F|AF_FORMAT_32BIT),
|
|
AF_FORMAT_DOUBLE = (AF_FORMAT_F|AF_FORMAT_64BIT),
|
|
|
|
// Planar variants
|
|
AF_FORMAT_U8P = (AF_INTP|AF_FORMAT_US|AF_FORMAT_8BIT),
|
|
AF_FORMAT_S16P = (AF_INTP|AF_FORMAT_SI|AF_FORMAT_16BIT),
|
|
AF_FORMAT_S32P = (AF_INTP|AF_FORMAT_SI|AF_FORMAT_32BIT),
|
|
AF_FORMAT_FLOATP = (AF_FLTP|AF_FORMAT_32BIT),
|
|
AF_FORMAT_DOUBLEP = (AF_FLTP|AF_FORMAT_64BIT),
|
|
|
|
// All of these use IEC61937 framing, and otherwise pretend to be like PCM.
|
|
AF_FORMAT_S_AAC = AF_FORMAT_S_(0),
|
|
AF_FORMAT_S_AC3 = AF_FORMAT_S_(1),
|
|
AF_FORMAT_S_DTS = AF_FORMAT_S_(2),
|
|
AF_FORMAT_S_DTSHD = AF_FORMAT_S_(3),
|
|
AF_FORMAT_S_EAC3 = AF_FORMAT_S_(4),
|
|
AF_FORMAT_S_MP3 = AF_FORMAT_S_(5),
|
|
AF_FORMAT_S_TRUEHD = AF_FORMAT_S_(6),
|
|
};
|
|
|
|
#define AF_FORMAT_IS_IEC61937(f) (((f) & AF_FORMAT_TYPE_MASK) == AF_FORMAT_S)
|
|
#define AF_FORMAT_IS_SPECIAL(f) AF_FORMAT_IS_IEC61937(f)
|
|
|
|
struct af_fmt_entry {
|
|
const char *name;
|
|
int format;
|
|
};
|
|
|
|
extern const struct af_fmt_entry af_fmtstr_table[];
|
|
|
|
int af_str2fmt_short(bstr str);
|
|
const char *af_fmt_to_str(int format);
|
|
|
|
int af_fmt2bps(int format);
|
|
int af_fmt2bits(int format);
|
|
int af_fmt_change_bits(int format, int bits);
|
|
|
|
int af_fmt_to_planar(int format);
|
|
int af_fmt_from_planar(int format);
|
|
bool af_fmt_is_planar(int format);
|
|
|
|
// Amount of bytes that contain audio of the given duration, aligned to frames.
|
|
int af_fmt_seconds_to_bytes(int format, float seconds, int channels, int samplerate);
|
|
|
|
bool af_fmt_is_valid(int format);
|
|
|
|
void af_fill_silence(void *dst, size_t bytes, int format);
|
|
|
|
int af_format_conversion_score(int dst_format, int src_format);
|
|
|
|
#endif /* MPLAYER_AF_FORMAT_H */
|