summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-01-31 04:21:02 +0100
committerwm4 <wm4@nowhere>2018-02-01 10:21:55 +0100
commit8b3306924d1b80ed85907449ffa2549946e8b137 (patch)
treec4696b0af7fb2ef363d40696b370e6ce24c3b275
parent4b567aeac8d1741b14bf2ee363a5434a4877565e (diff)
downloadmpv-8b3306924d1b80ed85907449ffa2549946e8b137.tar.bz2
mpv-8b3306924d1b80ed85907449ffa2549946e8b137.tar.xz
codecs: remove unused family field
MPlayer used this to distinguish multiple decoder wrappers (such as libavcodec vs. binary codec loader vs. builtin decoders). It lost meaning in mpv as non-libavcodec things were dropped. Now it doesn't serve any purpose anymore. Parsing was removed quite a while ago, and the recent filter change removed any use of the internal family field. Get rid of it.
-rw-r--r--DOCS/man/input.rst4
-rw-r--r--audio/decode/ad_spdif.c2
-rw-r--r--common/av_common.c4
-rw-r--r--common/codecs.c12
-rw-r--r--common/codecs.h5
-rw-r--r--player/command.c1
6 files changed, 8 insertions, 20 deletions
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index 188858d86d..28146f29e2 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -2104,9 +2104,6 @@ Property list
List of decoders supported. This lists decoders which can be passed to
``--vd`` and ``--ad``.
- ``family``
- Decoder driver. Usually ``lavc`` for libavcodec.
-
``codec``
Canonical codec name, which identifies the format the decoder can
handle.
@@ -2127,7 +2124,6 @@ Property list
MPV_FORMAT_NODE_ARRAY
MPV_FORMAT_NODE_MAP (for each decoder entry)
- "family" MPV_FORMAT_STRING
"codec" MPV_FORMAT_STRING
"driver" MPV_FORMAT_STRING
"description" MPV_FORMAT_STRING
diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c
index c97c62ddaa..0706b11614 100644
--- a/audio/decode/ad_spdif.c
+++ b/audio/decode/ad_spdif.c
@@ -378,7 +378,7 @@ struct mp_decoder_list *select_spdif_codec(const char *codec, const char *pref)
const char *suffix_name = dts_hd_allowed ? "dts_hd" : codec;
char name[80];
snprintf(name, sizeof(name), "spdif_%s", suffix_name);
- mp_add_decoder(list, "spdif", codec, name,
+ mp_add_decoder(list, codec, name,
"libavformat/spdifenc audio pass-through decoder");
return list;
}
diff --git a/common/av_common.c b/common/av_common.c
index 0599d98465..0981e919e1 100644
--- a/common/av_common.c
+++ b/common/av_common.c
@@ -227,7 +227,7 @@ 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) {
- mp_add_decoder(list, "lavc", mp_codec_from_av_codec_id(cur->id),
+ mp_add_decoder(list, mp_codec_from_av_codec_id(cur->id),
cur->name, cur->long_name);
}
}
@@ -242,7 +242,7 @@ void mp_add_lavc_encoders(struct mp_decoder_list *list)
if (!cur)
break;
if (av_codec_is_encoder(cur)) {
- mp_add_decoder(list, "lavc", mp_codec_from_av_codec_id(cur->id),
+ mp_add_decoder(list, mp_codec_from_av_codec_id(cur->id),
cur->name, cur->long_name);
}
}
diff --git a/common/codecs.c b/common/codecs.c
index 7985501869..8101b50f68 100644
--- a/common/codecs.c
+++ b/common/codecs.c
@@ -21,11 +21,10 @@
#include "common/msg.h"
#include "codecs.h"
-void mp_add_decoder(struct mp_decoder_list *list, const char *family,
- const char *codec, const char *decoder, const char *desc)
+void mp_add_decoder(struct mp_decoder_list *list, const char *codec,
+ const char *decoder, const char *desc)
{
struct mp_decoder_entry entry = {
- .family = talloc_strdup(list, family),
.codec = talloc_strdup(list, codec),
.decoder = talloc_strdup(list, decoder),
.desc = talloc_strdup(list, desc),
@@ -40,7 +39,7 @@ static void add_new(struct mp_decoder_list *to, struct mp_decoder_entry *entry,
{
if (!entry || (codec && strcmp(entry->codec, codec) != 0))
return;
- mp_add_decoder(to, entry->family, entry->codec, entry->decoder, entry->desc);
+ mp_add_decoder(to, entry->codec, entry->decoder, entry->desc);
}
// Select a decoder from the given list for the given codec. The selection
@@ -72,11 +71,6 @@ struct mp_decoder_list *mp_select_decoders(struct mp_log *log,
stop = true;
break;
}
- if (bstr_find0(entry, ":") >= 0) {
- mp_err(log, "Codec family selection was removed. "
- "Pass the codec name directly.\n");
- break;
- }
for (int n = 0; n < all->num_entries; n++) {
struct mp_decoder_entry *cur = &all->entries[n];
if (bstr_equals0(entry, cur->decoder))
diff --git a/common/codecs.h b/common/codecs.h
index bed5c46905..367e9f6c5b 100644
--- a/common/codecs.h
+++ b/common/codecs.h
@@ -21,7 +21,6 @@
struct mp_log;
struct mp_decoder_entry {
- const char *family; // decoder module (e.g. ad_lavc => "lavc")
const char *codec; // name of the codec (e.g. "mp3")
const char *decoder; // decoder name (e.g. "mp3float")
const char *desc; // human readable description
@@ -32,8 +31,8 @@ struct mp_decoder_list {
int num_entries;
};
-void mp_add_decoder(struct mp_decoder_list *list, const char *family,
- const char *codec, const char *decoder, const char *desc);
+void mp_add_decoder(struct mp_decoder_list *list, const char *codec,
+ const char *decoder, const char *desc);
struct mp_decoder_list *mp_select_decoders(struct mp_log *log,
struct mp_decoder_list *all,
diff --git a/player/command.c b/player/command.c
index 1b074b8767..06c5e388ca 100644
--- a/player/command.c
+++ b/player/command.c
@@ -3538,7 +3538,6 @@ static int get_decoder_entry(int item, int action, void *arg, void *ctx)
struct mp_decoder_entry *c = &codecs->entries[item];
struct m_sub_property props[] = {
- {"family", SUB_PROP_STR(c->family)},
{"codec", SUB_PROP_STR(c->codec)},
{"driver" , SUB_PROP_STR(c->decoder)},
{"description", SUB_PROP_STR(c->desc)},