diff options
Diffstat (limited to 'core/av_common.c')
| -rw-r--r-- | core/av_common.c | 107 |
1 files changed, 22 insertions, 85 deletions
diff --git a/core/av_common.c b/core/av_common.c index 68ab461c10..5e6c8a4352 100644 --- a/core/av_common.c +++ b/core/av_common.c @@ -19,7 +19,6 @@ #include <libavutil/common.h> -#include "config.h" #include "core/mp_talloc.h" #include "av_common.h" #include "codecs.h" @@ -59,13 +58,6 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st) avctx->bits_per_coded_sample = st->bits_per_coded_sample; } -#if !HAVE_AVCODEC_IS_DECODER_API -static int av_codec_is_decoder(AVCodec *codec) -{ - return !!codec->decode; -} -#endif - void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type) { AVCodec *cur = NULL; @@ -74,93 +66,38 @@ void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type) if (!cur) break; if (av_codec_is_decoder(cur) && cur->type == type) { - struct mp_decoder_entry entry = { - .family = "lavc", - .codec = mp_codec_from_av_codec_id(cur->id), - .decoder = cur->name, - .desc = cur->long_name, - }; - assert(entry.family); - MP_TARRAY_APPEND(list, list->entries, list->num_entries, entry); + mp_add_decoder(list, "lavc", mp_codec_from_av_codec_id(cur->id), + cur->name, cur->long_name); } } } -#if HAVE_AVCODEC_CODEC_DESC_API - -int mp_codec_to_av_codec_id(const char *codec) -{ - - const AVCodecDescriptor *desc = avcodec_descriptor_get_by_name(codec); - return desc ? desc->id : CODEC_ID_NONE; -} - -const char *mp_codec_from_av_codec_id(int codec_id) -{ - const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id); - return desc ? desc->name : NULL; -} - -#else - -struct mp_av_codec { - const char *name; - int codec_id; -}; - -// Some decoders have a different name from the canonical codec name, for -// example the codec "dts" CODEC_ID_DTS has the decoder named "dca", and -// avcodec_find_decoder_by_name("dts") would return 0. We always want the -// canonical name. -// On newer lavc versions, avcodec_descriptor_get_by_name("dts") will return -// CODEC_ID_DTS, which is what we want, but for older versions we need this -// lookup table. -struct mp_av_codec mp_av_codec_id_list[] = { - {"ra_144", CODEC_ID_RA_144}, - {"ra_288", CODEC_ID_RA_288}, - {"smackaudio", CODEC_ID_SMACKAUDIO}, - {"dts", CODEC_ID_DTS}, - {"musepack7", CODEC_ID_MUSEPACK7}, - {"musepack8", CODEC_ID_MUSEPACK8}, - {"amr_nb", CODEC_ID_AMR_NB}, - {"amr_wb", CODEC_ID_AMR_WB}, - {"adpcm_g722", CODEC_ID_ADPCM_G722}, - {"adpcm_g726", CODEC_ID_ADPCM_G726}, - {"westwood_snd1", CODEC_ID_WESTWOOD_SND1}, - {"mp4als", CODEC_ID_MP4ALS}, - {"vixl", CODEC_ID_VIXL}, - {"flv1", CODEC_ID_FLV1}, - {"msmpeg4v3", CODEC_ID_MSMPEG4V3}, - {"jpeg2000", CODEC_ID_JPEG2000}, - {"ulti", CODEC_ID_ULTI}, - {"smackvideo", CODEC_ID_SMACKVIDEO}, - {"tscc", CODEC_ID_TSCC}, - {"cscd", CODEC_ID_CSCD}, - {"tgv", CODEC_ID_TGV}, - {"roq", CODEC_ID_ROQ}, - {"idcin", CODEC_ID_IDCIN}, - {"ws_vqa", CODEC_ID_WS_VQA}, - {0}, -}; - int mp_codec_to_av_codec_id(const char *codec) { - for (int n = 0; mp_av_codec_id_list[n].name; n++) { - if (strcmp(mp_av_codec_id_list[n].name, codec) == 0) - return mp_av_codec_id_list[n].codec_id; + int id = AV_CODEC_ID_NONE; + if (codec) { + const AVCodecDescriptor *desc = avcodec_descriptor_get_by_name(codec); + if (desc) + id = desc->id; + if (id == AV_CODEC_ID_NONE) { + AVCodec *avcodec = avcodec_find_decoder_by_name(codec); + if (avcodec) + id = avcodec->id; + } } - AVCodec *avcodec = avcodec_find_decoder_by_name(codec); - return avcodec ? avcodec->id : CODEC_ID_NONE; + return id; } const char *mp_codec_from_av_codec_id(int codec_id) { - for (int n = 0; mp_av_codec_id_list[n].name; n++) { - if (mp_av_codec_id_list[n].codec_id == codec_id) - return mp_av_codec_id_list[n].name; + const char *name = NULL; + const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id); + if (desc) + name = desc->name; + if (!name) { + AVCodec *avcodec = avcodec_find_decoder(codec_id); + if (avcodec) + name = avcodec->name; } - AVCodec *avcodec = avcodec_find_decoder(codec_id); - return avcodec ? avcodec->name : NULL; + return name; } - -#endif |