From patchwork Sun Apr 26 09:49:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19254 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E733B44844D for ; Sun, 26 Apr 2020 12:55:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFFD668C5E1; Sun, 26 Apr 2020 12:55:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f66.google.com (mail-ot1-f66.google.com [209.85.210.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DAD468C59E for ; Sun, 26 Apr 2020 12:55:30 +0300 (EEST) Received: by mail-ot1-f66.google.com with SMTP id m18so20831133otq.9 for ; Sun, 26 Apr 2020 02:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=AbUPqn92DyIeLE0bgRd38LKNtrDHnCfe44qcVSdXLN8=; b=RB2X/hlANnVJMKtNbs2j6edudtSuhgKgJuGv9G2pCs67Qq0K+Kf/SBEMOjmMSDyzM5 2xoczg6XxDQLHSvP0xq03R79OPILF2ShSeyes6qGJ/nVIJfkFk0S2zc2dReteAmLv41h EMnmOPta1/kTAICUp8qfSVa1TMdS/BLqKZYsX8mVmdytL/aQJ0/U7Tb8wYwUFOu7x54a yqgzgpCXHrBr3+npZH8UIHAtiKTJwYsM0Fgeo9nY1VguJN+8y/Nvy7vBJbCXg7mV9qA+ rzwW6gLPRolOA9GKQwtBbyGaxQBI1R3UMz0JMcEtfkq32D1K2GeIBkcX9g9tGB7Eqbuh ajjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AbUPqn92DyIeLE0bgRd38LKNtrDHnCfe44qcVSdXLN8=; b=Z6kyudwueO5AGDuJVW8hHHw7VXnutzIaXkVMYGDZ/O8vNVy1cStcRcF/+2V3S3c5JS fNvtBKivBBPHJAieQO/zxca4iCgSADPHmVfnHRbygDbqHzn3hvhbPB1G0ays2JmoJsfy Ecetio+kk5bPL6GEEcdFHLJGTcQHwwO6IojhQoLzCq2RiRf5waRYM9xk/ZUb+aTibsux tlWvQ2JwQIdOTFIRU72eOZQggdRsdZ6IZOxlI4uLLnfncMzIDTL3Bq22WsPrOQggfXX9 zDCJZ77s6y/RRKDWla/mUDhbbgJZSB7FseK+PgZLmdFIT5sK3pq5fXhrl2q3rfUSnKsD NOvg== X-Gm-Message-State: AGi0PuZxqEsv5b1wJSC0k5TIGwtt1pQGC0m2WZId59GfGf2hCzYHAWWD Mm1TAGTgvTvsX+SOkqpjoXQ07bi5 X-Google-Smtp-Source: APiQypLgrsvSOtKJxwZzP9SPb+FyYpU69q5ACU4NjSAMsnH03/1rLGv3PPbAkzqGTG0b9xnO7fsGgQ== X-Received: by 2002:a17:90a:a414:: with SMTP id y20mr15746402pjp.45.1587894572157; Sun, 26 Apr 2020 02:49:32 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 139sm5663268pfc.170.2020.04.26.02.49.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Apr 2020 02:49:31 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Apr 2020 17:49:17 +0800 Message-Id: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH v1 1/6] fftools/ffmpeg: use local variable with same contents directly 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- fftools/ffmpeg.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index d896b14..d2b0e71 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -501,32 +501,37 @@ static void ffmpeg_cleanup(int ret) FilterGraph *fg = filtergraphs[i]; avfilter_graph_free(&fg->graph); for (j = 0; j < fg->nb_inputs; j++) { - while (av_fifo_size(fg->inputs[j]->frame_queue)) { + InputFilter *ifilter = fg->inputs[j]; + struct InputStream *ist = ifilter->ist; + + while (av_fifo_size(ifilter->frame_queue)) { AVFrame *frame; - av_fifo_generic_read(fg->inputs[j]->frame_queue, &frame, + av_fifo_generic_read(ifilter->frame_queue, &frame, sizeof(frame), NULL); av_frame_free(&frame); } - av_fifo_freep(&fg->inputs[j]->frame_queue); - if (fg->inputs[j]->ist->sub2video.sub_queue) { - while (av_fifo_size(fg->inputs[j]->ist->sub2video.sub_queue)) { + av_fifo_freep(&ifilter->frame_queue); + if (ist->sub2video.sub_queue) { + while (av_fifo_size(ist->sub2video.sub_queue)) { AVSubtitle sub; - av_fifo_generic_read(fg->inputs[j]->ist->sub2video.sub_queue, + av_fifo_generic_read(ist->sub2video.sub_queue, &sub, sizeof(sub), NULL); avsubtitle_free(&sub); } - av_fifo_freep(&fg->inputs[j]->ist->sub2video.sub_queue); + av_fifo_freep(&ist->sub2video.sub_queue); } - av_buffer_unref(&fg->inputs[j]->hw_frames_ctx); - av_freep(&fg->inputs[j]->name); + av_buffer_unref(&ifilter->hw_frames_ctx); + av_freep(&ifilter->name); av_freep(&fg->inputs[j]); } av_freep(&fg->inputs); for (j = 0; j < fg->nb_outputs; j++) { - av_freep(&fg->outputs[j]->name); - av_freep(&fg->outputs[j]->formats); - av_freep(&fg->outputs[j]->channel_layouts); - av_freep(&fg->outputs[j]->sample_rates); + OutputFilter *ofilter = fg->outputs[j]; + + av_freep(&ofilter->name); + av_freep(&ofilter->formats); + av_freep(&ofilter->channel_layouts); + av_freep(&ofilter->sample_rates); av_freep(&fg->outputs[j]); } av_freep(&fg->outputs); From patchwork Sun Apr 26 09:49:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19257 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1A2C1448740 for ; Sun, 26 Apr 2020 12:57:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F2F6468C5F2; Sun, 26 Apr 2020 12:57:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF83768C5BA for ; Sun, 26 Apr 2020 12:57:10 +0300 (EEST) Received: by mail-ot1-f68.google.com with SMTP id b13so20898059oti.3 for ; Sun, 26 Apr 2020 02:57:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zzhGPYLDTA6FwV55Xc7y79+5X+WmxNxoYXT7pTTGYiQ=; b=cSa2ThvmuPam/EaZpp0S5qqC0d/H7H0uCBJzFjakgi0r7E16Ir7kOo3coX0+1ySpvF c1eSTcD0bdDoLYeS6pf9YjE227ojTyEdRBw2JEWWpb+RIvhVQS0GxFQvhli0oUo44+ew 2kH7vESVAB2OYN+pONvjjvqTZOmQxfatsPKlOUR8gCbxLla+FFnx5JX5X1N9u22LdgEh xtpzOMb67AuL6P4hyVlB/tX2eoy5e8mqW03wxnKRMkoQXjLgIe7ns3r3TeagopNWPQe5 3hmW2DuSOgfxlQk9ZZZ4hinwHKc6gLa09nylPxpwAO9Vh+vYhznBps7v4rEJB2S8L3ra VUOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zzhGPYLDTA6FwV55Xc7y79+5X+WmxNxoYXT7pTTGYiQ=; b=n2VUmeGJONSztv7wvyfyAwlL2kZxJFZGCzieu6lr4qz8A+3JeegFPU1KXI7RISsIUL PEP2fCFT+TvYPNcxfP5GSom/zj6Abymnge9gBVD1PvU8Ew81EZt4LXh8aCDV9HER/iCN YLls/UZpsU+8A3HbG+Ou+qJO5aaV3j5GuEIEQJm1ly9Kd+5QOa1GprebONMyJd7jCqoE EVeWKTDkOEGnv6QUOybQK+md3LZ2LD3W7QavIbR07vrYwckS2udXEmyI9037ej2sOdE/ +Unao33GfSHwp1kYGcsUCoytpjRHgAhNj161A9r3FMLZrgM4lrOw+ZU3cgqHtjOgYdJ2 885w== X-Gm-Message-State: AGi0Puas8BSNlmG1YWN8vZ/n3IhqleoJS6nCCEa8Mrr/3IpSIdc3tgsh WmjZ/1tW0Q9SOfn4v1DF3rshBxH/ X-Google-Smtp-Source: APiQypLoH67iq1ZgGUEBrGcr2KnMdrNgqI4udiKKLYEHnFabJS0+jYlzcMiXCfSW8bN4gfTcsGRHIA== X-Received: by 2002:a17:90a:4e81:: with SMTP id o1mr16648971pjh.161.1587894573818; Sun, 26 Apr 2020 02:49:33 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 139sm5663268pfc.170.2020.04.26.02.49.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Apr 2020 02:49:33 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Apr 2020 17:49:18 +0800 Message-Id: <1587894562-30207-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> References: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/6] avformat/dashenc: cosmetics 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/dashenc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index b082536..5fbe4dd 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -2149,22 +2149,22 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt) av_compare_ts(elapsed_duration, st->time_base, seg_end_duration, AV_TIME_BASE_Q) >= 0) { if (!c->has_video || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { - c->last_duration = av_rescale_q(pkt->pts - os->start_pts, - st->time_base, - AV_TIME_BASE_Q); - c->total_duration = av_rescale_q(pkt->pts - os->first_pts, - st->time_base, - AV_TIME_BASE_Q); - - if ((!c->use_timeline || !c->use_template) && os->last_duration) { - if (c->last_duration < os->last_duration*9/10 || - c->last_duration > os->last_duration*11/10) { - av_log(s, AV_LOG_WARNING, - "Segment durations differ too much, enable use_timeline " - "and use_template, or keep a stricter keyframe interval\n"); + c->last_duration = av_rescale_q(pkt->pts - os->start_pts, + st->time_base, + AV_TIME_BASE_Q); + c->total_duration = av_rescale_q(pkt->pts - os->first_pts, + st->time_base, + AV_TIME_BASE_Q); + + if ((!c->use_timeline || !c->use_template) && os->last_duration) { + if (c->last_duration < os->last_duration*9/10 || + c->last_duration > os->last_duration*11/10) { + av_log(s, AV_LOG_WARNING, + "Segment durations differ too much, enable use_timeline " + "and use_template, or keep a stricter keyframe interval\n"); + } } } - } if (c->write_prft && os->producer_reference_time.wallclock && !os->producer_reference_time_str[0]) format_date(os->producer_reference_time_str, From patchwork Sun Apr 26 09:49:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19253 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C0BCC44844D for ; Sun, 26 Apr 2020 12:55:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 926DA68C5AF; Sun, 26 Apr 2020 12:55:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2679868C4E2 for ; Sun, 26 Apr 2020 12:54:57 +0300 (EEST) Received: by mail-ot1-f65.google.com with SMTP id j4so20876986otr.11 for ; Sun, 26 Apr 2020 02:54:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sCfLqWCUOhhhwosyvRSSs58nIOsT9CEvawJS2/CUyUs=; b=TYZwGaqlai/yKgYaVAUyR3aU+kTP6YqsSKxH6sIKBhuV1VLc16JSIF+kSHbt7qJYCQ im8ORxTpZGt0aCC6xON0KAgHKLYIoHQY/K6WxnuSdGAHWV5q4HXT2j5r0SBVcaalvFZ0 WvGHOHWZQ91r57TSKZ7uIChSjdDUjJgZwZ4SVLqVmVgkoiVrMovoOFt482f6U2R9IqDx 5/N8YrxgUAQEBH9QVLA2+l4SblXQlq5HUfmV+dh0RmhNqeC6okpQArVHaDyd2faDodhr 2JNDttKBaDwLo6yjRckoDx5A1b7EKCI7E2u4HzEYkyMYv7tr+N9fJiDcj6jTSlY7m3WC tMhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sCfLqWCUOhhhwosyvRSSs58nIOsT9CEvawJS2/CUyUs=; b=dhj47ov1A3DprJR2ItKq69TPT9HidQ/6LI9LtQWbnaabc6qiPQJYZU4l9G3Fbrkaxz F8Vt3qNuvXORoAezVcnXMX3ZOo1x7G16rRh7qGDBR28wyOAs1tfq3NMLaTnii+Oi7Kbe R2Bf16DBxdxK1AYhTwJyIuDgpahxQPwf51BYc/cK6/9/eKsihwhi3MUhJchAjbbhkmqh hddLsF7nr4PGyCfdsOhmft/vHPbukUSscQ9jCaPtBXEooldsrKpU6El4Exv8Tem9BGAg DBCwZfDovDR6tZaNISlrrTFdb9PqJP39sxlEQgMa0BJCF3D5M9qkFghXN8c85LrzM0pu n/bw== X-Gm-Message-State: AGi0Puaow+cLGuD4GnYv+fwOprVyTkfKfgzmgT797rYDgrFm2myXX+K8 e0/Mv6diqbL9XWz9HvWkIZbhPQWC X-Google-Smtp-Source: APiQypLOq6r6cIp9jBpOHxSL8dfeSivdZWZN3idxrhZwKSOqBfhdY+XJzKP67BXlxwBwaFg/IPuyow== X-Received: by 2002:a17:90a:2f64:: with SMTP id s91mr17724577pjd.30.1587894575429; Sun, 26 Apr 2020 02:49:35 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 139sm5663268pfc.170.2020.04.26.02.49.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Apr 2020 02:49:34 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Apr 2020 17:49:19 +0800 Message-Id: <1587894562-30207-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> References: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 3/6] avformat/dashenc: use local variable and avoid calculate duration multiple times 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/dashenc.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 5fbe4dd..96c0ea3 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1916,6 +1916,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) OutputStream *os = &c->streams[i]; AVStream *st = s->streams[i]; int range_length, index_length = 0; + int64_t duration; if (!os->packets_written) continue; @@ -1955,23 +1956,18 @@ static int dash_flush(AVFormatContext *s, int final, int stream) } } - os->last_duration = FFMAX(os->last_duration, av_rescale_q(os->max_pts - os->start_pts, - st->time_base, - AV_TIME_BASE_Q)); + duration = av_rescale_q(os->max_pts - os->start_pts, st->time_base, AV_TIME_BASE_Q); + os->last_duration = FFMAX(os->last_duration, duration); if (!os->muxer_overhead && os->max_pts > os->start_pts) os->muxer_overhead = ((int64_t) (range_length - os->total_pkt_size) * - 8 * AV_TIME_BASE) / - av_rescale_q(os->max_pts - os->start_pts, - st->time_base, AV_TIME_BASE_Q); + 8 * AV_TIME_BASE) / duration; os->total_pkt_size = 0; os->total_pkt_duration = 0; if (!os->bit_rate) { // calculate average bitrate of first segment - int64_t bitrate = (int64_t) range_length * 8 * AV_TIME_BASE / av_rescale_q(os->max_pts - os->start_pts, - st->time_base, - AV_TIME_BASE_Q); + int64_t bitrate = (int64_t) range_length * 8 * AV_TIME_BASE / duration; if (bitrate >= 0) os->bit_rate = bitrate; } From patchwork Sun Apr 26 09:49:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19256 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2378C448516 for ; Sun, 26 Apr 2020 12:57:01 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 09B0268C5F5; Sun, 26 Apr 2020 12:57:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2260E68C5BA for ; Sun, 26 Apr 2020 12:56:55 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id r4so7119168pgg.4 for ; Sun, 26 Apr 2020 02:56:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EBEgdzIAXXJt0G+92zLu1w16zZP1Zu7iRmH6D2tqrDI=; b=LcWN08TR23C8e06q3iSUTaHpsc8m4eKhbOyI+7BgqQzppoPUr1J/QQPJqR6joEdi30 7Ngr8zqxE0uXXYdyde+ZzLfNa1ScNUfg+ZmCnwcVXCaBfdTzL6lJfo0/8Yog9JlLfUOj efes30NEXsge8BFHsqzutOu9nUWFYdPKP5JSj/Wetdc72GcqJPrCwOy82Mk/scfwxsjB hWwsK341fbjCQrN+LQLmV3SFDd7Oh0uFpzmrLYkCKaqnCGgy7AZBnKOwOwwC/iKYd6PS LXZ1DKDCd4m1E1jVatcBsd9ig0XydXHYlithJV0c5Vjz+IYpr1zvf/OpJsfPK6qNndux AM4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EBEgdzIAXXJt0G+92zLu1w16zZP1Zu7iRmH6D2tqrDI=; b=HpDamjLwLibY7Zf+8gStpFttl6geNacXZ0g7xmAR7lJ/uHgnl2IhwDrYFrKLOzfklf 0tUsN0cjcClopmF2bufTXpwRomNqKAjp68ZeNaG9NYAtcsRtsEIal0PfEULrPlq0PP1p NMd99jaUnj+iU65ac11nvqjl31M7ztJ/s71f7UVMz9LFe7qTPft8CKBfHuLdsexwJ752 mkvx9As2IZBSD4B6Rv4ejrPEUxqX2EumQB7GoYl6+oFQPVofwmTuTIbSARY6S23ZSRwe WUN/e6lU1KDdVi5qKPnpFVvuGHHMIElGXVK3KkRSpMj6QmbSAvtzo2V6CWvw4126N1/v gtxg== X-Gm-Message-State: AGi0PuaVFNdmiUyVghAgvqhZF95gMl16BoDwLoZjCT8g+zuyKOFK/GKq HIRoT6+jnS9nHbT43ABp3yO6SJfE X-Google-Smtp-Source: APiQypJCtrAMj3lVFMsSX9DP7DlzdSdblLrVDwCdrgjUX7iov3YXhBiP4Fw4Vbyk81ALSx0HYCkNSg== X-Received: by 2002:a62:b501:: with SMTP id y1mr18435440pfe.307.1587894577012; Sun, 26 Apr 2020 02:49:37 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 139sm5663268pfc.170.2020.04.26.02.49.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Apr 2020 02:49:36 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Apr 2020 17:49:20 +0800 Message-Id: <1587894562-30207-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> References: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 4/6] avformat/dashenc: use av_reallocp_array() 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/dashenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 96c0ea3..e3e187c 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1731,7 +1731,7 @@ static int add_segment(OutputStream *os, const char *file, Segment *seg; if (os->nb_segments >= os->segments_size) { os->segments_size = (os->segments_size + 1) * 2; - if ((err = av_reallocp(&os->segments, sizeof(*os->segments) * + if ((err = av_reallocp_array(&os->segments, sizeof(*os->segments), os->segments_size)) < 0) { os->segments_size = 0; os->nb_segments = 0; From patchwork Sun Apr 26 09:49:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19258 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 25AF344B501 for ; Sun, 26 Apr 2020 13:13:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08B3C68C607; Sun, 26 Apr 2020 13:13:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7847C68C58B for ; Sun, 26 Apr 2020 13:13:08 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id h11so5712793plr.11 for ; Sun, 26 Apr 2020 03:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xbfQ/snAF3V2kh83dxjlWWlO/ic0Zz8SiaqDXD2rDrM=; b=RFc2vTCdM764Gbr+g7zQPwMJT8cO1YWKYmbA8PEMeCKYJJk2Zz2CklaA4wIcpzkQkW KHhE+sewCmzdr211xFcNHDUQLHTtHxr2ZN5UaUT1Js80Z7z7PKa4HsohILuwFJVmjCWR RXoGWiX33zjL3hdR6w2acUotWBw1fVJSF2E45W3hih3MMA4sA4lPhrNNv2bXucq6r+IG LxyvYY6pSWCNHuU+6E0FoVWLsSwMHuXawVD6ABM/KxP8Kp94QfMm6wekW2Ub3PgeDOh+ oh9AUfC84BIdKAoaA3vHefhI007qo/o/N7y3tdlraMKPOwbMTESpZh8xk3UUK5yySyR4 OZJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xbfQ/snAF3V2kh83dxjlWWlO/ic0Zz8SiaqDXD2rDrM=; b=J2kBerzG+p300q3YWT3M5HqX4VhMcCXXVCgB0mgJtkr9pCAn0s4RKZ5DI2qBFQ2zwq 3iqERBUxDK5T0uUP9CiTyDjQpZI4qZTw/gQdo3FuEzgORf084PSMrod3OiUSDeDPKy7b 4tMebms1EedMH/CElQClumIaHzmdVTUA3HdGFzJCcF0KfsPid7Ooxazyxypvm0wfZIk8 Dt7MJMHTpPTaokMCB/+1H4AFrQCwGGVuXYxsII9brTcCleLmYihgBIETWPFYq151ppA/ C1XQW0gJ3pr/Z+gKbeEtZWqTU4ATconcA8ZAQulXbNaT11ZqIvjmvJMkD97cAFSV+SeL it0w== X-Gm-Message-State: AGi0PuYrvUgR6o8j2dXxbkJlxCGjIoajJlm3+HMEHCnHlI5XCLV4HZ5S Kb7HxCdBrLJb8VDECVlnT3SfQHg+ X-Google-Smtp-Source: APiQypLZ0ZVDwGqH/m6O0Ia9/NvVxK3/1XFenN0VoMk3utB3jxJ9owzbI9Rpr+r1N10PASnQg521eA== X-Received: by 2002:aa7:9484:: with SMTP id z4mr18769870pfk.144.1587894578595; Sun, 26 Apr 2020 02:49:38 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 139sm5663268pfc.170.2020.04.26.02.49.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Apr 2020 02:49:38 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Apr 2020 17:49:21 +0800 Message-Id: <1587894562-30207-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> References: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 5/6] avformat/smoothstreamingenc: use av_reallocp_array() 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/smoothstreamingenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 0e4f531..d10d5d1 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -464,7 +464,7 @@ static int add_fragment(OutputStream *os, const char *file, const char *infofile Fragment *frag; if (os->nb_fragments >= os->fragments_size) { os->fragments_size = (os->fragments_size + 1) * 2; - if ((err = av_reallocp(&os->fragments, sizeof(*os->fragments) * + if ((err = av_reallocp_array(&os->fragments, sizeof(*os->fragments), os->fragments_size)) < 0) { os->fragments_size = 0; os->nb_fragments = 0; From patchwork Sun Apr 26 09:49:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19255 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CDB0D44844D for ; Sun, 26 Apr 2020 12:55:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B8F6D68C5FD; Sun, 26 Apr 2020 12:55:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f67.google.com (mail-ot1-f67.google.com [209.85.210.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C58568C5BE for ; Sun, 26 Apr 2020 12:55:36 +0300 (EEST) Received: by mail-ot1-f67.google.com with SMTP id m18so20831320otq.9 for ; Sun, 26 Apr 2020 02:55:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WqgPV6Rs8srNsCcGHM2EGIjm3Bv9CvNvisiPIwBcBzY=; b=JCoUJNqB1vBShWyopTL/VE+hCo6dqlDdFynOIHmuqAw9vEpvsAAn8W0s0SSG0ZmEQW 0np9eN/9YdiiHR6RPnMJiAL9WozWqXKavIaPHt1+t8e9dUp208As+wYelh3CibvSFZIT DMZZgXERoVJpqMLPwRciCJVsRCNWQ9KIvPrHqZOnc7BgtCwj2YP2oHmeOpf4rIYE1gyl Q/HczByqnKlAh1lbO2Gj9jTasnzIOuXmAvluXhzYB6dWtYs74jjav40U0HQ6Oy1mxYmD 10Qki7dh/EYeKkFf2ramyie9yP59FDuKylzK8IH0u8R76q1iANCSr3Jx5izC5RAl6R1K byPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WqgPV6Rs8srNsCcGHM2EGIjm3Bv9CvNvisiPIwBcBzY=; b=WmeTIC54FTQ+CgwXe0hz7jl6iV7FC1XaCvnrcqZ09B0RV9Zxoo09vURCRlOkjgALBd jWKio/+AbvCQuQjEF62ZIoUWLxH7fx2bDC/x3JzCJQnrarba9UAknXhcWazuXIMO6AmP ZEeBIDNisHiOzIPXlrOaXRyt8tr7Qp4FHF8dTzZ6dcoy2upSI1HQv912HABfVKh3Q1vY rIcT5CzEzSn2mNOTmQ0R4uhRkzpWKUdfIs1ITwLzS2ld3aZm2+in9/XbzDrVPcF1qJAj /drkjNjIMPhbB+w40Q/Nw/egixiY5Z/jZhXqknuohTfXp+vapGNzIqGCzxiZGiMImuAx 0RbQ== X-Gm-Message-State: AGi0PuZB0CVA0YRoNHeCM8x0673mc3ftCrFkl5233QnoyhsrsPlF04sD s90EmVLVAimsDR7ZnD0LcNMry9NW X-Google-Smtp-Source: APiQypJDGOYzz33Vxp+IsJgUt3OLWQ0Q8RRLN50ayG9JFc81gV8T0O+4M9FeHwobX1RmzIFSrimgJg== X-Received: by 2002:a17:90a:68cb:: with SMTP id q11mr17755556pjj.15.1587894580151; Sun, 26 Apr 2020 02:49:40 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 139sm5663268pfc.170.2020.04.26.02.49.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Apr 2020 02:49:39 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Apr 2020 17:49:22 +0800 Message-Id: <1587894562-30207-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> References: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 6/6] avformat/rtmpproto: use av_reallocp_array() 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtmpproto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 42aacbd..e23426b 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -163,7 +163,7 @@ static int add_tracked_method(RTMPContext *rt, const char *name, int id) if (rt->nb_tracked_methods + 1 > rt->tracked_methods_size) { rt->tracked_methods_size = (rt->nb_tracked_methods + 1) * 2; - if ((err = av_reallocp(&rt->tracked_methods, rt->tracked_methods_size * + if ((err = av_reallocp_array(&rt->tracked_methods, rt->tracked_methods_size, sizeof(*rt->tracked_methods))) < 0) { rt->nb_tracked_methods = 0; rt->tracked_methods_size = 0;