From patchwork Thu Apr 6 20:11:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41003 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1115412pzb; Thu, 6 Apr 2023 05:12:02 -0700 (PDT) X-Google-Smtp-Source: AKy350aZVQkUh2PFz9DuVaWyIZsSh1vUXC1L6AOWZHTyEEfRx2KohhopO/HattA3IUN0tTsfl9pW X-Received: by 2002:a17:906:c2c6:b0:931:95a1:a05a with SMTP id ch6-20020a170906c2c600b0093195a1a05amr6607719ejb.62.1680783121803; Thu, 06 Apr 2023 05:12:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680783121; cv=none; d=google.com; s=arc-20160816; b=DiVXzte32sotnBsyF0CazzUSwxWV46/DCqD9ouMLCj+taSd90GkWO9/3KE+z8rDneA Kf/MRl6FEFKbby2phFnR+rhvrDKvHyEQRKXKd3ZZCcbcBr/xvdfJUp5VCyRS+VBPeBAl NOEhmf118KzXuPBcrctXNF4xsZDd+jor0EQbVj+/rPEilORa2z4aWXKXss9N6k+9PAJ7 m30JUW+xTG8O0zbeHReMBtuIIZBz/c+/bMow3sCFYcZh5bu4gk4Lrmz/C4pTZfGod7rJ k7UrC49EA9oQn8TZ9kodO4YUDuAHJB3mh013x27P0bYnVjlH/s7FZcqEH3q2BSm3KuNT 9PlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=3gDzI4ZovD24FQ4ECAWqO599wyEhpQ0Z7BxtYZGkKOY=; b=XxD1BHy2BT+DiWNSlwES4QWzW1ZxKsSDUqMen7WGQljy9VdJy/57GT0AaYiN6CLjGk UUhPGFALFAwVyESlaHgm0ppoTxz1hQjd0XrlzCaNlDl+KK0Dm/W2wBGWLwz9FcHgF15v AobeM1kzJjCSbzbYFuo2BTlAnXLi0cL121CH7W8xCe4EKSXbsDqudPrh2I7UffYzTAqw DbNs4hiK3GOzUUAKF7Sxx4+RnbDGrFfAhTikKDSNPQtlvG+y6tIPMeiJfCly6u/bKzcC oHy/42qnztjbnJL8JDbn8oA4r5aF5aCYKflCRYb9UB7DXzSWrASVph92YhoneVuSYLAE iOIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=mN2rMJSI; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t22-20020a170906949600b0094404d7e622si1028226ejx.770.2023.04.06.05.12.01; Thu, 06 Apr 2023 05:12:01 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=mN2rMJSI; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2FD6C68BA7B; Thu, 6 Apr 2023 15:11:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-80.mail.qq.com (out203-205-251-80.mail.qq.com [203.205.251.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1380689F8C for ; Thu, 6 Apr 2023 15:11:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1680783097; bh=vDKpB4VbPsV3Mk8U1VpZacojjGXJ20RAKZPjQdSXR8U=; h=From:To:Cc:Subject:Date; b=mN2rMJSIDSvqVJH45hSLqimG1FUuaB4QvNGQIoJPRMKMRfOaLA7gmwJcg4ftqZy4r phMwb991NN1ZKtadfZCZWZN0DrqN0pbgvyljX4rEh3TDYWpnqby1ZLanUz3SQHqCAL WE6dy/lG0yxcRsfprhm6NlHWNo9BewRJMMUOBtlM= Received: from localhost.localdomain ([113.108.77.50]) by newxmesmtplogicsvrszc1-0.qq.com (NewEsmtp) with SMTP id 2E48909C; Thu, 06 Apr 2023 20:11:36 +0800 X-QQ-mid: xmsmtpt1680783096t1oklwiwz Message-ID: X-QQ-XMAILINFO: NMGzQWUSIfvTOuUPTgmk26WjDAWaD8QgAkeDsMkjLc8GCPynVib3p3LRzXTOxq uJNDKOV6akZccRz1bmtB/9N5VtayxkxuEdEozCBNKNKDfUQ8cSyAxown7lWHL/ASvO+u3hfuhYmq Kn6m20C30HnT8O6je7eLC0fmtHq9PIsOoKcOKRYDqb4cnzjdT+GRIrbj83dhoc1o4zdqWlcw+rXf ageHR10woSb5m0soA5XG4GI9zTUytaYxJO1PyDe2+dRfYwUAjf00N1v8dRtn4O07T0EAiapaybEp n7Yq1HIgA97953NcIpIAfntgfky2rJcuaLxANgahDXYUQNVrsrSXPhFu2YHgdOhUc7414wIAKkBw wjgxFjnGkFjdLEK6hSWqivYeQnTswCwRhfJ4SKhGrA7ApS2Ma4OF935Qg8jkhv+1CDN2o6MwFNxV AcPGvfhqM2sGx3I6djSODkkAfIn0o6A4E+9hIUQeeOJo7kvS+ju8jYpSyDgSqR4jLCHhzAEB3+By qH/Ix7sPFNpE69CZMIA6KDYvmNqvs9ZTGFtAUmhpQEx3FLoabK/9B0jWJ7gdvVs47CP537ifWSrb kEQlqvVeP+2Ywl+OFe9RNizmxKPGHUEZ+qwRVGvHc5xhQPzCQ9QTFqp+6GzK3AJAlQ+z5MverGYi bkmTdGGpFGgoVo/KKlwgLFY6UVGciJw3hXHTDBIHlQ+KZKn5bilkgWOJMACIU6Yi3xyfHxwS9t2b YX16MiVUIdAS4YM1CEaeX+KqenPXIUHl3FYrHUVhle1kbJtrKxrp8kctPPIp5b/YYVIpKt/HqCNz XkYxBz88qEIB1uLj9itYJvYaYsrxIIHjTjXDswylQ4HeBK2Nr0AotZuvioo3mCUVIu1fjuD6d9O2 055MUuWcIhtNSysB+Zm7+8JFcM/vJzG4e/MF/Ks+lODKRaMIw5sLstKlVSdZ49IohnRDn3VcBS13 bJTuIY2lMp8oLtT62ucj+sRD4JyTGdol70/Ph5a+g= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Apr 2023 04:11:40 +0800 X-OQ-MSGID: <20230406201140.751743-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/flvenc: avoid an extra allocate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4CT8niaxPTfQ From: Zhao Zhili --- libavformat/flvenc.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index a7b5efde4b..3a686b73d7 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -117,12 +117,9 @@ typedef struct FLVContext { AVCodecParameters *data_par; int flags; + uint32_t last_ts[3]; } FLVContext; -typedef struct FLVStreamContext { - int64_t last_ts; ///< last timestamp for each stream -} FLVStreamContext; - static int get_audio_flags(AVFormatContext *s, AVCodecParameters *par) { int flags = (par->bits_per_coded_sample == 16) ? FLV_SAMPLESSIZE_16BIT @@ -611,7 +608,7 @@ static int flv_init(struct AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVCodecParameters *par = s->streams[i]->codecpar; - FLVStreamContext *sc; + switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: if (s->streams[i]->avg_frame_rate.den && @@ -675,12 +672,7 @@ static int flv_init(struct AVFormatContext *s) return AVERROR(EINVAL); } avpriv_set_pts_info(s->streams[i], 32, 1, 1000); /* 32 bit pts in ms */ - - sc = av_mallocz(sizeof(FLVStreamContext)); - if (!sc) - return AVERROR(ENOMEM); - s->streams[i]->priv_data = sc; - sc->last_ts = -1; + flv->last_ts[i] = -1; } flv->delay = AV_NOPTS_VALUE; @@ -783,10 +775,9 @@ end: /* Add EOS tag */ for (i = 0; i < s->nb_streams; i++) { AVCodecParameters *par = s->streams[i]->codecpar; - FLVStreamContext *sc = s->streams[i]->priv_data; if (par->codec_type == AVMEDIA_TYPE_VIDEO && (par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4)) - put_eos_tag(pb, sc->last_ts, par->codec_id); + put_eos_tag(pb, flv->last_ts[i], par->codec_id); } } @@ -821,7 +812,6 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) AVIOContext *pb = s->pb; AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; FLVContext *flv = s->priv_data; - FLVStreamContext *sc = s->streams[pkt->stream_index]->priv_data; unsigned ts; int size = pkt->size; uint8_t *data = NULL; @@ -919,13 +909,13 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) } /* check Speex packet duration */ - if (par->codec_id == AV_CODEC_ID_SPEEX && ts - sc->last_ts > 160) + if (par->codec_id == AV_CODEC_ID_SPEEX && ts - flv->last_ts[pkt->stream_index] > 160) av_log(s, AV_LOG_WARNING, "Warning: Speex stream has more than " "8 frames per packet. Adobe Flash " "Player cannot handle this!\n"); - if (sc->last_ts < ts) - sc->last_ts = ts; + if (flv->last_ts[pkt->stream_index] < ts) + flv->last_ts[pkt->stream_index] = ts; if (size + flags_size >= 1<<24) { av_log(s, AV_LOG_ERROR, "Too large packet with size %u >= %u\n",