virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-04 05:57:49 +02:00
Code Issues Releases Activity

avformat/dashdec: add attribute lang for audio and subtitle streams

Browse Source 
There should have language in the metadata of streams which show to user

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
Steven Liu 2020-03-31 20:16:14 +08:00
parent 152f61e29b
commit 51db0a472a
1 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libavformat/dashdec.c
View File

@ -85,6 +85,7 @@ struct representation {
enum AVMediaType type; enum AVMediaType type;
char id[20]; char id[20];
char *lang;
int bandwidth; int bandwidth;
AVRational framerate; AVRational framerate;
AVStream *assoc_stream; /* demuxer stream associated with this representation */ AVStream *assoc_stream; /* demuxer stream associated with this representation */
@ -144,6 +145,9 @@ typedef struct DASHContext {
uint64_t period_duration; uint64_t period_duration;
uint64_t period_start; uint64_t period_start;
/* AdaptationSet Attribute */
char *adaptionset_lang;
int is_live; int is_live;
AVIOInterruptCB *interrupt_callback; AVIOInterruptCB *interrupt_callback;
char *allowed_extensions; char *allowed_extensions;
@ -872,6 +876,15 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url,
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto end; goto end;
} }
if (c->adaptionset_lang) {
rep->lang = av_strdup(c->adaptionset_lang);
if (!rep->lang) {
av_log(s, AV_LOG_ERROR, "alloc language memory failure\n");
av_freep(&rep);
ret = AVERROR(ENOMEM);
goto end;
}
}
rep->parent = s; rep->parent = s;
representation_segmenttemplate_node = find_child_node_by_name(representation_node, "SegmentTemplate"); representation_segmenttemplate_node = find_child_node_by_name(representation_node, "SegmentTemplate");
representation_baseurl_node = find_child_node_by_name(representation_node, "BaseURL"); representation_baseurl_node = find_child_node_by_name(representation_node, "BaseURL");
@ -1103,6 +1116,19 @@ end:
return ret; return ret;
} }
static int parse_manifest_adaptationset_attr(AVFormatContext *s, xmlNodePtr adaptionset_node)
{
DASHContext *c = s->priv_data;
if (!adaptionset_node) {
av_log(s, AV_LOG_WARNING, "Cannot get AdaptionSet\n");
return AVERROR(EINVAL);
}
c->adaptionset_lang = xmlGetProp(adaptionset_node, "lang");
return 0;
}
static int parse_manifest_adaptationset(AVFormatContext *s, const char *url, static int parse_manifest_adaptationset(AVFormatContext *s, const char *url,
xmlNodePtr adaptionset_node, xmlNodePtr adaptionset_node,
xmlNodePtr mpd_baseurl_node, xmlNodePtr mpd_baseurl_node,
@ -1111,6 +1137,7 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url,
xmlNodePtr period_segmentlist_node) xmlNodePtr period_segmentlist_node)
{ {
int ret = 0; int ret = 0;
DASHContext *c = s->priv_data;
xmlNodePtr fragment_template_node = NULL; xmlNodePtr fragment_template_node = NULL;
xmlNodePtr content_component_node = NULL; xmlNodePtr content_component_node = NULL;
xmlNodePtr adaptionset_baseurl_node = NULL; xmlNodePtr adaptionset_baseurl_node = NULL;
@ -1118,6 +1145,10 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url,
xmlNodePtr adaptionset_supplementalproperty_node = NULL; xmlNodePtr adaptionset_supplementalproperty_node = NULL;
xmlNodePtr node = NULL; xmlNodePtr node = NULL;
ret = parse_manifest_adaptationset_attr(s, adaptionset_node);
if (ret < 0)
return ret;
node = xmlFirstElementChild(adaptionset_node); node = xmlFirstElementChild(adaptionset_node);
while (node) { while (node) {
if (!av_strcasecmp(node->name, (const char *)"SegmentTemplate")) { if (!av_strcasecmp(node->name, (const char *)"SegmentTemplate")) {
@ -1142,13 +1173,15 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url,
adaptionset_baseurl_node, adaptionset_baseurl_node,
adaptionset_segmentlist_node, adaptionset_segmentlist_node,
adaptionset_supplementalproperty_node); adaptionset_supplementalproperty_node);
if (ret < 0) { if (ret < 0)
return ret; goto err;
}
} }
node = xmlNextElementSibling(node); node = xmlNextElementSibling(node);
} }
return 0;
err:
av_freep(&c->adaptionset_lang);
return ret;
} }
static int parse_programinformation(AVFormatContext *s, xmlNodePtr node) static int parse_programinformation(AVFormatContext *s, xmlNodePtr node)
@ -2121,6 +2154,10 @@ static int dash_read_header(AVFormatContext *s)
av_dict_set_int(&rep->assoc_stream->metadata, "variant_bitrate", rep->bandwidth, 0); av_dict_set_int(&rep->assoc_stream->metadata, "variant_bitrate", rep->bandwidth, 0);
if (rep->id[0]) if (rep->id[0])
av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0); av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0);
if (rep->lang) {
av_dict_set(&rep->assoc_stream->metadata, "language", rep->lang, 0);
av_freep(&rep->lang);
}
} }
for (i = 0; i < c->n_subtitles; i++) { for (i = 0; i < c->n_subtitles; i++) {
rep = c->subtitles[i]; rep = c->subtitles[i];
@ -2128,6 +2165,10 @@ static int dash_read_header(AVFormatContext *s)
rep->assoc_stream = s->streams[rep->stream_index]; rep->assoc_stream = s->streams[rep->stream_index];
if (rep->id[0]) if (rep->id[0])
av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0); av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0);
if (rep->lang) {
av_dict_set(&rep->assoc_stream->metadata, "language", rep->lang, 0);
av_freep(&rep->lang);
}
} }
} }