From patchwork Thu May 31 04:41:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 9175 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp90006jad; Wed, 30 May 2018 21:41:38 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIfSh3cFIaIgWnav8N18Z2uOFQYMikhaF9aAxVd9d6TjHuojbNy/pYtyrykH+K7oGK8QhZ+ X-Received: by 2002:adf:88b2:: with SMTP id f47-v6mr3784626wrf.55.1527741698213; Wed, 30 May 2018 21:41:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527741698; cv=none; d=google.com; s=arc-20160816; b=vL/iXq13oG4W3qxNzLbOuW1gUqHSzVApHxaiDSS24qwlDK5fXaYoY53tjf5dUCcMMj me2J8mlUhZ4mFArAc3tvck/oa/pYXWvKbCKquNjgDZdK4udAoavX7mhZx4ul3jeJAgfE KLMdFxODfase0zluuBAtN+SlKpk98pmCtcvP1sMwLAS0oshhjlo/1rYrkYUfYmaHWtpZ ++SCmAQ1YFCncG5tLrI60kSxO7GTfIVevC3QSccEXTTn76T0B6xV4+hjgl6+nlogkZNE 7UsIPxyEZydTieu0wu8zIJaO0v+jGF3gox8wrTFX6cunx7vP2wT7PITfBES68mdctsmO pKcg== 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:message-id:date:to:from :delivered-to:arc-authentication-results; bh=dUWwlwQ064FRjPsH2qj2YxfL0tp4wiVNRRiLoO3ShFM=; b=irw0c8e4krI1UH0x7yzxRyjKsjwBpWIygpoLbr3zbpEj5zuvitn7KJSPlDWtY1/HTC AqUS523kxwCJ5zr7HDmZrdOre+CQQG/6GDYGD+4ElR4goeYezltO7PIvDjlnW4PBJFuT L1uFFNZ8xXbXBpzqw8OYbmOZQ1MvzDIi+dm7QUAvFPbioqjRK5yubffm82Ia1C4ERLZ5 XCZTgBB7AOWlAVyB0xi9YGzyK+T7y7qRI2TqbTX4QypkXjTZzhvOjB96zVGM9QYs8cEJ qQ3OjHdyuGptu2X62CnTp0Yz9wl941TRO8Qh95MRTHrYM3Wvd/Q8AJPaJMQKKAbybNiC 625w== 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 d3-v6si14418589wrd.24.2018.05.30.21.41.37; Wed, 30 May 2018 21:41:38 -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 EABE068A473; Thu, 31 May 2018 07:40:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbguseast2.qq.com (smtpbguseast2.qq.com [54.204.34.130]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E1BA68A458 for ; Thu, 31 May 2018 07:40:44 +0300 (EEST) X-QQ-mid: bizesmtp18t1527741672tzagvxj1 Received: from localhost (unknown [47.90.47.25]) by esmtp6.qq.com (ESMTP) with id ; Thu, 31 May 2018 12:41:12 +0800 (CST) X-QQ-SSF: 01100000002000F0FLF0B00A0000000 X-QQ-FEAT: R/yWRekfFcq0EDKkN/3KQxr0FJfNchrLuN2EgSbLJ3ucs6XJ912XaaE2jGypP 00vCtc0dS56rQzGe0OjrRHjvN5lf61DGGkI14zRaXSeF3vSyP+ttGFPiFz0WrKwgQ+N2GiG lx4tUsGtioFp39TI3yjX7Z6pkf8/EF/pQpmqwIwDkvatts1HAsrSqs867jgGS5zdZUR8ahJ VD5Ku9p0O9oSq2tGl+S43sibMqfDYwNFzoCKXAFDQsqcVywTbTtmN/jedyP9PfgH1ZE2z5d V5XASxE7S9YvTqUjZxcWfVfzqLC+dPflJqgTf3/sn8Jm17 X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 May 2018 12:41:10 +0800 Message-Id: <20180531044110.1243-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/flvdec: add flv_full_metadata option into flvdec 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" output all the metadata context when use this option. Signed-off-by: Steven Liu --- doc/demuxers.texi | 3 +++ libavformat/flvdec.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 5007e6339f..aad94eb50e 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -272,6 +272,9 @@ Allocate the streams according to the onMetaData array content. @item -flv_ignore_prevtag @var{bool} Ignore the size of previous tag value. + +@item -flv_full_metadata @var{bool} +Output all context of the onMetadata. @end table @section gif diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index f65542711e..52280c2e3d 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -45,6 +45,7 @@ typedef struct FLVContext { const AVClass *class; ///< Class for private options. int trust_metadata; ///< configure streams according onMetaData int trust_datasize; ///< trust data size of FLVTag + int dump_full_metadata; ///< Dump full metadata of the onMetadata int wrong_dts; ///< wrong dts due to negative cts uint8_t *new_extradata[FLV_STREAM_TYPE_NB]; int new_extradata_size[FLV_STREAM_TYPE_NB]; @@ -612,7 +613,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, (!vpar && !strcmp(key, "videocodecid")))) s->ctx_flags &= ~AVFMTCTX_NOHEADER; //If there is either audio/video missing, codecid will be an empty object - if (!strcmp(key, "duration") || + if ((!strcmp(key, "duration") || !strcmp(key, "filesize") || !strcmp(key, "width") || !strcmp(key, "height") || @@ -624,7 +625,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, !strcmp(key, "audiosamplesize") || !strcmp(key, "stereo") || !strcmp(key, "audiocodecid") || - !strcmp(key, "datastream")) + !strcmp(key, "datastream")) && !flv->dump_full_metadata) return 0; s->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED; @@ -1282,6 +1283,7 @@ static int flv_read_seek(AVFormatContext *s, int stream_index, #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { { "flv_metadata", "Allocate streams according to the onMetaData array", OFFSET(trust_metadata), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, + { "flv_full_metadata", "Dump full metadata of the onMetadata", OFFSET(dump_full_metadata), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, { "flv_ignore_prevtag", "Ignore the Size of previous tag", OFFSET(trust_datasize), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, { "missing_streams", "", OFFSET(missing_streams), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 0xFF, VD | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, { NULL }