From patchwork Fri Sep 18 01:04:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 22462 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 B44CE449BF2 for ; Fri, 18 Sep 2020 04:13:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8859B68BB66; Fri, 18 Sep 2020 04:13:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 772FA68BB65 for ; Fri, 18 Sep 2020 04:13:10 +0300 (EEST) Received: by mail-pj1-f66.google.com with SMTP id t7so2253749pjd.3 for ; Thu, 17 Sep 2020 18:13: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; bh=dh0JpFzv2w/4qKe4kZ2nX71jqQKQNuZXXCdxMDI0MDs=; b=tQp3Q+idc8mXG0+tpMHfsJinvw2wTDAKgUUYx3rmozaVxf45VYl20seXCQm9V4apE1 AnzoDi+GkWE2B9xytwLsEVFpm56GKDKiE/6Yq/P/rm1n4n7QUI2Hmh54RlKlLvhDwo53 QFXTnTExfhpun0ysiw84Cji56dTP6rKTAwHuGyY77TWh30EGr5f4uwNCDkfGNv+IYXCw J55Ot4CNImyDSFI/UVxYgtE6J6GO7y1VJLLAdYQiMQvRsDqlwS4d2N67wjF4wSQ105JI PB57A5qJOVsdqSbVXLNDq7bmyQ4fTOWZ/7gnA1xrek9YPBBtcFt/0YrCwx3sPjMJBz4g 6TmA== 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=dh0JpFzv2w/4qKe4kZ2nX71jqQKQNuZXXCdxMDI0MDs=; b=b5FQP9F78/5wWPtXomgBqYHSrUEf+q1yUVZHcBwqyCiUPouOBrBx1YxkvvOxXlknfa zr7HRWyk3WNOhD95jvE3xXX1WIWHGDedrydLodghxzyl0m23QnSUmvdhDMQnJ0/pnABB LpQ/zXFI8vpsY2aRtFO0koYZ8g3CLEy3UagxER5WHqJq07UM6GlkSmjCbMT/UfjsIESb CU3QZXJACDJ1LMuZp+ffTh6cHLJ93X01rvveZJVAwssgXq4vjS1of77rWpfLLdTuF1zq IH2Et0ujbuwyhW44dNX+VV6IP+Vm6IHrOaF9Sm9IwNQUPRofMZ/V/7c9YUwiiT9ixuwY WSow== X-Gm-Message-State: AOAM531Duqq1xf2i3bxdFec5L449Z+hoJ4Dv4fMp9LZy30GxQVaQpHQI o1dtAuFiylzur0l10YtoRrTtRr90CAI= X-Google-Smtp-Source: ABdhPJwIUaU6PZHsKuYrQDg+F8fqbHHTTuaqjjpagSEFAcWkBR9m8jLu0vNCK7wzJVEN4Ipb2t77lw== X-Received: by 2002:a17:902:968d:b029:d1:e598:3ffd with SMTP id n13-20020a170902968db02900d1e5983ffdmr13937671plp.55.1600391089374; Thu, 17 Sep 2020 18:04:49 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id a3sm838576pfl.213.2020.09.17.18.04.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Sep 2020 18:04:48 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Sep 2020 09:04:24 +0800 Message-Id: <1600391066-15693-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/3] avdevice/lavfi: fix FIXME and check a/v type by codec_type 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 --- libavdevice/lavfi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 4f05a15..268dc0d 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -386,6 +386,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) AVDictionary *frame_metadata; int ret, i; int size = 0; + AVStream *st; if (lavfi->subcc_packet.size) { av_packet_move_ref(pkt, &lavfi->subcc_packet); @@ -426,15 +427,16 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) av_buffersink_get_frame_flags(lavfi->sinks[min_pts_sink_idx], frame, 0); stream_idx = lavfi->sink_stream_map[min_pts_sink_idx]; + st = avctx->streams[stream_idx]; - if (frame->width /* FIXME best way of testing a video */) { + if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { size = av_image_get_buffer_size(frame->format, frame->width, frame->height, 1); if ((ret = av_new_packet(pkt, size)) < 0) return ret; av_image_copy_to_buffer(pkt->data, size, (const uint8_t **)frame->data, frame->linesize, frame->format, frame->width, frame->height, 1); - } else if (frame->channels /* FIXME test audio */) { + } else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { size = frame->nb_samples * av_get_bytes_per_sample(frame->format) * frame->channels; if ((ret = av_new_packet(pkt, size)) < 0) From patchwork Fri Sep 18 01:04:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 22461 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 346AD44A9B0 for ; Fri, 18 Sep 2020 04:11:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F3D5168B8FD; Fri, 18 Sep 2020 04:11:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D78F368B7E1 for ; Fri, 18 Sep 2020 04:11:22 +0300 (EEST) Received: by mail-oi1-f194.google.com with SMTP id x69so4914553oia.8 for ; Thu, 17 Sep 2020 18:11:22 -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=YVGaEYePPL6WpWtzB1EyLxdDE//4Eg1UmhqvYuMih6Y=; b=s5jXeEdVC3jKcGpYRRdqo/NRnos8evyARidSyU4sYhOJXrVOd46sdl8Mgj1NNTThgr dfOLGuN/F+z/6SOuWU7HQsc8eYb0K1XKXxXmZEHKPYk+DzhJX10xOtn/SpQkNehstgL5 WvRUsXPIXWgXVyefdeMWZbdZoHl7nZXvc4b9Z/Z1L3kV3gAz4pfRo5VT7C+f5BDTTY5h W57OC9jNEsKeNkOC24JsgG+OMtnWgG1X0DvVOUscVX3R9AFMD32cekgyqLQUdznU6W1K tYumOFRC78hbsPQ9QDA7erV1Y/9/3nBa1B9FawmOoeoYmhiRrXeu+I0eQoZ91z7mctXh jMIQ== 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=YVGaEYePPL6WpWtzB1EyLxdDE//4Eg1UmhqvYuMih6Y=; b=Ccoxe35xaQ3SEM4/B6buOSanki4AQzh+BEZ0H/1+NV10K8h1sVQENZaCBEGQaYSe5b Y/W3k+kRcLGVRRJcREd+zZpZ1TpoUOre0hL+91G3ZJd3YWfskXmLJ5sSvVZVprNlbkYo vWMDxhuGbu7gntHy1qlOBRBsdJL0IXoHRuHpBVZGePHg+jzuw3oevJSkyDHkUzppT4ss ARkNVtTYqiJICDXMZeuc+5AvcdZyy9rommZ1sH2i2dponScCT1gX9ZwJQ+rf/xS+vC+5 UdlpEp5fuF12QRxM9JrQtdy1nbOysxT2DTdc8SKTFAL5yaJxyL8fb88b/c7nPst7thfC nfDQ== X-Gm-Message-State: AOAM533trG1ItJ0BcS5NEDgAQZgVxIluI7ZH1qqExBjjMHCmepN5Khyy lmNTInoyKsXbcrL9/wKgXYkXqzDNGQU= X-Google-Smtp-Source: ABdhPJwhOwIzcclU9zv9oLSyZWdpYF/qb5k2p7UyHaF5H/aWWX9Nsv03CoPqmeAQmG1aVPbqfsH9JQ== X-Received: by 2002:a17:90b:3351:: with SMTP id lm17mr10466963pjb.151.1600391090915; Thu, 17 Sep 2020 18:04:50 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id a3sm838576pfl.213.2020.09.17.18.04.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Sep 2020 18:04:50 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Sep 2020 09:04:25 +0800 Message-Id: <1600391066-15693-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1600391066-15693-1-git-send-email-lance.lmwang@gmail.com> References: <1600391066-15693-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] avdevice/lavfi: unref the frame on failure 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 --- libavdevice/lavfi.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 268dc0d..a4b510f 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -432,7 +432,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { size = av_image_get_buffer_size(frame->format, frame->width, frame->height, 1); if ((ret = av_new_packet(pkt, size)) < 0) - return ret; + goto fail; av_image_copy_to_buffer(pkt->data, size, (const uint8_t **)frame->data, frame->linesize, frame->format, frame->width, frame->height, 1); @@ -440,7 +440,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) size = frame->nb_samples * av_get_bytes_per_sample(frame->format) * frame->channels; if ((ret = av_new_packet(pkt, size)) < 0) - return ret; + goto fail;; memcpy(pkt->data, frame->data[0], size); } @@ -449,18 +449,19 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) int size; uint8_t *metadata = av_packet_pack_dictionary(frame_metadata, &size); - if (!metadata) - return AVERROR(ENOMEM); + if (!metadata) { + ret = AVERROR(ENOMEM); + goto fail; + } if ((ret = av_packet_add_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, metadata, size)) < 0) { av_freep(&metadata); - return ret; + goto fail;; } } if ((ret = create_subcc_packet(avctx, frame, min_pts_sink_idx)) < 0) { - av_frame_unref(frame); - return ret; + goto fail; } pkt->stream_index = stream_idx; @@ -468,6 +469,10 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) pkt->pos = frame->pkt_pos; av_frame_unref(frame); return size; +fail: + av_frame_unref(frame); + return ret; + } #define OFFSET(x) offsetof(LavfiContext, x) From patchwork Fri Sep 18 01:04:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 22463 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 EB22844AE75 for ; Fri, 18 Sep 2020 04:27:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C49E368BA96; Fri, 18 Sep 2020 04:27:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E186268B8FD for ; Fri, 18 Sep 2020 04:27:35 +0300 (EEST) Received: by mail-oi1-f194.google.com with SMTP id u126so4927563oif.13 for ; Thu, 17 Sep 2020 18:27:35 -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=3/JguxNtsZ1EV1skwmo+I2wJE63BActCzi7JaiWhMy4=; b=WqwHdNmdozT0vZuj+vMJb0BpLHCE0B/s8rii5aQQIOnxEbFhyE3KUmY74fuzia2d3h jzw8qHORzakV35px8Wsww7VwPyYxF0T56mTMSSepjvEN3vFj0yXb4INtkpon8UlDbhwA JXgw9LLtpYk6qeBTBgBJBYIibfkSZbGlsRGHzicy2+9nkMjfbuj43CPjfr3X6AYyTRiP SeXNz5N58Hv7/fol35HVjyh1cPvoEvyheNOviWJ6+cDuUMOuGLc3TSfaeBq6p+yZR7kO w/4hZmD8zT3DRFh+9ASRfY/8Tq2WZENWfYruRmMHPnBdWTrOiNahodWtwQVUhexSA8Ds wmHA== 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=3/JguxNtsZ1EV1skwmo+I2wJE63BActCzi7JaiWhMy4=; b=t8VqcqkS250/UaRRNjlWu98Stn0ZtcEQYDd6bwDL6Vu7z7sath2Sc+D5p1W+618HFx zfkowlcLwp8bF+/bwwTp0u0lumrHM7YTNDNLkdxgsB4d/tfOxDvM2FUem7MXf4gVJClz yNdrgCglv2kJ93+FveLSRzLXoXVd+NRBv2KNIurPwcc0wvXFIERhrK/D+TfkFLhowk26 D0xCoqhWZfbU3BX2FyrHlXodRp8jv+/81M48o1/zFlSiT1aDPP7XmgZWZU+DJ9pihBUL lEYmtB2mOccL1oKop5GTMsRgz9FpEJZDCX4NRUbnyri/W4olg+IOdiI9raEJngiobMPw CybQ== X-Gm-Message-State: AOAM533L7E69K0o7pQn5wwhWHXRwsOZOyL6q/TbZzPu5MUwnJy0+GVmZ 0E4uqSv7zzV5ssz7PbqD/o1IQCDHOA0= X-Google-Smtp-Source: ABdhPJz+IAqdSuOAPnVtp4jFhYMRh98O6eMp7Mpwle4V6s4vhfJg1cGR3Mk4M3KPgcg0gRAj+T7Jlg== X-Received: by 2002:a17:90a:77c1:: with SMTP id e1mr10294632pjs.39.1600391092449; Thu, 17 Sep 2020 18:04:52 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id a3sm838576pfl.213.2020.09.17.18.04.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Sep 2020 18:04:52 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Sep 2020 09:04:26 +0800 Message-Id: <1600391066-15693-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1600391066-15693-1-git-send-email-lance.lmwang@gmail.com> References: <1600391066-15693-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avdevice/lavfi: av_malloc -> av_malloc_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 --- libavdevice/lavfi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index a4b510f..ff0be64 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -69,7 +69,7 @@ static int *create_all_formats(int n) count++; } - if (!(fmts = av_malloc((count+1) * sizeof(int)))) + if (!(fmts = av_malloc_array(count + 1, sizeof(*fmts)))) return NULL; for (j = 0, i = 0; i < n; i++) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(i);