RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux, player: mark dependent tracks 

ffmpeg marks audio tracks which are not meant to be played standalone
as DEPENDENT. these are typically used in DVB broadcasts for audio
descriptions, and are meant to be mixed into the main audio track during
playback.
This commit is contained in:
Aman Gupta 2018-04-15 18:39:45 -07:00 committed by Jan Ekström
parent c2a24323bc
commit b8de7d6ff3
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demux/demux_lavf.c
View File

@ -724,6 +724,8 @@ static void handle_new_stream(demuxer_t *demuxer, int i)
sh->title = talloc_asprintf(sh, "visual impaired"); sh->title = talloc_asprintf(sh, "visual impaired");
if (!sh->title && st->disposition & AV_DISPOSITION_HEARING_IMPAIRED) if (!sh->title && st->disposition & AV_DISPOSITION_HEARING_IMPAIRED)
sh->title = talloc_asprintf(sh, "hearing impaired"); sh->title = talloc_asprintf(sh, "hearing impaired");
if (st->disposition & AV_DISPOSITION_DEPENDENT)
sh->dependent_track = true;
AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0); AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0);
if (lang && lang->value) if (lang && lang->value)
sh->lang = talloc_strdup(sh, lang->value); sh->lang = talloc_strdup(sh, lang->value);

1
demux/stheader.h
View File

@ -45,6 +45,7 @@ struct sh_stream {
char *lang; // language code char *lang; // language code
bool default_track; // container default track flag bool default_track; // container default track flag
bool forced_track; // container forced track flag bool forced_track; // container forced track flag
bool dependent_track; // container dependent track flag
int hls_bitrate; int hls_bitrate;
struct mp_tags *tags; struct mp_tags *tags;

1
player/command.c
View File

@ -2242,6 +2242,7 @@ static int get_track_entry(int item, int action, void *arg, void *ctx)
{"albumart", SUB_PROP_FLAG(track->attached_picture)}, {"albumart", SUB_PROP_FLAG(track->attached_picture)},
{"default", SUB_PROP_FLAG(track->default_track)}, {"default", SUB_PROP_FLAG(track->default_track)},
{"forced", SUB_PROP_FLAG(track->forced_track)}, {"forced", SUB_PROP_FLAG(track->forced_track)},
{"dependent", SUB_PROP_FLAG(track->dependent_track)},
{"external", SUB_PROP_FLAG(track->is_external)}, {"external", SUB_PROP_FLAG(track->is_external)},
{"selected", SUB_PROP_FLAG(track->selected)}, {"selected", SUB_PROP_FLAG(track->selected)},
{"external-filename", SUB_PROP_STR(track->external_filename), {"external-filename", SUB_PROP_STR(track->external_filename),

2
player/core.h
View File

@ -134,7 +134,7 @@ struct track {
int ff_index; // same as stream->ff_index, or 0. int ff_index; // same as stream->ff_index, or 0.
char *title; char *title;
bool default_track, forced_track; bool default_track, forced_track, dependent_track;
bool attached_picture; bool attached_picture;
char *lang; char *lang;