From patchwork Sat Jan 9 05:07:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24848 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 E238C44BAA0 for ; Sat, 9 Jan 2021 07:08:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B1DF6689907; Sat, 9 Jan 2021 07:08:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE96D6881BF for ; Sat, 9 Jan 2021 07:08:18 +0200 (EET) Received: by mail-pg1-f172.google.com with SMTP id g15so8972695pgu.9 for ; Fri, 08 Jan 2021 21:08:18 -0800 (PST) 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=FwmiAS4RfaDcmrP1h5yaD+sGC8m4zXg2qudYIOj1qxk=; b=f35e38y62GW341npPv26NnFwSizWFihyz2wL7H0AFi07bt1YwPpexhGrjkJEvtycWx taDzpZtjqLh639du+7SmA+tnBZrCQsWapUsJUA6ihFbn/YUHMPQsLfGZPhaxeMwgz0w2 VUpeArU7/K7ax+UUS+MSGH05pl80/y9WbagH3XHN9Fd8G9UcZMh4QiMtlnM0+m19ST/r aYTlNhbR898XXH8W1ICTuHoMGVneMk/0+4t1VIZIZJ+674VjaELCRqDHmiLa2/ZmEtaC BXa6MMEw+dwe7dtkyLQnkcHSHYno2zzU+Lni9uGiU/+zjWoTufcAwkyjnejhBarnICiw Q7vA== 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=FwmiAS4RfaDcmrP1h5yaD+sGC8m4zXg2qudYIOj1qxk=; b=pY2Gp5IGgsnYwfkCx2SN7rMmTh9NSMFn6JH7K7+tZ4IKqQNGJxpovA23cW1KXzf5Xo HR9Ws154Kxbik4qoWVC1UU2Wi3LKFCXXkCA8+3ji7qV6A+Y6xJMllVHH7cXYWOS4Dazp iNgPlgvFJ/OENFS1YI1HzAW61Dxqgw81oxbMKccDurAwiAIgFwEb9SHPOzCV4SMyPYun l61DWgqZjcAG2C8toEcEtgINH/tHN5bSE+j2ZCvovxaIP+rvOkK0FOkRD8j7Fx1NCqQ0 FJ2suoyhWrG9p/Rq4aKoP/EVMfAiOFbeGVG88rV1lu8GY7ohA6Ub/GM65Mc9TjMM8FpV eBSQ== X-Gm-Message-State: AOAM530k2qZ/LBWWe3EWrbCYvw0kzlf2btKZ+0B/8WKPsMvt1XO5UvGN DgAnUX5rBS0Ted7lBigQw/RzYjBFE7A= X-Google-Smtp-Source: ABdhPJyt6bjWHo7+QzM/wi4qW0/XObLKyPMInZFTmozjMGG+4Q40HPkj+iRSLgGVoWsZjw3gT4jrug== X-Received: by 2002:a63:5924:: with SMTP id n36mr10309730pgb.9.1610168896545; Fri, 08 Jan 2021 21:08:16 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 8sm10819864pfz.93.2021.01.08.21.08.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jan 2021 21:08:15 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Jan 2021 13:07:26 +0800 Message-Id: <1610168848-17933-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1610016199-29309-1-git-send-email-lance.lmwang@gmail.com> References: <1610016199-29309-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 1/3] avformat/udp: return the error code instead of generic EIO 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/udp.c | 61 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 13c346a..088e30c 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -165,7 +165,7 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, if (addr->sa_family == AF_INET) { if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTL, sizeof(mcastTTL)) < 0) { ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_MULTICAST_TTL)"); - return -1; + return ff_neterrno(); } } #endif @@ -173,7 +173,7 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, if (addr->sa_family == AF_INET6) { if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mcastTTL, sizeof(mcastTTL)) < 0) { ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_MULTICAST_HOPS)"); - return -1; + return ff_neterrno(); } } #endif @@ -193,7 +193,7 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr,struct soc mreq.imr_interface.s_addr = INADDR_ANY; if (setsockopt(sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (const void *)&mreq, sizeof(mreq)) < 0) { ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_ADD_MEMBERSHIP)"); - return -1; + return ff_neterrno(); } } #endif @@ -206,7 +206,7 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr,struct soc mreq6.ipv6mr_interface = 0; if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_ADD_MEMBERSHIP)"); - return -1; + return ff_neterrno(); } } #endif @@ -633,6 +633,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) char buf[256]; struct sockaddr_storage my_addr; socklen_t len; + int ret = AVERROR(EIO); h->is_streamed = 1; @@ -641,12 +642,12 @@ static int udp_open(URLContext *h, const char *uri, int flags) s->buffer_size = is_output ? UDP_TX_BUF_SIZE : UDP_RX_BUF_SIZE; if (s->sources) { - if (ff_ip_parse_sources(h, s->sources, &s->filters) < 0) + if ((ret = ff_ip_parse_sources(h, s->sources, &s->filters)) < 0) goto fail; } if (s->block) { - if (ff_ip_parse_blocks(h, s->block, &s->filters) < 0) + if ((ret = ff_ip_parse_blocks(h, s->block, &s->filters)) < 0) goto fail; } @@ -712,11 +713,11 @@ static int udp_open(URLContext *h, const char *uri, int flags) av_strlcpy(localaddr, buf, sizeof(localaddr)); } if (av_find_info_tag(buf, sizeof(buf), "sources", p)) { - if (ff_ip_parse_sources(h, buf, &s->filters) < 0) + if ((ret = ff_ip_parse_sources(h, buf, &s->filters)) < 0) goto fail; } if (av_find_info_tag(buf, sizeof(buf), "block", p)) { - if (ff_ip_parse_blocks(h, buf, &s->filters) < 0) + if ((ret = ff_ip_parse_blocks(h, buf, &s->filters)) < 0) goto fail; } if (!is_output && av_find_info_tag(buf, sizeof(buf), "timeout", p)) @@ -742,7 +743,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) if (!(flags & AVIO_FLAG_READ)) goto fail; } else { - if (ff_udp_set_remote_url(h, uri) < 0) + if ((ret = ff_udp_set_remote_url(h, uri)) < 0) goto fail; } @@ -763,15 +764,22 @@ static int udp_open(URLContext *h, const char *uri, int flags) */ if (s->reuse_socket > 0 || (s->is_multicast && s->reuse_socket < 0)) { s->reuse_socket = 1; - if (setsockopt (udp_fd, SOL_SOCKET, SO_REUSEADDR, &(s->reuse_socket), sizeof(s->reuse_socket)) != 0) + if ((ret = setsockopt (udp_fd, SOL_SOCKET, SO_REUSEADDR, &(s->reuse_socket), sizeof(s->reuse_socket))) != 0) { + ret = ff_neterrno(); goto fail; + } } if (s->is_broadcast) { #ifdef SO_BROADCAST - if (setsockopt (udp_fd, SOL_SOCKET, SO_BROADCAST, &(s->is_broadcast), sizeof(s->is_broadcast)) != 0) + if ((ret = setsockopt (udp_fd, SOL_SOCKET, SO_BROADCAST, &(s->is_broadcast), sizeof(s->is_broadcast))) != 0) { + ret = ff_neterrno(); + goto fail; + } +#else + ret = AVERROR(EINVAL); + goto fail; #endif - goto fail; } /* Set the checksum coverage for UDP-Lite (RFC 3828) for sending and receiving. @@ -788,8 +796,10 @@ static int udp_open(URLContext *h, const char *uri, int flags) if (dscp >= 0) { dscp <<= 2; - if (setsockopt (udp_fd, IPPROTO_IP, IP_TOS, &dscp, sizeof(dscp)) != 0) + if ((ret = setsockopt (udp_fd, IPPROTO_IP, IP_TOS, &dscp, sizeof(dscp))) != 0) { + ret = ff_neterrno(); goto fail; + } } /* If multicast, try binding the multicast address first, to avoid @@ -802,8 +812,9 @@ static int udp_open(URLContext *h, const char *uri, int flags) /* bind to the local address if not multicast or if the multicast * bind failed */ /* the bind is needed to give a port to the socket now */ - if (bind_ret < 0 && bind(udp_fd,(struct sockaddr *)&my_addr, len) < 0) { + if (bind_ret < 0 && (ret = bind(udp_fd,(struct sockaddr *)&my_addr, len)) < 0) { ff_log_net_error(h, AV_LOG_ERROR, "bind failed"); + ret = ff_neterrno(); goto fail; } @@ -814,28 +825,28 @@ static int udp_open(URLContext *h, const char *uri, int flags) if (s->is_multicast) { if (h->flags & AVIO_FLAG_WRITE) { /* output */ - if (udp_set_multicast_ttl(udp_fd, s->ttl, (struct sockaddr *)&s->dest_addr) < 0) + if ((ret = udp_set_multicast_ttl(udp_fd, s->ttl, (struct sockaddr *)&s->dest_addr)) < 0) goto fail; } if (h->flags & AVIO_FLAG_READ) { /* input */ if (s->filters.nb_include_addrs) { - if (udp_set_multicast_sources(h, udp_fd, + if ((ret = udp_set_multicast_sources(h, udp_fd, (struct sockaddr *)&s->dest_addr, s->dest_addr_len, &s->local_addr_storage, s->filters.include_addrs, - s->filters.nb_include_addrs, 1) < 0) + s->filters.nb_include_addrs, 1)) < 0) goto fail; } else { - if (udp_join_multicast_group(udp_fd, (struct sockaddr *)&s->dest_addr,(struct sockaddr *)&s->local_addr_storage) < 0) + if ((ret = udp_join_multicast_group(udp_fd, (struct sockaddr *)&s->dest_addr,(struct sockaddr *)&s->local_addr_storage)) < 0) goto fail; } if (s->filters.nb_exclude_addrs) { - if (udp_set_multicast_sources(h, udp_fd, + if ((ret = udp_set_multicast_sources(h, udp_fd, (struct sockaddr *)&s->dest_addr, s->dest_addr_len, &s->local_addr_storage, s->filters.exclude_addrs, - s->filters.nb_exclude_addrs, 0) < 0) + s->filters.nb_exclude_addrs, 0)) < 0) goto fail; } } @@ -844,8 +855,9 @@ static int udp_open(URLContext *h, const char *uri, int flags) if (is_output) { /* limit the tx buf size to limit latency */ tmp = s->buffer_size; - if (setsockopt(udp_fd, SOL_SOCKET, SO_SNDBUF, &tmp, sizeof(tmp)) < 0) { + if ((ret = setsockopt(udp_fd, SOL_SOCKET, SO_SNDBUF, &tmp, sizeof(tmp))) < 0) { ff_log_net_error(h, AV_LOG_ERROR, "setsockopt(SO_SNDBUF)"); + ret = ff_neterrno(); goto fail; } } else { @@ -867,8 +879,9 @@ static int udp_open(URLContext *h, const char *uri, int flags) ff_socket_nonblock(udp_fd, 1); } if (s->is_connected) { - if (connect(udp_fd, (struct sockaddr *) &s->dest_addr, s->dest_addr_len)) { + if (ret = connect(udp_fd, (struct sockaddr *) &s->dest_addr, s->dest_addr_len)) { ff_log_net_error(h, AV_LOG_ERROR, "connect"); + ret = ff_neterrno(); goto fail; } } @@ -888,8 +901,6 @@ static int udp_open(URLContext *h, const char *uri, int flags) } if ((!is_output && s->circular_buffer_size) || (is_output && s->bitrate && s->circular_buffer_size)) { - int ret; - /* start the task going */ s->fifo = av_fifo_alloc(s->circular_buffer_size); ret = pthread_mutex_init(&s->mutex, NULL); @@ -923,7 +934,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) closesocket(udp_fd); av_fifo_freep(&s->fifo); ff_ip_reset_filters(&s->filters); - return AVERROR(EIO); + return ret; } static int udplite_open(URLContext *h, const char *uri, int flags) From patchwork Sat Jan 9 05:07:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24849 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 0422D44BAA0 for ; Sat, 9 Jan 2021 07:08:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D8AB768A295; Sat, 9 Jan 2021 07:08:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89BEA689A01 for ; Sat, 9 Jan 2021 07:08:20 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id b8so6796188plx.0 for ; Fri, 08 Jan 2021 21:08:20 -0800 (PST) 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=2qMMBa4TygRWQ7Gt48nu2bQER/ZDe2WGWcCJlTortsE=; b=lSPOc19KwlEZ8VL2hq18PsXcZ1lm/+dyHLMIuameAng9eauJnMol3bIR7EMlQCe2Ya sd82MucSXD3XleUVOLnGY2TG1yf7HVWCDklTNog6AnSnAGDa37KpvE5F1T7a60RcssNG PpGcWogETh/+xKCOLx9lgGVqdH/hfvmLuihGc4zVx6G8KJjAnJGvBl5vwoagg99SO75H 4ke7gqigKEunz4S0Ehad8iKC/oNLUZepgZ4BijKCyfCzwXYBgI6f6QDmDRKTqJ730WA8 rzUl/DmYUmRQ/ZGEbPSqEVyu6Vkdf7pA+Q2dFW8e9lozEOvlj/gkNuv1v/uvPkACSt+m X7Ig== 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=2qMMBa4TygRWQ7Gt48nu2bQER/ZDe2WGWcCJlTortsE=; b=A4fOhaAwPUyF0Qgfuo+us25xnTNcLX3eZ2HzGaZUJRT/B2nxhQDAQGMPsJwYfCWOS2 L7anMmtCpHwv1pk5lGt+WkW5HtnvkFCHOzr92BvqXPmurZ6f2AkhX0TgmmAzZjNPef79 sZ9InIWy5l3sbLnh2bFHuHC9lJaXGq+3lC4xKEqVzihqq15ZeXyCbSu4D0TFxhm0rLHW yUg1Wspb9njqnYivHFBoz5eZYo27gkwHVPtAF/VuJLplO2AEzl2pqXqL+g7ywL01S21B KnFX22G3hwt5nF0iit55ltztTEhZhS4ii33xjwnc4/49nL1p7h0WjT0XvHL/G/IAQ78b SEWg== X-Gm-Message-State: AOAM533CLll8EhQzVo/OExJffzGyd+cfyQmr38z7/Lwlc46uyNTVZ2zj KcLU4xMe9U10HHXljeC3Y3VY4e0D9KY= X-Google-Smtp-Source: ABdhPJzCWLW4oPf0DBslo/DUVG1CXBvXmpHBWqc+JI1vJ1HAI30NR/ZP/Iw5DxnZyD9HIcRQkgM9SA== X-Received: by 2002:a17:90b:d93:: with SMTP id bg19mr7195368pjb.46.1610168898198; Fri, 08 Jan 2021 21:08:18 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 8sm10819864pfz.93.2021.01.08.21.08.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jan 2021 21:08:17 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Jan 2021 13:07:27 +0800 Message-Id: <1610168848-17933-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1610168848-17933-1-git-send-email-lance.lmwang@gmail.com> References: <1610016199-29309-1-git-send-email-lance.lmwang@gmail.com> <1610168848-17933-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 2/3] avformat/udp: add memory alloc checks 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/udp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/udp.c b/libavformat/udp.c index 088e30c..a7fbb94 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -903,6 +903,10 @@ static int udp_open(URLContext *h, const char *uri, int flags) if ((!is_output && s->circular_buffer_size) || (is_output && s->bitrate && s->circular_buffer_size)) { /* start the task going */ s->fifo = av_fifo_alloc(s->circular_buffer_size); + if (!s->fifo) { + ret = AVERROR(ENOMEM); + goto fail; + } ret = pthread_mutex_init(&s->mutex, NULL); if (ret != 0) { av_log(h, AV_LOG_ERROR, "pthread_mutex_init failed : %s\n", strerror(ret)); From patchwork Sat Jan 9 05:07:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24850 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 0B35D44BAA0 for ; Sat, 9 Jan 2021 07:08:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E731A68A5CC; Sat, 9 Jan 2021 07:08:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0DD568A57E for ; Sat, 9 Jan 2021 07:08:21 +0200 (EET) Received: by mail-pj1-f49.google.com with SMTP id n3so6423102pjm.1 for ; Fri, 08 Jan 2021 21:08:21 -0800 (PST) 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=EOq4oWykskhuMIV+xgFkevWuxeHefIuMw2xmHh4lcVE=; b=kz197To2pjXdZTSNAc+3hW6cmOrX7BpuqqZVoJtyZ0WBWFv/qys1QLao01EDgM/AJI MKtipIuj8UKGJiFMzeP+PdUCcFAysX1Ppeh3pcma0o9KOwCOTntkNGuRVGsP/zNGLvjp FD2p6xPEoUW5BWO26/K4cf9pd6gpn+aG7xr5/+QntyE23ivGpRHQ/5eoEx/Xjx5ZcOsf +XGVz520bfsZy0aMvvWkS8UJDxshmuGI8Un1egonRpMgAfGIibdQYKO0AJQKLZc5sPOI rSJAgB+b1eHNFmzW6f2HewdaB8CCwTBtOLCIs8kg2F4kw2TpVCfWqxySMONHAAwGd87F t3OA== 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=EOq4oWykskhuMIV+xgFkevWuxeHefIuMw2xmHh4lcVE=; b=PT9YxX03k08R6xwdRLrtvavYLgH54S7cG2gheiBVXC+ffrdeh01s5KoiqGM+mvJFGX EI5416HsgfZ0o216p0hloJy67MfZhft05QWaEZNIPX2EyND+FPcxePChol7YBwPJHgy9 dkW1j4nxmIrU8g2pRBt17QqLXYA36Wz4R7kB/PaD85NT1VGic8c8G6rlGVQZcnAx6aV4 aVY88kw6W90luEbjwyai8jZyJewoJl9DUBtvoOjpEWUFP/y6LUdTylarkJ2PGzR+iRBC goE+mlFJxh1zIPTRoI9klDdnjHAH9Tlz7qGd/iNsUISQ8RQ79/VCi1PcBOGRxGAZN2sV CflQ== X-Gm-Message-State: AOAM533K3OyBEYuGLT2EmnHgfY14OlGbyp8pk3jF3PwNCg/4VqGhndas JX/8+AUJxqPX3J3cbE60f72s10KLS68= X-Google-Smtp-Source: ABdhPJwX+s/ouoJDsmE7LD+O3wJhfV4EeWGWBdSNdD9qlgJmKuf9dfXyA76CHqePyr0v9HrkQpVMGQ== X-Received: by 2002:a17:902:302:b029:db:fa52:2dd2 with SMTP id 2-20020a1709020302b02900dbfa522dd2mr7188852pld.62.1610168899823; Fri, 08 Jan 2021 21:08:19 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 8sm10819864pfz.93.2021.01.08.21.08.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jan 2021 21:08:19 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Jan 2021 13:07:28 +0800 Message-Id: <1610168848-17933-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1610168848-17933-1-git-send-email-lance.lmwang@gmail.com> References: <1610016199-29309-1-git-send-email-lance.lmwang@gmail.com> <1610168848-17933-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 3/3] avformat/mxfenc: prefer to use the configured metadta 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 The metadata company_name, product_name, product_version from input file will be deleted to avoid overwriting information Please to test with below command: ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy out.mxf and ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy \ -metadata company_name="xxx" \ -metadata product_name="xxx" \ -metadata product_version="xxx" \ out.mxf Signed-off-by: Limin Wang --- fftools/ffmpeg_opt.c | 3 +++ libavformat/mxfenc.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index c295514..493763b 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -2650,6 +2650,9 @@ loop_end: if(o->recording_time != INT64_MAX) av_dict_set(&oc->metadata, "duration", NULL, 0); av_dict_set(&oc->metadata, "creation_time", NULL, 0); + av_dict_set(&oc->metadata, "company_name", NULL, 0); + av_dict_set(&oc->metadata, "product_name", NULL, 0); + av_dict_set(&oc->metadata, "product_version", NULL, 0); } if (!o->metadata_streams_manual) for (i = of->ost_index; i < nb_output_streams; i++) { diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index d8678c9..5244211 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -722,16 +722,20 @@ static void mxf_write_identification(AVFormatContext *s) { MXFContext *mxf = s->priv_data; AVIOContext *pb = s->pb; - const char *company = "FFmpeg"; - const char *product = s->oformat != &ff_mxf_opatom_muxer ? "OP1a Muxer" : "OPAtom Muxer"; - const char *version; + AVDictionaryEntry *com_entry = av_dict_get(s->metadata, "company_name", NULL, 0); + AVDictionaryEntry *product_entry = av_dict_get(s->metadata, "product_name", NULL, 0); + AVDictionaryEntry *version_entry = av_dict_get(s->metadata, "product_version", NULL, 0); + const char *company = com_entry ? com_entry->value : "FFmpeg"; + const char *product = product_entry ? product_entry->value : s->oformat != &ff_mxf_opatom_muxer ? "OP1a Muxer" : "OPAtom Muxer"; + const char *version = NULL; + const char *product_version = version_entry ? version_entry->value : AV_STRINGIFY(LIBAVFORMAT_VERSION); int length; mxf_write_metadata_key(pb, 0x013000); PRINT_KEY(s, "identification key", pb->buf_ptr - 16); version = s->flags & AVFMT_FLAG_BITEXACT ? - "0.0.0" : AV_STRINGIFY(LIBAVFORMAT_VERSION); + "0.0.0" : product_version; length = 100 +mxf_utf16_local_tag_length(company) + mxf_utf16_local_tag_length(product) + mxf_utf16_local_tag_length(version);