From patchwork Thu Aug 31 14:56:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 4921 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp1678901jao; Thu, 31 Aug 2017 07:57:21 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5N89C3OtNFxfPrLAzkgofvMM5RyqG3fREvOgI4L6sM74/WDiC4on1UJOCrzTzSBZsGMwJj X-Received: by 10.28.155.140 with SMTP id d134mr699394wme.144.1504191441840; Thu, 31 Aug 2017 07:57:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504191441; cv=none; d=google.com; s=arc-20160816; b=cCLKSkAI+3iUfNhVYmwiVWuqOPkNBuDM4G/e82519UvNtaGO8XTHx4IIRrjJWlFlSR 0p35ge1SVkkzWWahasjr6kjpqbdHp+bC6GW5+5cXFSVqs8HTFC1Fn8xpWJV+KhB7GZfo YqYI6qQ7/vCfR1JMmeGSGNyHGL1J9cXn95IiJag+J7XAKCSKJXeTtegQMTbD/bE/V4q7 0XXbqF9w299C960NJBl4EQgu82SPOSsMS3DKpQXoo7oadAEeQINzrKLxJucV/Uas9r8z x6Aajzz9WNu8KOGKhFOgS1ki3Q8/CQSTR6foHAbTtE4CX53TKUfX9wYvb/1DevW91t5p kNfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=K4rALZLbWg8g1iny8GWgFWAQ/fUBtQgrjPS+6hUaWVk=; b=kSdXx220+ppb4FhC4k+4N8DoRyRgCI3LRoOPEEzzu2Y0vUP0nVcps26CbWtVPzzKNj G7XmT3NzgMg3q1s4JbdAgrI0Hm+81hPQXjqyQwdZZyPyrxpL5sTEtXBmPb5XUvMaZyfl wCKFutqfMWTDYbYezVOsrMCNBWBcNl8d1o+q1Ys3LOR9mmSihygTt5JA9ogYusmuXWNx Q0liQDydEn2pOhZ5iJKtM9y7wwejgxTrETAn0WuOADLRbWlB/9BRlM2b4Hif/dZm7yoR 9eQYhrXEUakgdT/Bku9i4TgMbT75ns6fyliDpY9DhNrmHYLlFibpl7sU37YMW7laMo0B jsVA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d78si205643wme.147.2017.08.31.07.57.20; Thu, 31 Aug 2017 07:57:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D765B68A0F8; Thu, 31 Aug 2017 17:57:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4BB268A069 for ; Thu, 31 Aug 2017 17:57:07 +0300 (EEST) X-QQ-mid: bizesmtp1t1504191420t09gjkn9b Received: from localhost (unknown [221.216.215.129]) by esmtp4.qq.com (ESMTP) with id ; Thu, 31 Aug 2017 22:56:58 +0800 (CST) X-QQ-SSF: 01100000004000F0FH60000A0000000 X-QQ-FEAT: fMq1A4nS/MYBzhpl6zUxBmFXGt2M0w8iGWpZzoZ/ko//1r9Jtxt4bKjuTatL8 w940FX2vOKFYp+MViGm45FjExLz2W+6urw2kYmW4EcdMmAcND0zQr85dXKasKDQNQxcP+p1 J4yZ+wLgn5JcSU8LunKGbDSNf8hryi1rftE3kmgO/OxEmG1n267Y1TgrXfg5Y0dW83RJba9 xZZg/CCtn4YUMWfqR/ujIQXWOFnoMSdQYTDbYyKhR1a2IUqjSygUeo4cwILXjwJOE567F5K r24prSSyJoqx9LCXnaoEAbXFM= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Aug 2017 22:56:53 +0800 Message-Id: <20170831145653.27598-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: References: X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign1 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v3] avformat/dash: move reused API to common file and header file X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu , Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" move from dashenc, move DASHTmplId and dash_fill_tmpl_params to dash.c, they will be used by dash demuxer and dash muxer. v2 fixed: 1. rename common file from dashcomm.* to dash.* Suggested-by: Hendrik Leppkes v3 fixed: 1. rename header file pre defined 2. add ff_ prefix for the internal API Suggested-by: James Almer Suggested-by: Timo Rothenpieler Signed-off-by: Steven Liu --- libavformat/Makefile | 2 +- libavformat/dash.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++ libavformat/dash.h | 39 +++++++++++++++ libavformat/dashenc.c | 130 ++--------------------------------------------- 4 files changed, 180 insertions(+), 127 deletions(-) create mode 100644 libavformat/dash.c create mode 100644 libavformat/dash.h diff --git a/libavformat/Makefile b/libavformat/Makefile index 36f5839aa8..de954af130 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -132,7 +132,7 @@ OBJS-$(CONFIG_CONCAT_DEMUXER) += concatdec.o OBJS-$(CONFIG_CRC_MUXER) += crcenc.o OBJS-$(CONFIG_DATA_DEMUXER) += rawdec.o OBJS-$(CONFIG_DATA_MUXER) += rawenc.o -OBJS-$(CONFIG_DASH_MUXER) += dashenc.o +OBJS-$(CONFIG_DASH_MUXER) += dash.o dashenc.o OBJS-$(CONFIG_DAUD_DEMUXER) += dauddec.o OBJS-$(CONFIG_DAUD_MUXER) += daudenc.o OBJS-$(CONFIG_DCSTR_DEMUXER) += dcstr.o diff --git a/libavformat/dash.c b/libavformat/dash.c new file mode 100644 index 0000000000..b0b1ed4f43 --- /dev/null +++ b/libavformat/dash.c @@ -0,0 +1,136 @@ +#include "config.h" +#if HAVE_UNISTD_H +#include +#endif + +#include "libavutil/avassert.h" +#include "libavutil/avstring.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/mathematics.h" +#include "libavutil/opt.h" +#include "libavutil/rational.h" +#include "libavutil/time_internal.h" + +#include "avc.h" +#include "avformat.h" +#include "avio_internal.h" +#include "internal.h" +#include "isom.h" +#include "os_support.h" +#include "url.h" +#include "dash.h" + +static DASHTmplId dash_read_tmpl_id(const char *identifier, char *format_tag, + size_t format_tag_size, const char **ptr) { + const char *next_ptr; + DASHTmplId id_type = DASH_TMPL_ID_UNDEFINED; + + if (av_strstart(identifier, "$$", &next_ptr)) { + id_type = DASH_TMPL_ID_ESCAPE; + *ptr = next_ptr; + } else if (av_strstart(identifier, "$RepresentationID$", &next_ptr)) { + id_type = DASH_TMPL_ID_REP_ID; + // default to basic format, as $RepresentationID$ identifiers + // are not allowed to have custom format-tags. + av_strlcpy(format_tag, "%d", format_tag_size); + *ptr = next_ptr; + } else { // the following identifiers may have an explicit format_tag + if (av_strstart(identifier, "$Number", &next_ptr)) + id_type = DASH_TMPL_ID_NUMBER; + else if (av_strstart(identifier, "$Bandwidth", &next_ptr)) + id_type = DASH_TMPL_ID_BANDWIDTH; + else if (av_strstart(identifier, "$Time", &next_ptr)) + id_type = DASH_TMPL_ID_TIME; + else + id_type = DASH_TMPL_ID_UNDEFINED; + + // next parse the dash format-tag and generate a c-string format tag + // (next_ptr now points at the first '%' at the beginning of the format-tag) + if (id_type != DASH_TMPL_ID_UNDEFINED) { + const char *number_format = (id_type == DASH_TMPL_ID_TIME) ? PRId64 : "d"; + if (next_ptr[0] == '$') { // no dash format-tag + snprintf(format_tag, format_tag_size, "%%%s", number_format); + *ptr = &next_ptr[1]; + } else { + const char *width_ptr; + // only tolerate single-digit width-field (i.e. up to 9-digit width) + if (av_strstart(next_ptr, "%0", &width_ptr) && + av_isdigit(width_ptr[0]) && + av_strstart(&width_ptr[1], "d$", &next_ptr)) { + // yes, we're using a format tag to build format_tag. + snprintf(format_tag, format_tag_size, "%s%c%s", "%0", width_ptr[0], number_format); + *ptr = next_ptr; + } else { + av_log(NULL, AV_LOG_WARNING, "Failed to parse format-tag beginning with %s. Expected either a " + "closing '$' character or a format-string like '%%0[width]d', " + "where width must be a single digit\n", next_ptr); + id_type = DASH_TMPL_ID_UNDEFINED; + } + } + } + } + return id_type; +} + +void ff_dash_fill_tmpl_params(char *dst, size_t buffer_size, + const char *template, int rep_id, + int number, int bit_rate, + int64_t time) { + int dst_pos = 0; + const char *t_cur = template; + while (dst_pos < buffer_size - 1 && *t_cur) { + char format_tag[7]; // May be "%d", "%0Xd", or "%0Xlld" (for $Time$), where X is in [0-9] + int n = 0; + DASHTmplId id_type; + const char *t_next = strchr(t_cur, '$'); // copy over everything up to the first '$' character + if (t_next) { + int num_copy_bytes = FFMIN(t_next - t_cur, buffer_size - dst_pos - 1); + av_strlcpy(&dst[dst_pos], t_cur, num_copy_bytes + 1); + // advance + dst_pos += num_copy_bytes; + t_cur = t_next; + } else { // no more DASH identifiers to substitute - just copy the rest over and break + av_strlcpy(&dst[dst_pos], t_cur, buffer_size - dst_pos); + break; + } + + if (dst_pos >= buffer_size - 1 || !*t_cur) + break; + + // t_cur is now pointing to a '$' character + id_type = dash_read_tmpl_id(t_cur, format_tag, sizeof(format_tag), &t_next); + switch (id_type) { + case DASH_TMPL_ID_ESCAPE: + av_strlcpy(&dst[dst_pos], "$", 2); + n = 1; + break; + case DASH_TMPL_ID_REP_ID: + n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, rep_id); + break; + case DASH_TMPL_ID_NUMBER: + n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, number); + break; + case DASH_TMPL_ID_BANDWIDTH: + n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, bit_rate); + break; + case DASH_TMPL_ID_TIME: + n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, time); + break; + case DASH_TMPL_ID_UNDEFINED: + // copy over one byte and advance + av_strlcpy(&dst[dst_pos], t_cur, 2); + n = 1; + t_next = &t_cur[1]; + break; + } + // t_next points just past the processed identifier + // n is the number of bytes that were attempted to be written to dst + // (may have failed to write all because buffer_size). + + // advance + dst_pos += FFMIN(n, buffer_size - dst_pos - 1); + t_cur = t_next; + } +} + + diff --git a/libavformat/dash.h b/libavformat/dash.h new file mode 100644 index 0000000000..c6d9d2c331 --- /dev/null +++ b/libavformat/dash.h @@ -0,0 +1,39 @@ +/* + * MPEG-DASH ISO BMFF segmenter + * Copyright (c) 2014 Martin Storsjo + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFORMAT_DASH_H +#define AVFORMAT_DASH_H +#include "avformat.h" + +// See ISO/IEC 23009-1:2014 5.3.9.4.4 +typedef enum { + DASH_TMPL_ID_UNDEFINED = -1, + DASH_TMPL_ID_ESCAPE, + DASH_TMPL_ID_REP_ID, + DASH_TMPL_ID_NUMBER, + DASH_TMPL_ID_BANDWIDTH, + DASH_TMPL_ID_TIME, +} DASHTmplId; + + +void ff_dash_fill_tmpl_params(char *dst, size_t buffer_size, const char *template, int rep_id, int number, int bit_rate, int64_t time); + +#endif /* AVFORMAT_DASH_H */ diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index bdb332c71a..6471649eb7 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -39,16 +39,7 @@ #include "isom.h" #include "os_support.h" #include "url.h" - -// See ISO/IEC 23009-1:2014 5.3.9.4.4 -typedef enum { - DASH_TMPL_ID_UNDEFINED = -1, - DASH_TMPL_ID_ESCAPE, - DASH_TMPL_ID_REP_ID, - DASH_TMPL_ID_NUMBER, - DASH_TMPL_ID_BANDWIDTH, - DASH_TMPL_ID_TIME, -} DASHTmplId; +#include "dash.h" typedef struct Segment { char file[1024]; @@ -259,119 +250,6 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, DASHContext } } -static DASHTmplId dash_read_tmpl_id(const char *identifier, char *format_tag, - size_t format_tag_size, const char **ptr) { - const char *next_ptr; - DASHTmplId id_type = DASH_TMPL_ID_UNDEFINED; - - if (av_strstart(identifier, "$$", &next_ptr)) { - id_type = DASH_TMPL_ID_ESCAPE; - *ptr = next_ptr; - } else if (av_strstart(identifier, "$RepresentationID$", &next_ptr)) { - id_type = DASH_TMPL_ID_REP_ID; - // default to basic format, as $RepresentationID$ identifiers - // are not allowed to have custom format-tags. - av_strlcpy(format_tag, "%d", format_tag_size); - *ptr = next_ptr; - } else { // the following identifiers may have an explicit format_tag - if (av_strstart(identifier, "$Number", &next_ptr)) - id_type = DASH_TMPL_ID_NUMBER; - else if (av_strstart(identifier, "$Bandwidth", &next_ptr)) - id_type = DASH_TMPL_ID_BANDWIDTH; - else if (av_strstart(identifier, "$Time", &next_ptr)) - id_type = DASH_TMPL_ID_TIME; - else - id_type = DASH_TMPL_ID_UNDEFINED; - - // next parse the dash format-tag and generate a c-string format tag - // (next_ptr now points at the first '%' at the beginning of the format-tag) - if (id_type != DASH_TMPL_ID_UNDEFINED) { - const char *number_format = (id_type == DASH_TMPL_ID_TIME) ? PRId64 : "d"; - if (next_ptr[0] == '$') { // no dash format-tag - snprintf(format_tag, format_tag_size, "%%%s", number_format); - *ptr = &next_ptr[1]; - } else { - const char *width_ptr; - // only tolerate single-digit width-field (i.e. up to 9-digit width) - if (av_strstart(next_ptr, "%0", &width_ptr) && - av_isdigit(width_ptr[0]) && - av_strstart(&width_ptr[1], "d$", &next_ptr)) { - // yes, we're using a format tag to build format_tag. - snprintf(format_tag, format_tag_size, "%s%c%s", "%0", width_ptr[0], number_format); - *ptr = next_ptr; - } else { - av_log(NULL, AV_LOG_WARNING, "Failed to parse format-tag beginning with %s. Expected either a " - "closing '$' character or a format-string like '%%0[width]d', " - "where width must be a single digit\n", next_ptr); - id_type = DASH_TMPL_ID_UNDEFINED; - } - } - } - } - return id_type; -} - -static void dash_fill_tmpl_params(char *dst, size_t buffer_size, - const char *template, int rep_id, - int number, int bit_rate, - int64_t time) { - int dst_pos = 0; - const char *t_cur = template; - while (dst_pos < buffer_size - 1 && *t_cur) { - char format_tag[7]; // May be "%d", "%0Xd", or "%0Xlld" (for $Time$), where X is in [0-9] - int n = 0; - DASHTmplId id_type; - const char *t_next = strchr(t_cur, '$'); // copy over everything up to the first '$' character - if (t_next) { - int num_copy_bytes = FFMIN(t_next - t_cur, buffer_size - dst_pos - 1); - av_strlcpy(&dst[dst_pos], t_cur, num_copy_bytes + 1); - // advance - dst_pos += num_copy_bytes; - t_cur = t_next; - } else { // no more DASH identifiers to substitute - just copy the rest over and break - av_strlcpy(&dst[dst_pos], t_cur, buffer_size - dst_pos); - break; - } - - if (dst_pos >= buffer_size - 1 || !*t_cur) - break; - - // t_cur is now pointing to a '$' character - id_type = dash_read_tmpl_id(t_cur, format_tag, sizeof(format_tag), &t_next); - switch (id_type) { - case DASH_TMPL_ID_ESCAPE: - av_strlcpy(&dst[dst_pos], "$", 2); - n = 1; - break; - case DASH_TMPL_ID_REP_ID: - n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, rep_id); - break; - case DASH_TMPL_ID_NUMBER: - n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, number); - break; - case DASH_TMPL_ID_BANDWIDTH: - n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, bit_rate); - break; - case DASH_TMPL_ID_TIME: - n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, time); - break; - case DASH_TMPL_ID_UNDEFINED: - // copy over one byte and advance - av_strlcpy(&dst[dst_pos], t_cur, 2); - n = 1; - t_next = &t_cur[1]; - break; - } - // t_next points just past the processed identifier - // n is the number of bytes that were attempted to be written to dst - // (may have failed to write all because buffer_size). - - // advance - dst_pos += FFMIN(n, buffer_size - dst_pos - 1); - t_cur = t_next; - } -} - static char *xmlescape(const char *str) { int outlen = strlen(str)*3/2 + 6; char *out = av_realloc(NULL, outlen + 1); @@ -660,11 +538,11 @@ static int dash_init(AVFormatContext *s) if (c->single_file) { if (c->single_file_name) - dash_fill_tmpl_params(os->initfile, sizeof(os->initfile), c->single_file_name, i, 0, os->bit_rate, 0); + ff_dash_fill_tmpl_params(os->initfile, sizeof(os->initfile), c->single_file_name, i, 0, os->bit_rate, 0); else snprintf(os->initfile, sizeof(os->initfile), "%s-stream%d.m4s", basename, i); } else { - dash_fill_tmpl_params(os->initfile, sizeof(os->initfile), c->init_seg_name, i, 0, os->bit_rate, 0); + ff_dash_fill_tmpl_params(os->initfile, sizeof(os->initfile), c->init_seg_name, i, 0, os->bit_rate, 0); } snprintf(filename, sizeof(filename), "%s%s", c->dirname, os->initfile); ret = s->io_open(s, &os->out, filename, AVIO_FLAG_WRITE, NULL); @@ -865,7 +743,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) start_pos = avio_tell(os->ctx->pb); if (!c->single_file) { - dash_fill_tmpl_params(filename, sizeof(filename), c->media_seg_name, i, os->segment_index, os->bit_rate, os->start_pts); + ff_dash_fill_tmpl_params(filename, sizeof(filename), c->media_seg_name, i, os->segment_index, os->bit_rate, os->start_pts); snprintf(full_path, sizeof(full_path), "%s%s", c->dirname, filename); snprintf(temp_path, sizeof(temp_path), use_rename ? "%s.tmp" : "%s", full_path); ret = s->io_open(s, &os->out, temp_path, AVIO_FLAG_WRITE, NULL);