From patchwork Sun Aug 30 14:50:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22006 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 6AF5944B78E for ; Sun, 30 Aug 2020 17:51:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 429D668AC31; Sun, 30 Aug 2020 17:51:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FAE8688040 for ; Sun, 30 Aug 2020 17:51:06 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id e11so651518wme.0 for ; Sun, 30 Aug 2020 07:51:06 -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:mime-version :content-transfer-encoding; bh=+YHOrMwziHxUbKBYis9Iq3UCdD01n2U3aPePnAmgFCI=; b=Woabdb3L4rSY7ltuxhyzoAXv9O1gpBMwTaGmP9ZSWXYbfnqYPKX6L1AAdWnMr/H9Kp wSfGeQKVQLwVbHwOYXUD+fBrmBkEL5ky89409Zgvz71SvTUL74gfP+j5p00xlb3qQ8zS 5sLEgREclGemyfhC6OH80V+i0dMaja3hT+s06ffts2vzkT3r9LSp1f4Sw2kafDriAtvt UJIpLjVF9u6UcwgPkALqQuyo9XrQe18fPTR33CAgud8UIrjk7BIOASO7qPs3SM/vuU+v Jr3aq4QaSd3JIq/6Mu+PFu3B2wsiIjHvmhC2kqkMOdcrbgmDh96K9HhdNtTxV3/borEu Oniw== 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:mime-version :content-transfer-encoding; bh=+YHOrMwziHxUbKBYis9Iq3UCdD01n2U3aPePnAmgFCI=; b=c3vC/8GZHPhczDfmAngvL7irDRVt8T/DhkSYy72U7ZS/N6eEHJZZBUG0AGCzbLgeWj ZeluUZxbseS71WCtlUwHVvY7FL9Q4pDJZWoehrXR8LJo1FiJQaOSNHoLILOWm6YFuhTE zrqsWH9NciAHUeV/ai1yY2eKKr5jNXbSY3x3E9mhc7lG5qmkEYdJTNGSid5jwu0Gcy9c jAhQStCkiibAGYPN7Q/jkwQ+WYNRo7wN8vxyPAsNTKF0Mzk3tRR9uR7/aFYlfDVCcen5 a9kvThiHCDxBxvpclN4AHAR0zQkqsTI0GPdIS8lwvpyTQUduLhAZydPBCdI7ZY3Kjt5V ME8Q== X-Gm-Message-State: AOAM532TpNgY9LgCTeG1Ai7HezEGxU/d/ay+koL9tD6/6NFSHbihG/tU LVTLag6b6CT7vSJKHBIdRs3naYbaVPk= X-Google-Smtp-Source: ABdhPJy7RhQ9xwraiN9c3+b4RwD0EWQ7zhrYIVYSdF2K4CqTPJucwtp1gwn0ikHTpS+/RKxlpQDSPQ== X-Received: by 2002:a05:600c:2215:: with SMTP id z21mr7622109wml.159.1598799065356; Sun, 30 Aug 2020 07:51:05 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id t203sm6316794wmg.43.2020.08.30.07.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 07:51:04 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Aug 2020 16:50:41 +0200 Message-Id: <20200830145045.4437-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avdevice/lavfi: Use av_packet_move_ref() for packet ownership transfer 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index c949ff7e12..2a95cb013c 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -392,10 +392,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) int size = 0; if (lavfi->subcc_packet.size) { - *pkt = lavfi->subcc_packet; - av_init_packet(&lavfi->subcc_packet); - lavfi->subcc_packet.size = 0; - lavfi->subcc_packet.data = NULL; + av_packet_move_ref(pkt, &lavfi->subcc_packet); return pkt->size; } From patchwork Sun Aug 30 14:50:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22007 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 A395D44B78E for ; Sun, 30 Aug 2020 17:51:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8228B68AD05; Sun, 30 Aug 2020 17:51:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FC7868AC85 for ; Sun, 30 Aug 2020 17:51:23 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id z1so24932wrt.3 for ; Sun, 30 Aug 2020 07:51:23 -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 :mime-version:content-transfer-encoding; bh=wek768N5A+NEgNCdNQmNAICGyxEI1km2NHMDIWuFj6w=; b=kW73MwJCqoRM/XOXobjwhUmHoFjnFE9LYoB694eztzXWoYFxwqoKCt81eE5PYGCFe5 ZNHszBVi6gyNVDXHCA10C+nn/dYe54wxIIgBeqSk7AyhnLzEhAWfoAmxG7kmL9lbg63a 0Ly1tdAIWK5REwpXxI954iyaKHiquEoUP71eB0VU/NMNGt66AjJTpM79y4R7vcP09Xmk 4rMogMRPRJ8H0ew/N0ZhYB7uNP8mGzN3V1yWTLh6LSQz49RGa5D9Nk4zdPXmuXvAs/X/ EpeioNpYml6HVEYTVQN53jmLXXMsU2bP4sJZ79hiEb9P/9VbVb6zfHJ4HJYT9pewChlG o4dQ== 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:mime-version:content-transfer-encoding; bh=wek768N5A+NEgNCdNQmNAICGyxEI1km2NHMDIWuFj6w=; b=SjkVaH1gNP1riRMcjzKuyMmGGhfDWuoEb0ZtutxUwEwHPmgyPZ4odPDBunEvUKoDVN zCzOSip5ue0el4UPpNx/K1yh/iU/hAZbnekzl9fi7HlPvLH7sj0d1u7lTn+zUOjOrLG5 g2qDs7NXvjk+8+SFu+btrf5cRoqA/7D8gtXVEWjm2vmh7625Gfj6sDHVWJPsZFwBqKOq hnR6BugczbUeSwiiF3apQbCl5eoFSaAv1xTOrvNweMbOLmJnyebL1r+K4Kfjv/md05IT yU4395iAAkCue3iSuY2DfdHnMioVpeTPnKWvfwedg4lSVR/T+iochNHD4f2c/Bk0Ivw9 V/Hw== X-Gm-Message-State: AOAM532A0sc0WyIvw/r/2NRNsRBUm9Y0XjkPXeH5sa+Mey5ZwiCyAbrv 4Lepn/PmWb96WP2jccSu4UI21gdUZQU= X-Google-Smtp-Source: ABdhPJzlak3IJgZna/aMIQWBXKS3Ppf7LgGgygsfIrKulzJYHhwFOGF2ArbVl+Byq3YR5Wni5NlQEw== X-Received: by 2002:adf:c3c3:: with SMTP id d3mr7534500wrg.396.1598799082320; Sun, 30 Aug 2020 07:51:22 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id t203sm6316794wmg.43.2020.08.30.07.51.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 07:51:21 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Aug 2020 16:50:42 +0200 Message-Id: <20200830145045.4437-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200830145045.4437-1-andreas.rheinhardt@gmail.com> References: <20200830145045.4437-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avdevice/lavfi: Don't reimplement av_frame_get_side_data() 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 2a95cb013c..5e814eada8 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -362,16 +362,12 @@ static int create_subcc_packet(AVFormatContext *avctx, AVFrame *frame, { LavfiContext *lavfi = avctx->priv_data; AVFrameSideData *sd; - int stream_idx, i, ret; + int stream_idx, ret; if ((stream_idx = lavfi->sink_stream_subcc_map[sink_idx]) < 0) return 0; - for (i = 0; i < frame->nb_side_data; i++) - if (frame->side_data[i]->type == AV_FRAME_DATA_A53_CC) - break; - if (i >= frame->nb_side_data) + if (!(sd = av_frame_get_side_data(frame, AV_FRAME_DATA_A53_CC))) return 0; - sd = frame->side_data[i]; if ((ret = av_new_packet(&lavfi->subcc_packet, sd->size)) < 0) return ret; memcpy(lavfi->subcc_packet.data, sd->data, sd->size); From patchwork Sun Aug 30 14:50:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22008 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 9649044B78E for ; Sun, 30 Aug 2020 17:51:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 77D8B68AF22; Sun, 30 Aug 2020 17:51:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A37E68AC85 for ; Sun, 30 Aug 2020 17:51:24 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id c19so2795014wmd.1 for ; Sun, 30 Aug 2020 07:51:24 -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 :mime-version:content-transfer-encoding; bh=nme/LqDVw4CW9KIHR0MoHfE1bG9r+MpNcT6AVS/MqNA=; b=JYWaW8Ox5NYe5gkwDe1l65IppVg4IX1HBdqhz3r8Q+FiXVFZCtxeZ3zkd1Yky9r39+ POpMePx5AVR0xJ9ImdK18pKyRhT4N1Ma/KxYBNKoOj7WFAKKtzvJPm0kzJb2k8E+VQiN 7dFrcLyMm2D6EbpHm7mopgTlOk1C5ouLHNlrAeVi0psVbXuKuZXhVIBovxrqyBQUOlfj jS63DqCPAgxbavP5cwpORVvel4EiZB8ATbd6LvkJ6E0Q5Ded4mSuC+IeWEo+cedE1JGO MrqLlsSaGqMCsPnGMQtXgBsAIFGPBd0PpsZVxJgBNfu4HZDCkDG9w9omtv3rcZSJ5sgA UmvA== 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:mime-version:content-transfer-encoding; bh=nme/LqDVw4CW9KIHR0MoHfE1bG9r+MpNcT6AVS/MqNA=; b=fvljZ2rakSoNogqyypuFTycKs+M9SWyDLJOSeUm83GBi9mkerQ0osN1Hb3RDaxo/Rr VYOg2mhuQ2/P4nLGS1fGxkLKu5K3qAPtp+QHdBTYUt3lpw5Jwx8yY2Z1jql2mr4roJhU XPGgRMLDoxOztuNV8QLtfOaZBkXcqHjAEtYdfwYb6NHzFPDh9fI6XsJGXUKzlBXbUSGK e1TuyHEv0L19AsA4zu2ONY//e632+X0yQgf1eK1MNexh9PIHC3rYZwPMcN3pvBt9Ik7Q bvDeMzv/Q9s+ziYqaQ2PUxehr2+JcdUdrBMPbJtRdWyet/fuzyA9DqwZJmZfWkHVnH6p ZE8w== X-Gm-Message-State: AOAM531Y+ChKcPfhYHfwF2C/yCjE40W8EZ6Jh3Ji7w7OwEN/DRfaRQyP 9lixurr+ZcxQDwoHy2YO+3rria+Gdeo= X-Google-Smtp-Source: ABdhPJw9zvlkrFzjMdtrirew8R2+iPtGdFEWmkt5EyOb2HzTJyAVoYZz08lBlczap568WpcC99Wp2g== X-Received: by 2002:a1c:9dd5:: with SMTP id g204mr2210505wme.162.1598799083341; Sun, 30 Aug 2020 07:51:23 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id t203sm6316794wmg.43.2020.08.30.07.51.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 07:51:22 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Aug 2020 16:50:43 +0200 Message-Id: <20200830145045.4437-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200830145045.4437-1-andreas.rheinhardt@gmail.com> References: <20200830145045.4437-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avdevice/lavfi: Use av_packet_pack_dictionary() to pack dictionary 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- av_packet_pack_dictionary() returns NULL in case the dictionary's count is zero; but given that the dict API does not return such dicts at all, I have not added any check for this. libavdevice/lavfi.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 5e814eada8..bafc3275c9 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -444,25 +444,16 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) frame_metadata = frame->metadata; if (frame_metadata) { - uint8_t *metadata; - AVDictionaryEntry *e = NULL; - AVBPrint meta_buf; - - av_bprint_init(&meta_buf, 0, AV_BPRINT_SIZE_UNLIMITED); - while ((e = av_dict_get(frame_metadata, "", e, AV_DICT_IGNORE_SUFFIX))) { - av_bprintf(&meta_buf, "%s", e->key); - av_bprint_chars(&meta_buf, '\0', 1); - av_bprintf(&meta_buf, "%s", e->value); - av_bprint_chars(&meta_buf, '\0', 1); - } - if (!av_bprint_is_complete(&meta_buf) || - !(metadata = av_packet_new_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, - meta_buf.len))) { - av_bprint_finalize(&meta_buf, NULL); + int size; + uint8_t *metadata = av_packet_pack_dictionary(frame_metadata, &size); + + if (!metadata) return AVERROR(ENOMEM); + if ((ret = av_packet_add_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, + metadata, size)) < 0) { + av_freep(&metadata); + return ret; } - memcpy(metadata, meta_buf.str, meta_buf.len); - av_bprint_finalize(&meta_buf, NULL); } if ((ret = create_subcc_packet(avctx, frame, min_pts_sink_idx)) < 0) { From patchwork Sun Aug 30 14:50:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22009 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 D474A44B78E for ; Sun, 30 Aug 2020 17:51:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B1C0668AEEC; Sun, 30 Aug 2020 17:51:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9B4368AE9A for ; Sun, 30 Aug 2020 17:51:25 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id e17so3026316wme.0 for ; Sun, 30 Aug 2020 07:51:25 -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 :mime-version:content-transfer-encoding; bh=SnWhQj45NOrEA95IFE3uxEGXEndw1vy2Dtxjh3oqG3g=; b=Jl/qZnwlkBNJxWcJ7r8aJOEpVbTIlgZxFqbHoNtOMnfFLa1yMd51R4cFNExTDe3Fr6 oI7yNwgIIHIpTH75dxdYkgHeRamu2HXsNXKHV00Lo6ItB9FAdn2v7S7YrHQkQ5l8WWeF BTkWt+BdLJZQWVjbf+2JNp7LHB1iprKpOsRle5xADb4Ta4SDtAjLT93iyN7CT2sInFX+ wtnJ6j7zldFeSHaiE1JXiw+llfP0WABj7JPq1enHiBzxHhxJwqrxcO23x/Y6UxesGWRz lMTLiPxQiEGd+C2uOZJ/eAqxbJEwr4f46vMuqGWtZIUJJ2x0BleXHj16KDJlY6VkjuHb 85bg== 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:mime-version:content-transfer-encoding; bh=SnWhQj45NOrEA95IFE3uxEGXEndw1vy2Dtxjh3oqG3g=; b=ciqCpHn7vHO1f9WEvgaV+8+WgJa0n139YtLSLRsAraDd8mlaeAMl+/MbErsrVkJ9FM xvnQL3dyGA/0KTKllSDAzIrr4dVG4ZxEZeGCUBIrPEwGFLhixcPOAyZaoadenafP2XTN BlOGw/u968K6vrBhug8JOK5I6M6zgD3xbozvZ+FwfM8Te99aNLZFyZ6phzQgYrWLHYac DCO8eTMPlY7xyzi53s5rO57hj0IC7ClWo0szG5rcv8TPLU2uqNZNrCejr27s0WE5WiCQ dXhQHDzewQ345CSmbLlRik+JU41ASDu5JihLejfka/I1eoPPrvf81HJU99mBxP1KuOcM fx+Q== X-Gm-Message-State: AOAM531IE9vzW7qtfhdlWa9PCVgJ9UQxQgclJfjx5zWD6MZ6HJcSluQC Dk3tF2DZm47NgfrHPcaa3LiRzj9RfqA= X-Google-Smtp-Source: ABdhPJxhVxIv5t7rK6F+i8eUeEgxlKc9GNpPOHvaW3VLMn/FTfBun8vcDpKT3ZFWmUqr1+fl1+1M7Q== X-Received: by 2002:a1c:3187:: with SMTP id x129mr6603316wmx.107.1598799084948; Sun, 30 Aug 2020 07:51:24 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id t203sm6316794wmg.43.2020.08.30.07.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 07:51:24 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Aug 2020 16:50:44 +0200 Message-Id: <20200830145045.4437-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200830145045.4437-1-andreas.rheinhardt@gmail.com> References: <20200830145045.4437-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avdevice/lavfi: Remove redundant av_packet_unref() 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Since bae8844e35147f92e612a9e0b44e939a293e5bc9, the AVPacket that is intended to be used to return the demuxed packet is automatically unreferenced when the demuxer returns an error. This makes an av_packet_unref() in the lavfi demuxer redundant. Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index bafc3275c9..2b4e9290dc 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -458,7 +458,6 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) if ((ret = create_subcc_packet(avctx, frame, min_pts_sink_idx)) < 0) { av_frame_unref(frame); - av_packet_unref(pkt); return ret; } From patchwork Sun Aug 30 14:50:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22010 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 EF96C44B78E for ; Sun, 30 Aug 2020 17:51:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2DBA68AF73; Sun, 30 Aug 2020 17:51:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED60C68AF9C for ; Sun, 30 Aug 2020 17:51:26 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id m6so1282812wrn.0 for ; Sun, 30 Aug 2020 07:51:26 -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 :mime-version:content-transfer-encoding; bh=HsIoZHUhSkA8TUdkjfWXuBww2/t5NSMrg6NVr9H+QCs=; b=AkQhexW7LlsW4sO8KdKCTFpxgqqmOHiqJhWx9reE/KBJfYh4RS7LYBEQJOxFPZa2DY ZkNt3HLgEzEm5xA4IhTSefnurLTZ2zO9hL/EkccdI8cMTuy1xw453/3GlbVDKlIikIqA EACm0lmrREhOWifW9QrDNmYa0C6zLwML0i9smwkIDXMD7G1x/bFDke76+cMekKC4grTZ wUDVOxBobedMiN4/jqErutVWqmGBH8RZcG13L4mFJFGNM5f/DcjC6/MMcuHRnMsy4D2g ydS+i8KCXbXyLU9LNik2nlJiew8Xvlqw59Y+oSs2HpND9tTXNqnMCmwV9rAcSdjxqp0k BhtA== 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:mime-version:content-transfer-encoding; bh=HsIoZHUhSkA8TUdkjfWXuBww2/t5NSMrg6NVr9H+QCs=; b=oE9SrvAoQMWbBQNQNqflXmSctXUlvQANFRM1W2z0pbybd6+Il7T7z4xk/C48nUyKw1 kIDh8N+7NbgnNRdwW/nHfp/e4Q+VNNGzGtLkA+cWg/1HFlibtXZ6/bDszukQtntk/XX7 iMipSLXejjhLVOZDbuPOQrd0HiZrYmRdQdR5FC1lPUzbpKHUK2TIUoRWDzUsTwCn2dmS qA+RcSJkruT7vatlHes3iP62pVSQAYNnG9O9wrnBNmGRqHW28cePhRWrga33dIjddU2t qPhph4aVfdgv1NA2rusvdchPKTfCiYXWjm4I6/nQZwJ8jHrNIj35J5eefQIijp466QRN EojA== X-Gm-Message-State: AOAM530TgUr+DptVCnp5TfP9uw4k9nsCyAFpqtwUQjw4aYutRzBevZCe b3sNBxYzbsrDZ46ETFHGiVq+8r21am4= X-Google-Smtp-Source: ABdhPJxttSMjy9Y0/DRmDXp5B41R3itcbbKZl+yo7Lfj2VPoCZW0ubHHtlB1RRfwWfHusLxTgs81IQ== X-Received: by 2002:adf:9ec5:: with SMTP id b5mr7214667wrf.190.1598799086052; Sun, 30 Aug 2020 07:51:26 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id t203sm6316794wmg.43.2020.08.30.07.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 07:51:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Aug 2020 16:50:45 +0200 Message-Id: <20200830145045.4437-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200830145045.4437-1-andreas.rheinhardt@gmail.com> References: <20200830145045.4437-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avdevice/lavfi: Don't set pkt->size to the value it already has 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" av_new_packet() already sets the size. And if the packet is not allocated by av_new_packet() (which seems to be impossible atm), both pkt->size as well as size are 0, so setting it again is unnecessary in this scenario, too. Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 2b4e9290dc..4f05a1542e 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -464,7 +464,6 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) pkt->stream_index = stream_idx; pkt->pts = frame->pts; pkt->pos = frame->pkt_pos; - pkt->size = size; av_frame_unref(frame); return size; }