From patchwork Mon Nov 21 12:29:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 1508 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1563077vsb; Mon, 21 Nov 2016 04:30:20 -0800 (PST) X-Received: by 10.28.215.6 with SMTP id o6mr13462200wmg.5.1479731419927; Mon, 21 Nov 2016 04:30:19 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h84si13315427wmf.90.2016.11.21.04.30.19; Mon, 21 Nov 2016 04:30:19 -0800 (PST) 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 05119689BE6; Mon, 21 Nov 2016 14:30:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpproxy19.qq.com (smtpproxy19.qq.com [184.105.206.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BC32689220 for ; Mon, 21 Nov 2016 14:30:07 +0200 (EET) X-QQ-mid: bizesmtp16t1479731381triofgqc Received: from localhost (unknown [58.96.181.81]) by esmtp4.qq.com (ESMTP) with id ; Mon, 21 Nov 2016 20:29:40 +0800 (CST) X-QQ-SSF: 01100000002000F0F610B00A0000000 X-QQ-FEAT: FSvLhna2MysVpznZB7hp/TVe455KbRIFyJvHBSDp/SXeBAJA6FMvvRB3knYj/ tB2ji9J+XyTTKNxbF3Lfqhm4UJzw0O0Bt8s+7w8lt15+Ruj2WVKL4C2ipgnqLfhin+zoEOq 78aJ/dIKBmvZAgY43OTXqHK3dl4sSyTT/rvvMm+SqJ+9JEfaSChOyX4M9+ZxaQKg8pStVvl zBu7fCvRJ80RZHtlqopTh3Vm3Rig1x28g1P2erghN7Mu/UCRz2OWBjG+fijm3hjRYSOvGLY o47g== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Nov 2016 20:29:36 +0800 Message-Id: <20161121122936.10493-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/flvenc: add no_metadata to flvflags 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" some flv have no metadata, ffmpeg will same with the source flv stream. Signed-off-by: Steven Liu --- doc/muxers.texi | 3 +++ libavformat/flvenc.c | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 806182a..8689341 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -148,6 +148,9 @@ Place AAC sequence header based on audio stream data. @item no_sequence_end Disable sequence end tag. +@item no_metadata +Disable metadata tag. + @item add_keyframe_index Used to facilitate seeking; particularly for HTTP pseudo streaming. @end table diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 4ca6aea..177052a 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -67,6 +67,7 @@ typedef enum { FLV_AAC_SEQ_HEADER_DETECT = (1 << 0), FLV_NO_SEQUENCE_END = (1 << 1), FLV_ADD_KEYFRAME_INDEX = (1 << 2), + FLV_NO_METADATA = (1 << 3), } FLVFlags; typedef struct FLVFileposition { @@ -744,7 +745,11 @@ static int flv_write_header(AVFormatContext *s) flv->reserved = 5; } - write_metadata(s, 0); + if (flv->flags & FLV_NO_METADATA) { + pb->seekable = 0; + } else { + write_metadata(s, 0); + } for (i = 0; i < s->nb_streams; i++) { flv_write_codec_header(s, s->streams[i]->codecpar); @@ -1055,6 +1060,7 @@ static const AVOption options[] = { { "flvflags", "FLV muxer flags", offsetof(FLVContext, flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" }, { "aac_seq_header_detect", "Put AAC sequence header based on stream data", 0, AV_OPT_TYPE_CONST, {.i64 = FLV_AAC_SEQ_HEADER_DETECT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" }, { "no_sequence_end", "disable sequence end for FLV", 0, AV_OPT_TYPE_CONST, {.i64 = FLV_NO_SEQUENCE_END}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" }, + { "no_metadata", "disable metadata for FLV", 0, AV_OPT_TYPE_CONST, {.i64 = FLV_NO_METADATA}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" }, { "add_keyframe_index", "Add keyframe index metadata", 0, AV_OPT_TYPE_CONST, {.i64 = FLV_ADD_KEYFRAME_INDEX}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" }, { NULL }, };