RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/dashdec: add trace message for get the logic output message 

Signed-off-by: Steven Liu <lq@onvideo.cn>
This commit is contained in:
Steven Liu 2018-09-05 14:19:43 +08:00
parent a222798ef3
commit e35e915465
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/dashdec.c
View File

@ -919,18 +919,22 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url,
if (presentation_timeoffset_val) { if (presentation_timeoffset_val) {
rep->presentation_timeoffset = (int64_t) strtoll(presentation_timeoffset_val, NULL, 10); rep->presentation_timeoffset = (int64_t) strtoll(presentation_timeoffset_val, NULL, 10);
av_log(s, AV_LOG_TRACE, "rep->presentation_timeoffset = [%"PRId64"]\n", rep->presentation_timeoffset);
xmlFree(presentation_timeoffset_val); xmlFree(presentation_timeoffset_val);
} }
if (duration_val) { if (duration_val) {
rep->fragment_duration = (int64_t) strtoll(duration_val, NULL, 10); rep->fragment_duration = (int64_t) strtoll(duration_val, NULL, 10);
av_log(s, AV_LOG_TRACE, "rep->fragment_duration = [%"PRId64"]\n", rep->fragment_duration);
xmlFree(duration_val); xmlFree(duration_val);
} }
if (timescale_val) { if (timescale_val) {
rep->fragment_timescale = (int64_t) strtoll(timescale_val, NULL, 10); rep->fragment_timescale = (int64_t) strtoll(timescale_val, NULL, 10);
av_log(s, AV_LOG_TRACE, "rep->fragment_timescale = [%"PRId64"]\n", rep->fragment_timescale);
xmlFree(timescale_val); xmlFree(timescale_val);
} }
if (startnumber_val) { if (startnumber_val) {
rep->first_seq_no = (int64_t) strtoll(startnumber_val, NULL, 10); rep->first_seq_no = (int64_t) strtoll(startnumber_val, NULL, 10);
av_log(s, AV_LOG_TRACE, "rep->first_seq_no = [%"PRId64"]\n", rep->first_seq_no);
xmlFree(startnumber_val); xmlFree(startnumber_val);
} }
if (adaptionset_supplementalproperty_node) { if (adaptionset_supplementalproperty_node) {
@ -988,10 +992,12 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url,
timescale_val = get_val_from_nodes_tab(segmentlists_tab, 2, "timescale"); timescale_val = get_val_from_nodes_tab(segmentlists_tab, 2, "timescale");
if (duration_val) { if (duration_val) {
rep->fragment_duration = (int64_t) strtoll(duration_val, NULL, 10); rep->fragment_duration = (int64_t) strtoll(duration_val, NULL, 10);
av_log(s, AV_LOG_TRACE, "rep->fragment_duration = [%"PRId64"]\n", rep->fragment_duration);
xmlFree(duration_val); xmlFree(duration_val);
} }
if (timescale_val) { if (timescale_val) {
rep->fragment_timescale = (int64_t) strtoll(timescale_val, NULL, 10); rep->fragment_timescale = (int64_t) strtoll(timescale_val, NULL, 10);
av_log(s, AV_LOG_TRACE, "rep->fragment_timescale = [%"PRId64"]\n", rep->fragment_timescale);
xmlFree(timescale_val); xmlFree(timescale_val);
} }
fragmenturl_node = xmlFirstElementChild(representation_segmentlist_node); fragmenturl_node = xmlFirstElementChild(representation_segmentlist_node);
@ -1219,20 +1225,28 @@ static int parse_manifest(AVFormatContext *s, const char *url, AVIOContext *in)
if (!av_strcasecmp(attr->name, (const char *)"availabilityStartTime")) { if (!av_strcasecmp(attr->name, (const char *)"availabilityStartTime")) {
c->availability_start_time = get_utc_date_time_insec(s, (const char *)val); c->availability_start_time = get_utc_date_time_insec(s, (const char *)val);
av_log(s, AV_LOG_TRACE, "c->availability_start_time = [%"PRId64"]\n", c->availability_start_time);
} else if (!av_strcasecmp(attr->name, (const char *)"availabilityEndTime")) { } else if (!av_strcasecmp(attr->name, (const char *)"availabilityEndTime")) {
c->availability_end_time = get_utc_date_time_insec(s, (const char *)val); c->availability_end_time = get_utc_date_time_insec(s, (const char *)val);
av_log(s, AV_LOG_TRACE, "c->availability_end_time = [%"PRId64"]\n", c->availability_end_time);
} else if (!av_strcasecmp(attr->name, (const char *)"publishTime")) { } else if (!av_strcasecmp(attr->name, (const char *)"publishTime")) {
c->publish_time = get_utc_date_time_insec(s, (const char *)val); c->publish_time = get_utc_date_time_insec(s, (const char *)val);
av_log(s, AV_LOG_TRACE, "c->publish_time = [%"PRId64"]\n", c->publish_time);
} else if (!av_strcasecmp(attr->name, (const char *)"minimumUpdatePeriod")) { } else if (!av_strcasecmp(attr->name, (const char *)"minimumUpdatePeriod")) {
c->minimum_update_period = get_duration_insec(s, (const char *)val); c->minimum_update_period = get_duration_insec(s, (const char *)val);
av_log(s, AV_LOG_TRACE, "c->minimum_update_period = [%"PRId64"]\n", c->minimum_update_period);
} else if (!av_strcasecmp(attr->name, (const char *)"timeShiftBufferDepth")) { } else if (!av_strcasecmp(attr->name, (const char *)"timeShiftBufferDepth")) {
c->time_shift_buffer_depth = get_duration_insec(s, (const char *)val); c->time_shift_buffer_depth = get_duration_insec(s, (const char *)val);
av_log(s, AV_LOG_TRACE, "c->time_shift_buffer_depth = [%"PRId64"]\n", c->time_shift_buffer_depth);
} else if (!av_strcasecmp(attr->name, (const char *)"minBufferTime")) { } else if (!av_strcasecmp(attr->name, (const char *)"minBufferTime")) {
c->min_buffer_time = get_duration_insec(s, (const char *)val); c->min_buffer_time = get_duration_insec(s, (const char *)val);
av_log(s, AV_LOG_TRACE, "c->min_buffer_time = [%"PRId64"]\n", c->min_buffer_time);
} else if (!av_strcasecmp(attr->name, (const char *)"suggestedPresentationDelay")) { } else if (!av_strcasecmp(attr->name, (const char *)"suggestedPresentationDelay")) {
c->suggested_presentation_delay = get_duration_insec(s, (const char *)val); c->suggested_presentation_delay = get_duration_insec(s, (const char *)val);
av_log(s, AV_LOG_TRACE, "c->suggested_presentation_delay = [%"PRId64"]\n", c->suggested_presentation_delay);
} else if (!av_strcasecmp(attr->name, (const char *)"mediaPresentationDuration")) { } else if (!av_strcasecmp(attr->name, (const char *)"mediaPresentationDuration")) {
c->media_presentation_duration = get_duration_insec(s, (const char *)val); c->media_presentation_duration = get_duration_insec(s, (const char *)val);
av_log(s, AV_LOG_TRACE, "c->media_presentation_duration = [%"PRId64"]\n", c->media_presentation_duration);
} }
attr = attr->next; attr = attr->next;
xmlFree(val); xmlFree(val);
@ -1314,8 +1328,10 @@ static int64_t calc_cur_seg_no(AVFormatContext *s, struct representation *pls)
if (c->is_live) { if (c->is_live) {
if (pls->n_fragments) { if (pls->n_fragments) {
av_log(s, AV_LOG_TRACE, "in n_fragments mode\n");
num = pls->first_seq_no; num = pls->first_seq_no;
} else if (pls->n_timelines) { } else if (pls->n_timelines) {
av_log(s, AV_LOG_TRACE, "in n_timelines mode\n");
start_time_offset = get_segment_start_time_based_on_timeline(pls, 0xFFFFFFFF) - 60 * pls->fragment_timescale; // 60 seconds before end start_time_offset = get_segment_start_time_based_on_timeline(pls, 0xFFFFFFFF) - 60 * pls->fragment_timescale; // 60 seconds before end
num = calc_next_seg_no_from_timelines(pls, start_time_offset); num = calc_next_seg_no_from_timelines(pls, start_time_offset);
if (num == -1) if (num == -1)
@ -1323,6 +1339,7 @@ static int64_t calc_cur_seg_no(AVFormatContext *s, struct representation *pls)
else else
num += pls->first_seq_no; num += pls->first_seq_no;
} else if (pls->fragment_duration){ } else if (pls->fragment_duration){
av_log(s, AV_LOG_TRACE, "in fragment_duration mode fragment_timescale = %"PRId64", presentation_timeoffset = %"PRId64"\n", pls->fragment_timescale, pls->presentation_timeoffset);
if (pls->presentation_timeoffset) { if (pls->presentation_timeoffset) {
num = pls->presentation_timeoffset * pls->fragment_timescale / pls->fragment_duration; num = pls->presentation_timeoffset * pls->fragment_timescale / pls->fragment_duration;
} else if (c->publish_time > 0 && !c->availability_start_time) { } else if (c->publish_time > 0 && !c->availability_start_time) {
@ -1343,6 +1360,7 @@ static int64_t calc_min_seg_no(AVFormatContext *s, struct representation *pls)
int64_t num = 0; int64_t num = 0;
if (c->is_live && pls->fragment_duration) { if (c->is_live && pls->fragment_duration) {
av_log(s, AV_LOG_TRACE, "in live mode\n");
num = pls->first_seq_no + (((get_current_time_in_sec() - c->availability_start_time) - c->time_shift_buffer_depth) * pls->fragment_timescale) / pls->fragment_duration; num = pls->first_seq_no + (((get_current_time_in_sec() - c->availability_start_time) - c->time_shift_buffer_depth) * pls->fragment_timescale) / pls->fragment_duration;
} else { } else {
num = pls->first_seq_no; num = pls->first_seq_no;