diff options
author | wm4 <wm4@nowhere> | 2013-02-09 15:15:19 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-02-10 17:25:56 +0100 |
commit | 4d016a92c876e98797c362d05468bf27d5a85414 (patch) | |
tree | 8959f0e63885dee7c5d25e4c7f8b0ac4cea7fd69 /core/codec-cfg.h | |
parent | bb8da972052beef22b2dff2ba1003eff5cc1a797 (diff) | |
download | mpv-4d016a92c876e98797c362d05468bf27d5a85414.tar.bz2 mpv-4d016a92c876e98797c362d05468bf27d5a85414.tar.xz |
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.
Diffstat (limited to 'core/codec-cfg.h')
-rw-r--r-- | core/codec-cfg.h | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/core/codec-cfg.h b/core/codec-cfg.h deleted file mode 100644 index 01af497c3d..0000000000 --- a/core/codec-cfg.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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_CODEC_CFG_H -#define MPLAYER_CODEC_CFG_H - -#include <stdbool.h> - -#define CODECS_MAX_FOURCC 92 - -// Global flags: -#define CODECS_FLAG_FLIP (1<<0) - -#define CODECS_STATUS__MIN 0 -#define CODECS_STATUS_NOT_WORKING -1 -#define CODECS_STATUS_PROBLEMS 0 -#define CODECS_STATUS_WORKING 1 -#define CODECS_STATUS_UNTESTED 2 -#define CODECS_STATUS__MAX 2 - - -#if !defined(GUID_TYPE) && !defined(GUID_DEFINED) -#define GUID_TYPE 1 -#define GUID_DEFINED 1 -typedef struct { - unsigned long f1; - unsigned short f2; - unsigned short f3; - unsigned char f4[8]; -} GUID; -#endif - - -typedef struct codecs { - unsigned int fourcc[CODECS_MAX_FOURCC]; - unsigned int fourccmap[CODECS_MAX_FOURCC]; - char *name; - char *info; - char *comment; - char *dll; - char* drv; - GUID guid; - short flags; - short status; - bool anyinput; -} codecs_t; - -int parse_codec_cfg(const char *cfgfile); -codecs_t* find_video_codec(unsigned int fourcc, unsigned int *fourccmap, - codecs_t *start, int force); -codecs_t* find_audio_codec(unsigned int fourcc, unsigned int *fourccmap, - codecs_t *start, int force); -codecs_t* find_codec(unsigned int fourcc, unsigned int *fourccmap, - codecs_t *start, int audioflag, int force); -void list_codecs(int audioflag); -void codecs_uninit_free(void); - -typedef char ** stringset_t; -void stringset_init(stringset_t *set); -void stringset_free(stringset_t *set); -void stringset_add(stringset_t *set, const char *str); -int stringset_test(stringset_t *set, const char *str); - -#endif /* MPLAYER_CODEC_CFG_H */ |