RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-01 04:31:39 +00:00
Code Issues Releases Wiki Activity

Make audio decoder description structs const

Browse Source 
Make the per-decoder struct ad_functions and its ->info struct
constants. Same for the mpcodecs_ad_drivers[] table of pointers to
those structs.
This commit is contained in:
Uoti Urpala 2008-04-26 16:48:06 +03:00
parent def7ed045d
commit 170d69a71e
29 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libmpcodecs/ad.c
View File

@ -16,34 +16,34 @@
/* Missed vorbis, mad, dshow */ /* Missed vorbis, mad, dshow */
//extern ad_functions_t mpcodecs_ad_null; //extern ad_functions_t mpcodecs_ad_null;
extern ad_functions_t mpcodecs_ad_mp3lib; extern const ad_functions_t mpcodecs_ad_mp3lib;
extern ad_functions_t mpcodecs_ad_ffmpeg; extern const ad_functions_t mpcodecs_ad_ffmpeg;
extern ad_functions_t mpcodecs_ad_liba52; extern const ad_functions_t mpcodecs_ad_liba52;
extern ad_functions_t mpcodecs_ad_hwac3; extern const ad_functions_t mpcodecs_ad_hwac3;
extern ad_functions_t mpcodecs_ad_hwmpa; extern const ad_functions_t mpcodecs_ad_hwmpa;
extern ad_functions_t mpcodecs_ad_pcm; extern const ad_functions_t mpcodecs_ad_pcm;
extern ad_functions_t mpcodecs_ad_dvdpcm; extern const ad_functions_t mpcodecs_ad_dvdpcm;
extern ad_functions_t mpcodecs_ad_alaw; extern const ad_functions_t mpcodecs_ad_alaw;
extern ad_functions_t mpcodecs_ad_imaadpcm; extern const ad_functions_t mpcodecs_ad_imaadpcm;
extern ad_functions_t mpcodecs_ad_msadpcm; extern const ad_functions_t mpcodecs_ad_msadpcm;
extern ad_functions_t mpcodecs_ad_dk3adpcm; extern const ad_functions_t mpcodecs_ad_dk3adpcm;
extern ad_functions_t mpcodecs_ad_dk4adpcm; extern const ad_functions_t mpcodecs_ad_dk4adpcm;
extern ad_functions_t mpcodecs_ad_dshow; extern const ad_functions_t mpcodecs_ad_dshow;
extern ad_functions_t mpcodecs_ad_dmo; extern const ad_functions_t mpcodecs_ad_dmo;
extern ad_functions_t mpcodecs_ad_acm; extern const ad_functions_t mpcodecs_ad_acm;
extern ad_functions_t mpcodecs_ad_msgsm; extern const ad_functions_t mpcodecs_ad_msgsm;
extern ad_functions_t mpcodecs_ad_faad; extern const ad_functions_t mpcodecs_ad_faad;
extern ad_functions_t mpcodecs_ad_libvorbis; extern const ad_functions_t mpcodecs_ad_libvorbis;
extern ad_functions_t mpcodecs_ad_speex; extern const ad_functions_t mpcodecs_ad_speex;
extern ad_functions_t mpcodecs_ad_libmad; extern const ad_functions_t mpcodecs_ad_libmad;
extern ad_functions_t mpcodecs_ad_realaud; extern const ad_functions_t mpcodecs_ad_realaud;
extern ad_functions_t mpcodecs_ad_libdv; extern const ad_functions_t mpcodecs_ad_libdv;
extern ad_functions_t mpcodecs_ad_qtaudio; extern const ad_functions_t mpcodecs_ad_qtaudio;
extern ad_functions_t mpcodecs_ad_twin; extern const ad_functions_t mpcodecs_ad_twin;
extern ad_functions_t mpcodecs_ad_libmusepack; extern const ad_functions_t mpcodecs_ad_libmusepack;
extern ad_functions_t mpcodecs_ad_libdca; extern const ad_functions_t mpcodecs_ad_libdca;
ad_functions_t* mpcodecs_ad_drivers[] = const ad_functions_t * const mpcodecs_ad_drivers[] =
{ {
// &mpcodecs_ad_null, // &mpcodecs_ad_null,
#ifdef USE_MP3LIB #ifdef USE_MP3LIB

4
libmpcodecs/ad.h
View File

@ -9,7 +9,7 @@ typedef mp_codec_info_t ad_info_t;
/* interface of video decoder drivers */ /* interface of video decoder drivers */
typedef struct ad_functions typedef struct ad_functions
{ {
ad_info_t *info; const ad_info_t *info;
int (*preinit)(sh_audio_t *sh); int (*preinit)(sh_audio_t *sh);
int (*init)(sh_audio_t *sh); int (*init)(sh_audio_t *sh);
void (*uninit)(sh_audio_t *sh); void (*uninit)(sh_audio_t *sh);
@ -18,7 +18,7 @@ typedef struct ad_functions
} ad_functions_t; } ad_functions_t;
// NULL terminated array of all drivers // NULL terminated array of all drivers
extern ad_functions_t* mpcodecs_ad_drivers[]; extern const ad_functions_t * const mpcodecs_ad_drivers[];
// fallback if ADCTRL_RESYNC not implemented: sh_audio->a_in_buffer_len=0; // fallback if ADCTRL_RESYNC not implemented: sh_audio->a_in_buffer_len=0;
#define ADCTRL_RESYNC_STREAM 1 /* resync, called after seeking! */ #define ADCTRL_RESYNC_STREAM 1 /* resync, called after seeking! */

2
libmpcodecs/ad_acm.c
View File

@ -11,7 +11,7 @@
#include "ad_internal.h" #include "ad_internal.h"
#include "osdep/timer.h" #include "osdep/timer.h"
static ad_info_t info = static const ad_info_t info =
{ {
"Win32/ACM decoders", "Win32/ACM decoders",
"acm", "acm",

2
libmpcodecs/ad_alaw.c
View File

@ -5,7 +5,7 @@
#include "config.h" #include "config.h"
#include "ad_internal.h" #include "ad_internal.h"
static ad_info_t info = static const ad_info_t info =
{ {
"aLaw/uLaw audio decoder", "aLaw/uLaw audio decoder",
"alaw", "alaw",

2
libmpcodecs/ad_dk3adpcm.c
View File

@ -19,7 +19,7 @@
#include "mpbswap.h" #include "mpbswap.h"
#include "ad_internal.h" #include "ad_internal.h"
static ad_info_t info = static const ad_info_t info =
{ {
"Duck Corp. DK3 ADPCM decoder", "Duck Corp. DK3 ADPCM decoder",
"dk3adpcm", "dk3adpcm",

2
libmpcodecs/ad_dmo.c
View File

@ -9,7 +9,7 @@
#include "ad_internal.h" #include "ad_internal.h"
#include "libaf/reorder_ch.h" #include "libaf/reorder_ch.h"
static ad_info_t info = static const ad_info_t info =
{ {
"Win32/DMO decoders", "Win32/DMO decoders",
"dmo", "dmo",

2
libmpcodecs/ad_dshow.c
View File

@ -8,7 +8,7 @@
#include "ad_internal.h" #include "ad_internal.h"
static ad_info_t info = static const ad_info_t info =
{ {
"Win32/DirectShow decoders", "Win32/DirectShow decoders",
"dshow", "dshow",

2
libmpcodecs/ad_dvdpcm.c
View File

@ -7,7 +7,7 @@
#include "help_mp.h" #include "help_mp.h"
#include "ad_internal.h" #include "ad_internal.h"
static ad_info_t info = static const ad_info_t info =
{ {
"Uncompressed DVD/VOB LPCM audio decoder", "Uncompressed DVD/VOB LPCM audio decoder",
"dvdpcm", "dvdpcm",

2
libmpcodecs/ad_faad.c
View File

@ -12,7 +12,7 @@
#include "ad_internal.h" #include "ad_internal.h"
#include "libaf/reorder_ch.h" #include "libaf/reorder_ch.h"
static ad_info_t info = static const ad_info_t info =
{ {
"AAC (MPEG2/4 Advanced Audio Coding)", "AAC (MPEG2/4 Advanced Audio Coding)",
"faad", "faad",

2
libmpcodecs/ad_ffmpeg.c
View File

@ -11,7 +11,7 @@
#include "mpbswap.h" #include "mpbswap.h"
static ad_info_t info = static const ad_info_t info =
{ {
"FFmpeg/libavcodec audio decoders", "FFmpeg/libavcodec audio decoders",
"ffmpeg", "ffmpeg",

2
libmpcodecs/ad_hwac3.c
View File

@ -24,7 +24,7 @@
static int isdts = -1; static int isdts = -1;
static ad_info_t info = static const ad_info_t info =
{ {
"AC3/DTS pass-through S/PDIF", "AC3/DTS pass-through S/PDIF",
"hwac3", "hwac3",

2
libmpcodecs/ad_hwmpa.c
View File

@ -15,7 +15,7 @@
//based on ad_hwac3.c and ad_libmad.c //based on ad_hwac3.c and ad_libmad.c
static ad_info_t info = static const ad_info_t info =
{ {
"MPEG audio pass-through (fake decoder)", "MPEG audio pass-through (fake decoder)",
"hwmpa", "hwmpa",

2
libmpcodecs/ad_imaadpcm.c
View File

@ -69,7 +69,7 @@ static int adpcm_index[16] =
// sign extend a 4-bit value // sign extend a 4-bit value
#define SE_4BIT(x) if (x & 0x8) x -= 0x10; #define SE_4BIT(x) if (x & 0x8) x -= 0x10;
static ad_info_t info = static const ad_info_t info =
{ {
"IMA ADPCM audio decoder", "IMA ADPCM audio decoder",
"imaadpcm", "imaadpcm",

2
libmpcodecs/ad_internal.h
View File

@ -17,7 +17,7 @@ static void uninit(sh_audio_t *sh);
static int control(sh_audio_t *sh,int cmd,void* arg, ...); static int control(sh_audio_t *sh,int cmd,void* arg, ...);
static int decode_audio(sh_audio_t *sh,unsigned char *buffer,int minlen,int maxlen); static int decode_audio(sh_audio_t *sh,unsigned char *buffer,int minlen,int maxlen);
#define LIBAD_EXTERN(x) ad_functions_t mpcodecs_ad_##x = {\ #define LIBAD_EXTERN(x) const ad_functions_t mpcodecs_ad_##x = {\
&info,\ &info,\
preinit,\ preinit,\
init,\ init,\

2
libmpcodecs/ad_liba52.c
View File

@ -38,7 +38,7 @@ static sample_t a52_level = 1;
float a52_drc_level = 1.0; float a52_drc_level = 1.0;
static int a52_drc_action = DRC_NO_ACTION; static int a52_drc_action = DRC_NO_ACTION;
static ad_info_t info = static const ad_info_t info =
{ {
"AC3 decoding with liba52", "AC3 decoding with liba52",
"liba52", "liba52",

2
libmpcodecs/ad_libdca.c
View File

@ -32,7 +32,7 @@
#include <dts.h> #include <dts.h>
static ad_info_t info = static const ad_info_t info =
{ {
"DTS decoding with libdca", "DTS decoding with libdca",
"libdca", "libdca",

2
libmpcodecs/ad_libdv.c
View File

@ -20,7 +20,7 @@
#include "ad_internal.h" #include "ad_internal.h"
static ad_info_t info = static const ad_info_t info =
{ {
"Raw DV Audio Decoder", "Raw DV Audio Decoder",
"libdv", "libdv",

2
libmpcodecs/ad_libmad.c
View File

@ -8,7 +8,7 @@
#include "ad_internal.h" #include "ad_internal.h"
static ad_info_t info = { static const ad_info_t info = {
"libmad mpeg audio decoder", "libmad mpeg audio decoder",
"libmad", "libmad",
"A'rpi", "A'rpi",

2
libmpcodecs/ad_libvorbis.c
View File

@ -8,7 +8,7 @@
#include "config.h" #include "config.h"
#include "ad_internal.h" #include "ad_internal.h"
static ad_info_t info = static const ad_info_t info =
{ {
"Ogg/Vorbis audio decoder", "Ogg/Vorbis audio decoder",
"libvorbis", "libvorbis",

2
libmpcodecs/ad_mp3lib.c
View File

@ -6,7 +6,7 @@
#include "ad_internal.h" #include "ad_internal.h"
static ad_info_t info = static const ad_info_t info =
{ {
"MPEG layer-2, layer-3", "MPEG layer-2, layer-3",
"mp3lib", "mp3lib",

2
libmpcodecs/ad_mpc.c
View File

@ -16,7 +16,7 @@
#include "libaf/af_format.h" #include "libaf/af_format.h"
#include "libvo/fastmemcpy.h" #include "libvo/fastmemcpy.h"
static ad_info_t info = static const ad_info_t info =
{ {
"Musepack audio decoder", "Musepack audio decoder",
"mpcdec", "mpcdec",

2
libmpcodecs/ad_msadpcm.c
View File

@ -15,7 +15,7 @@
#include "mpbswap.h" #include "mpbswap.h"
#include "ad_internal.h" #include "ad_internal.h"
static ad_info_t info = static const ad_info_t info =
{ {
"MS ADPCM audio decoder", "MS ADPCM audio decoder",
"msadpcm", "msadpcm",

2
libmpcodecs/ad_msgsm.c
View File

@ -5,7 +5,7 @@
#include "config.h" #include "config.h"
#include "ad_internal.h" #include "ad_internal.h"
static ad_info_t info = static const ad_info_t info =
{ {
"native GSM/MSGSM audio decoder", "native GSM/MSGSM audio decoder",
"msgsm", "msgsm",

2
libmpcodecs/ad_pcm.c
View File

@ -7,7 +7,7 @@
#include "libaf/af_format.h" #include "libaf/af_format.h"
#include "libaf/reorder_ch.h" #include "libaf/reorder_ch.h"
static ad_info_t info = static const ad_info_t info =
{ {
"Uncompressed PCM audio decoder", "Uncompressed PCM audio decoder",
"pcm", "pcm",

2
libmpcodecs/ad_qtaudio.c
View File

@ -20,7 +20,7 @@
#include "loader/ldt_keeper.h" #include "loader/ldt_keeper.h"
#endif #endif
static ad_info_t info = { static const ad_info_t info = {
"QuickTime Audio Decoder", "QuickTime Audio Decoder",
"qtaudio", "qtaudio",
"A'rpi", "A'rpi",

2
libmpcodecs/ad_realaud.c
View File

@ -14,7 +14,7 @@
#include "ad_internal.h" #include "ad_internal.h"
#include "loader/wine/windef.h" #include "loader/wine/windef.h"
static ad_info_t info = { static const ad_info_t info = {
"RealAudio decoder", "RealAudio decoder",
"realaud", "realaud",
"Alex Beregszaszi", "Alex Beregszaszi",

2
libmpcodecs/ad_sample.c
View File

@ -7,7 +7,7 @@
#include "config.h" #include "config.h"
#include "ad_internal.h" #include "ad_internal.h"
static ad_info_t info = { static const ad_info_t info = {
"Sample audio decoder", // name of the driver "Sample audio decoder", // name of the driver
"sample", // driver name. should be the same as filename without ad_ "sample", // driver name. should be the same as filename without ad_
"A'rpi", // writer/maintainer of _this_ file "A'rpi", // writer/maintainer of _this_ file

2
libmpcodecs/ad_speex.c
View File

@ -11,7 +11,7 @@
#include <speex/speex_header.h> #include <speex/speex_header.h>
#include "ad_internal.h" #include "ad_internal.h"
static ad_info_t info = { static const ad_info_t info ={
"Speex audio decoder", "Speex audio decoder",
"speex", "speex",
"Reimar Döffinger", "Reimar Döffinger",

2
libmpcodecs/ad_twin.c
View File

@ -11,7 +11,7 @@
#include "help_mp.h" #include "help_mp.h"
static ad_info_t info = static const ad_info_t info =
{ {
"TWinVQ decoder", "TWinVQ decoder",
"vqf", "vqf",