From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 71594455A1 for ; Thu, 6 Apr 2023 14:25:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFCF068BD76; Thu, 6 Apr 2023 17:25:23 +0300 (EEST) Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61ADE68A70C for ; Thu, 6 Apr 2023 17:25:18 +0300 (EEST) Received: by mail-ot1-f52.google.com with SMTP id q23-20020a05683031b700b006a1370e214aso17910285ots.11 for ; Thu, 06 Apr 2023 07:25:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680791116; x=1683383116; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=MBic5R/yfiWm/QFGNJPuwiUthiKy6YUD2mmEMV1ncLE=; b=MvJVexMhRai5QrhfPXPvZxUBZqhUFMhmVPBN66cRi1ZtPDqE7a0zSE/XJk1yPAEi0k /7ZNLvG+RlOjzCmP43urRg6xoco4pJjV4T4LQhu38F4XpmNchX0jC9XwIWp4YcC+YfCi wK/JvAysdWhqOUiLfTA9nq0RPSqwbkeS8poIN6Yb1PfbkX5rwVhj4lZf4aUABEoaj/XI VAZd8rXAG6PJvMxbxov0DPrZfGoOOQPCvghvfcagR5fQXqn+i1zh3XjoXQfIgfiShyVT Nd+peTeJyl+sDyMbsQii4lVXew6+1vC5jgaVqHtWWSAfniup4WTmW5YXJKIG9A0DAq9N s1yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680791116; x=1683383116; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MBic5R/yfiWm/QFGNJPuwiUthiKy6YUD2mmEMV1ncLE=; b=xFxK56ICcGWIEoHagHep2eIoz6a8keww3rhkXSjqE/pIzlsGC8I1g2FTgjjqQOy4++ vxju1b1kSoasS4ebAJZ3iPu1k3VMh82lVqH2RBKBBsu32gGGZA7/HJ9co4bRFcLpZdK0 l2z2vhYzbNZ3nK4PyOXp2/107QqqLKORhBKFoB/CSKdNFU7OfP5w3OWNdARBiXjtDGcR Nmii5QSPVmiW0/MRKypF4KQxlSZlzHQhSgwcGzFU8BJ9yeRwC+sqEfGMz5mlrj5KaF/3 k5xwmpfJaCAqfUEUvzb3ftkRZ91gpShXQMn6fRdJqop2qK5yqxen6/Y+Ztv8bZcWAQY5 EyLw== X-Gm-Message-State: AAQBX9dwH1RCsmWMKo8CzS9Ws05nArip7pypzU/pqsqHU4FlmffzkAFj CHHDavCgtw7cVG0fTm8ceh8JfB/f5/o= X-Google-Smtp-Source: AKy350bLxfr7zRk1+tv6y8qUi9KdNDYQeFYyT5tSVeZQ8ycqXgOD4q0MlwMr+1exQMnPwyxPVCnfZQ== X-Received: by 2002:a05:6830:1e30:b0:693:d998:f50c with SMTP id t16-20020a0568301e3000b00693d998f50cmr4737798otr.5.1680791116300; Thu, 06 Apr 2023 07:25:16 -0700 (PDT) Received: from [192.168.0.14] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id b17-20020a9d7551000000b006a3bc285eeesm642486otl.68.2023.04.06.07.25.15 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 06 Apr 2023 07:25:15 -0700 (PDT) Message-ID: <50bdb166-9799-e0af-c79b-6b2b93288470@gmail.com> Date: Thu, 6 Apr 2023 11:25:17 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: James Almer In-Reply-To: Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 4/6/2023 5:11 PM, Zhao Zhili wrote: > 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]; I understand that timestamps are 32bit on flv, but things are pretty inconsistent type wise across the entire file. This used to be int64_t and you're changing it to uint32_t. Some parameters expect an unsigned int and others an int64_t. It would be nice to choose a single type and use it everywhere. The source for all of them is apparently pkt->dts, which is int64_t, so I'd use that everywhere and ensure its value is <= INT32_MAX or <= UINT32_MAX depending on how you store it. > } 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", _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".