player/command: add track-list/N/decoder

Kacper Michajłow committed 2 years ago

Commit a569c3c1 parent 8a4ecda7 files · +22 −28Browse files

Unified · Split

7 files

DOCS/interface-changes/track-list-decoder-tag.txt +1 −0
DOCS/man/input.rst +3 −0
common/av_common.c +2 −0
demux/stheader.h +6 −0
filters/f_decoder_wrapper.c +6 −18
filters/f_decoder_wrapper.h +0 −4
player/command.c +4 −6

DOCS/interface-changes/track-list-decoder-tag.txt+1−0

@@ -0,0 +1 @@
		1	add `track-list/N/decoder`

DOCS/man/input.rst+3−0

@@ -3077,6 +3077,9 @@ Property list · 3076 unmodified lines
3077	match even if the default (builtin) demuxer is used, but there is	3077	match even if the default (builtin) demuxer is used, but there is
3078	no hard guarantee.	3078	no hard guarantee.
3079		3079
		3080	``track-list/N/decoder``
		3081	If this track is being decoded, the short decoder name,
		3082
3080	``track-list/N/decoder-desc``	3083	``track-list/N/decoder-desc``
3081	If this track is being decoded, the human-readable decoder name,	3084	If this track is being decoded, the human-readable decoder name,
3082		3085

common/av_common.c+2−0

@@ -410,4 +410,6 @@ void mp_codec_info_from_av(const AVCodecContext avctx, struct mp_codec_params · 409 unmodified lines
410	c->codec_profile = avcodec_profile_name(avctx->codec_id, avctx->profile);	410	c->codec_profile = avcodec_profile_name(avctx->codec_id, avctx->profile);
411	c->codec = avctx->codec_descriptor->name;	411	c->codec = avctx->codec_descriptor->name;
412	c->codec_desc = avctx->codec_descriptor->long_name;	412	c->codec_desc = avctx->codec_descriptor->long_name;
		413	c->decoder = avctx->codec->name;
		414	c->decoder_desc = avctx->codec->long_name;
413	}	415	}

demux/stheader.h+6−0

     // Corresponding codec profile
     const char *codec_profile;
+    // E.g. "h264" (usually corresponds to AVCodec.name)
+    const char *decoder;
+    // Usually corresponds to AVCodec.long_name
+    const char *decoder_desc;
     // Usually a FourCC, exact meaning depends on codec.
     unsigned int codec_tag;

filters/f_decoder_wrapper.c+6−18

     // --- Protected by cache_lock.
     char *cur_hwdec;
-    char *decoder_desc;
     bool try_spdif;
     bool attached_picture;
     bool pts_reset;
     reset_decoder(p);
     p->has_broken_packet_pts = -10; // needs 10 packets to reach decision
-    talloc_free(p->decoder_desc);
-    p->decoder_desc = NULL;
     const struct mp_decoder_fns *driver = NULL;
     struct mp_decoder_list *list = NULL;
     char *user_list = NULL;
         p->decoder = driver->create(p->decf, p->codec, sel->decoder);
         if (p->decoder) {
-            mp_mutex_lock(&p->cache_lock);
+            p->codec->decoder = talloc_strdup(p, sel->decoder);
-            const char *d = sel->desc && sel->desc[0] ? sel->desc : sel->decoder;
+            p->codec->decoder_desc = talloc_strdup(p, sel->desc && sel->desc[0] ? sel->desc : NULL);
-            p->decoder_desc = talloc_strdup(p, d);
+            MP_VERBOSE(p, "Selected decoder: %s", sel->decoder);
-            MP_VERBOSE(p, "Selected codec: %s\n", p->decoder_desc);
+            if (p->codec->decoder_desc)
-            mp_mutex_unlock(&p->cache_lock);
+                MP_VERBOSE(p, " - %s", p->codec->decoder_desc);
+            MP_VERBOSE(p, "\n");
             break;
         }
     return res;
 }
-void mp_decoder_wrapper_get_desc(struct mp_decoder_wrapper *d,
-                                 char *buf, size_t buf_size)
-{
-    struct priv *p = d->f->priv;
-    mp_mutex_lock(&p->cache_lock);
-    snprintf(buf, buf_size, "%s", p->decoder_desc ? p->decoder_desc : "");
-    mp_mutex_unlock(&p->cache_lock);
-}
 void mp_decoder_wrapper_set_frame_drops(struct mp_decoder_wrapper *d, int num)
 {
     struct priv *p = d->f->priv;

filters/f_decoder_wrapper.h+0−4

 struct mp_decoder_wrapper *mp_decoder_wrapper_create(struct mp_filter *parent,
                                                      struct sh_stream *src);
-// For informational purposes.
-void mp_decoder_wrapper_get_desc(struct mp_decoder_wrapper *d,
-                                 char *buf, size_t buf_size);
 // Legacy decoder framedrop control.
 void mp_decoder_wrapper_set_frame_drops(struct mp_decoder_wrapper *d, int num);
 int mp_decoder_wrapper_get_frames_dropped(struct mp_decoder_wrapper *d);

player/command.c+4−6

     struct mp_codec_params p =
         track->stream ? *track->stream->codec : (struct mp_codec_params){0};
-    char decoder_desc[256] = {0};
-    if (track->dec)
-        mp_decoder_wrapper_get_desc(track->dec, decoder_desc, sizeof(decoder_desc));
     bool has_rg = track->stream && track->stream->codec->replaygain_data;
     struct replaygain_data rg = has_rg ? *track->stream->codec->replaygain_data
                                        : (struct replaygain_data){0};
                         .unavailable = !track->hls_bitrate},
         {"program-id",  SUB_PROP_INT(track->program_id),
                         .unavailable = track->program_id < 0},
-        {"decoder-desc", SUB_PROP_STR(decoder_desc),
+        {"decoder",     SUB_PROP_STR(p.decoder),
-                        .unavailable = !decoder_desc[0]},
+                        .unavailable = !p.decoder},
+        {"decoder-desc", SUB_PROP_STR(p.decoder_desc),
+                        .unavailable = !p.decoder_desc},
         {"codec",       SUB_PROP_STR(p.codec),
                         .unavailable = !p.codec},
         {"codec-desc",  SUB_PROP_STR(p.codec_desc),

player/command: add track-list/N/decoder

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code