GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-29 15:11:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

f_decoder_wrapper: add support for N -> 1 stream merging

Browse Source 
This allows to spin N decoder of dependent streams, and merge them in
single output using a filter. Currently only lavfi is supported, and
should be set as a string in the stream group definition.

In the future more advance merging can be implemented in place of lavfi,
but the grouping of the streams should be similar.

This will be useful for tile merging or LCEVC style enchantment support.
May even be useful for DV EL, but this is often not a separate track.
This commit is contained in:
Kacper Michajłow
2026-05-13 14:02:10 +02:00
parent 8c76342a52
commit c3f8acc10f
1 changed files with 118 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filters/f_decoder_wrapper.c
+118
View File
@@ -50,6 +50,7 @@
#include "f_async_queue.h"
#include "f_decoder_wrapper.h"
#include "f_demux_in.h"
#include "f_lavfi.h"
#include "filter_internal.h"
struct dec_queue_opts {
@@ -232,6 +233,16 @@ struct priv {
bool pts_reset;
int attempt_framedrops; // try dropping this many frames
int dropped_frames; // total frames _probably_ dropped
// --- Decoder group.
// The group of decoders this wrapper manages. Decodes dependent streams
// which then can be passed further for processing. Currently, the
// supported configuration is multiple video decoders into single output
// pin that which has output merged by specified mp_lavfi graph.
// When is_group is true, the wrapper acts as a manager of the group.
bool is_group;
struct mp_decoder_wrapper **children;
int num_children;
};
static int decoder_list_help(struct mp_log *log, const m_option_t *opt,
@@ -349,6 +360,18 @@ int mp_decoder_wrapper_control(struct mp_decoder_wrapper *d,
{
struct priv *p = d->f->priv;
int res = CONTROL_UNKNOWN;
if (p->is_group) {
mp_assert(p->num_children);
for (int i = 0; i < p->num_children; i++) {
// Forward control to all children, but get the result from the last
// one. Currently it is used only for same decoders, so we care only
// about the control, and the result for GET can be whatever.
res = mp_decoder_wrapper_control(p->children[i], cmd, arg);
if (i == p->num_children - 1)
return res;
}
return res;
}
thread_lock(p);
if (cmd == VDCTRL_GET_HWDEC) {
res = update_cached_values(p);
@@ -487,6 +510,13 @@ static bool decoder_wrapper_reinit(struct mp_decoder_wrapper *d)
bool mp_decoder_wrapper_reinit(struct mp_decoder_wrapper *d)
{
struct priv *p = d->f->priv;
if (p->is_group) {
for (int i = 0; i < p->num_children; i++) {
if (!mp_decoder_wrapper_reinit(p->children[i]))
return false;
}
return true;
}
thread_lock(p);
bool res = reinit_decoder(p);
thread_unlock(p);
@@ -547,6 +577,12 @@ bool mp_decoder_wrapper_get_pts_reset(struct mp_decoder_wrapper *d)
void mp_decoder_wrapper_set_play_dir(struct mp_decoder_wrapper *d, int dir)
{
struct priv *p = d->f->priv;
if (p->is_group) {
for (int i = 0; i < p->num_children; i++)
mp_decoder_wrapper_set_play_dir(p->children[i], dir);
p->play_dir = dir;
return;
}
thread_lock(p);
p->play_dir = dir;
thread_unlock(p);
@@ -865,6 +901,11 @@ static void process_output_frame(struct priv *p, struct mp_frame frame)
void mp_decoder_wrapper_set_start_pts(struct mp_decoder_wrapper *d, double pts)
{
struct priv *p = d->f->priv;
if (p->is_group) {
for (int i = 0; i < p->num_children; i++)
mp_decoder_wrapper_set_start_pts(p->children[i], pts);
return;
}
p->start_pts = pts;
}
@@ -1207,6 +1248,73 @@ static void onlock_dec_thread(void *ptr)
mp_filter_graph_interrupt(p->dec_root_filter);
}
// Build the multi-decoder + libavfilter merge subgraph for a stream group
// track.
static bool init_group_decoder(struct priv *p, struct mp_filter *public_f)
{
struct sh_stream_group *g = p->header->group;
p->is_group = true;
p->fps = p->header->codec->fps;
// Currently only lavfi merge is supported, this can be extended if needed.
if (g->num_members < 1 || !g->lavfi_graph) {
MP_ERR(p, "Stream group is missing members or filter graph.\n");
return false;
}
enum mp_frame_type ftype;
switch (p->header->type) {
case STREAM_VIDEO: ftype = MP_FRAME_VIDEO; break;
case STREAM_AUDIO: ftype = MP_FRAME_AUDIO; break;
default:
MP_ERR(p, "Stream group has unsupported media type.\n");
return false;
}
struct mp_lavfi *lavfi = mp_lavfi_create_graph(public_f, ftype, false,
NULL, NULL, g->lavfi_graph);
if (!lavfi) {
MP_ERR(p, "Failed to create stream group filter graph: %s\n",
g->lavfi_graph);
return false;
}
for (int i = 0; i < g->num_members; i++) {
struct sh_stream *m = g->members[i];
if (!m) {
MP_ERR(p, "Stream group member %d is NULL\n", i);
return false;
}
if (m->type != p->header->type) {
MP_ERR(p, "Stream group member %d has mismatching media type.\n", i);
return false;
}
struct mp_decoder_wrapper *child = mp_decoder_wrapper_create(public_f, m);
if (!child)
return false;
MP_TARRAY_APPEND(p, p->children, p->num_children, child);
char *pad = mp_tprintf(16, "%d", i);
struct mp_pin *in_pin = mp_filter_get_named_pin(lavfi->f, pad);
if (!in_pin) {
MP_ERR(p, "Stream group filter graph is missing input '%s'\n", pad);
return false;
}
mp_pin_connect(in_pin, child->f->pins[0]);
}
struct mp_pin *out_pin = mp_filter_get_named_pin(lavfi->f, "out");
if (!out_pin) {
MP_ERR(p, "Stream group filter graph is missing output 'out'\n");
return false;
}
mp_pin_connect(public_f->ppins[0], out_pin);
return true;
}
struct mp_decoder_wrapper *mp_decoder_wrapper_create(struct mp_filter *parent,
struct sh_stream *src)
{
@@ -1225,6 +1333,16 @@ struct mp_decoder_wrapper *mp_decoder_wrapper_create(struct mp_filter *parent,
p->play_dir = 1;
mp_filter_add_pin(public_f, MP_PIN_OUT, "out");
if (src->group && src->group->lavfi_graph) {
const char *tag = src->type == STREAM_AUDIO ? "!ad" : "!vd";
p->log = mp_log_new(p, parent->global->log, tag);
public_f->log = p->log;
if (!init_group_decoder(p, public_f))
goto error;
public_f_reset(public_f);
return &p->public;
}
if (p->header->type == STREAM_VIDEO) {
p->log = mp_log_new(p, parent->global->log, "!vd");