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.

1 files changed, 9 insertions, 5 deletions

diff --git a/demux/stheader.h b/demux/stheader.h
index 97d079f4e6..433b2a934a 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -21,6 +21,8 @@
 
 #include <stdbool.h>
 
+#include "codec_tags.h"
+
 #include "aviheader.h"
 #include "ms_hdr.h"
 struct MPOpts;
@@ -54,6 +56,9 @@ struct sh_stream {
     struct sh_video *video;
     struct sh_sub *sub;
 
+    // E.g. "h264" (usually corresponds to AVCodecDescriptor.name)
+    const char *codec;
+
     // Work around other hacks.
     int lavf_codec_tag;
 
@@ -61,6 +66,9 @@ struct sh_stream {
     bool default_track;         // container default track flag
     bool attached_picture;      // stream is a picture (such as album art)
 
+    // Human readable description of the running decoder, or NULL
+    char *decoder_desc;
+
     // shouldn't exist type of stuff
     struct MPOpts *opts;
 };
@@ -68,12 +76,10 @@ struct sh_stream {
 
 #define SH_COMMON                                                       \
     struct sh_stream *gsh;                                              \
-    const char *demuxer_codecname;                                      \
     struct MPOpts *opts;                                                \
     struct demux_stream *ds;                                            \
-    struct codecs *codec;                                               \
+    /* usually a FourCC, exact meaning depends on gsh->format */        \
     unsigned int format;                                                \
-    int libav_codec_id;                                                 \
     int initialized;                                                    \
     /* number of seconds stream should be delayed                       \
      * (according to dwStart or similar) */                             \
@@ -87,7 +93,6 @@ struct sh_stream {
     double pts;                                                         \
     /* decoder context */                                               \
     void *context;                                                      \
-    const char *codecname;                                              \
     char *lang;   /* track language */                                  \
 
 typedef struct sh_common {
@@ -154,7 +159,6 @@ typedef struct sh_video {
     int disp_w, disp_h;   // display size (filled by demuxer)
     int colorspace;       // mp_csp
     int color_range;      // mp_csp_levels
-    int imgfmt;           // raw video image format
     // output driver/filters: (set by libmpcodecs core)
     unsigned int outfmt;
     struct vf_instance *vfilter;  // video filter chain