From patchwork Thu Jan 7 10:43:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24822 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 43A8A44B5B2 for ; Thu, 7 Jan 2021 12:48:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DD76689F86; Thu, 7 Jan 2021 12:48:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f169.google.com (mail-vk1-f169.google.com [209.85.221.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B65AD680BA4 for ; Thu, 7 Jan 2021 12:48:51 +0200 (EET) Received: by mail-vk1-f169.google.com with SMTP id d23so1499995vkf.3 for ; Thu, 07 Jan 2021 02:48:51 -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=na5nmLhZZFH7c5pUF18o3YcHYPn1lSCyi5mHDYeBd48=; b=I5BRn9JVQEVro8G3NIVH8AquPbbP9Vv2gY0rSU00ljQYdxN+qNySXbYPHjRKRPXZ5H KiutaLRaZVzTeDjMAOUn2jUuMr7BphaegZF50aTm4x09CeP3I3z4z4b6ClQJJBli4x80 RUVKxOavhCGHYHS748GrFfvgIIm2HMOYH/p9zSIWfmRFodPuMT6e+RvpALWj+yxcUTl4 F5WyvcdYg65XMiP7F0AbpQ7WrIo1Z+Q8CwUzby1w4TFnldKl/Xti1z3oeWH0nS78syeZ DyQ5rSHjWhY3qX0onNuSpkqYEdba2nA/GgPMFjKCz3VDhEii21A4bo2Xm+YY0fvWLILY CYoQ== 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=na5nmLhZZFH7c5pUF18o3YcHYPn1lSCyi5mHDYeBd48=; b=cSUtZYPJj1oSdY/Nre6Xl1EIXTaFXVloeO5hnzBhvNJ8PwYb0J1R6ofkCxEWUgsH0Y Ozdsg3YDk/M6Nn1DvBjwy7EJmsl6qr8hSbcXb0a2kGWxwek04B9x2cW76s4w8N5udtBc lKem9C2ggNUukwyWv4OHNwQaxloVsOtlNqtLHleIkyqOsuSnpdYBlucahh/BRTJoi5lh SPtC5mfdbSCfaAHTAePNpOWY0Hpuo4pyXMyrDlWNW6yt2Bpip/o/lqD93bJeGjaHC/Ck XsVBuZnnoxCJEskWyVb6gDpa8nGSTbmGtvV4vC3h1zgOFumaKyqyRBkmfvUlv/AA0myX lwVQ== X-Gm-Message-State: AOAM531Wwzgh1BhYuaQsIUk9y9e1zw5ZG23zlpPs+78F5Xq5N81n/asF VuHKyi+SK0Jf5kdmnCrDm8ssND+fEyM= X-Google-Smtp-Source: ABdhPJxbpqiwOZ1TiM/0thq5DjBvMdXgNlP7X7XQ/sVAVnEckx+SA4pV9iIUD8u0RQIX2F2hCvhPnA== X-Received: by 2002:a17:902:b948:b029:dc:102c:b4a with SMTP id h8-20020a170902b948b02900dc102c0b4amr1639218pls.3.1610016220854; Thu, 07 Jan 2021 02:43:40 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id a23sm1769493pju.31.2021.01.07.02.43.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jan 2021 02:43:39 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Jan 2021 18:43:17 +0800 Message-Id: <1610016199-29309-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1609947331-6849-1-git-send-email-lance.lmwang> References: <1609947331-6849-1-git-send-email-lance.lmwang> Subject: [FFmpeg-devel] [PATCH v2 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 | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 13c346a..798b789 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -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,13 +764,13 @@ 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) 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) #endif goto fail; } @@ -779,16 +780,16 @@ static int udp_open(URLContext *h, const char *uri, int flags) * Otherwise, the receiver will drop all packets. */ if (s->udplite_coverage) { - if (setsockopt (udp_fd, IPPROTO_UDPLITE, UDPLITE_SEND_CSCOV, &(s->udplite_coverage), sizeof(s->udplite_coverage)) != 0) + if ((ret = setsockopt (udp_fd, IPPROTO_UDPLITE, UDPLITE_SEND_CSCOV, &(s->udplite_coverage), sizeof(s->udplite_coverage))) != 0) av_log(h, AV_LOG_WARNING, "socket option UDPLITE_SEND_CSCOV not available"); - if (setsockopt (udp_fd, IPPROTO_UDPLITE, UDPLITE_RECV_CSCOV, &(s->udplite_coverage), sizeof(s->udplite_coverage)) != 0) + if ((ret = setsockopt (udp_fd, IPPROTO_UDPLITE, UDPLITE_RECV_CSCOV, &(s->udplite_coverage), sizeof(s->udplite_coverage))) != 0) av_log(h, AV_LOG_WARNING, "socket option UDPLITE_RECV_CSCOV not available"); } 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) goto fail; } @@ -802,7 +803,7 @@ 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"); goto fail; } @@ -814,28 +815,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,18 +845,18 @@ 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)"); goto fail; } } else { /* set udp recv buffer size to the requested value (default UDP_RX_BUF_SIZE) */ tmp = s->buffer_size; - if (setsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, sizeof(tmp)) < 0) { + if ((ret = setsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, sizeof(tmp))) < 0) { ff_log_net_error(h, AV_LOG_WARNING, "setsockopt(SO_RECVBUF)"); } len = sizeof(tmp); - if (getsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, &len) < 0) { + if ((ret = getsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, &len)) < 0) { ff_log_net_error(h, AV_LOG_WARNING, "getsockopt(SO_RCVBUF)"); } else { av_log(h, AV_LOG_DEBUG, "end receive buffer size reported is %d\n", tmp); @@ -867,7 +868,7 @@ 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"); goto fail; } @@ -888,8 +889,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 +922,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 Thu Jan 7 10:43:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24824 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 9B30D4495EB for ; Thu, 7 Jan 2021 13:11:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5808F689F86; Thu, 7 Jan 2021 13:11:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f50.google.com (mail-vs1-f50.google.com [209.85.217.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01251689805 for ; Thu, 7 Jan 2021 13:11:47 +0200 (EET) Received: by mail-vs1-f50.google.com with SMTP id e15so3438588vsa.0 for ; Thu, 07 Jan 2021 03:11:47 -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=upVJ8NdF2RJHFq4X48hZJZlhKrx7py4PTScWLBggiVo=; b=F4YFtp5I0qLmn60itpMXiYmZSGTRXa1ePjBh16Mpnph6Wl2BK1AFtqDveN9oJnimXE TdMNNbza2G4N9iY6cDoZwesFWmnUEHPVzkYUuqTqXMlk6gyr+0nav2ls2j0k+4aqLCvz RPeMSEWQ63DRI5Q3fIVQlrA4zomDDQD6hnzfRhQzL/GJFaG0/+RIjANR/l3Z3FtMEgJU qBalj+MUzQpKBtU1L4rfAsTFV+KGSfqqp2hjMVL0KRuQnKhwGaJC8roCUMbCK7XA9cAa EOAtfEFfLICpThNMOVdLxPjn8S50Mp2mI+XjMTZWwqqfOn/gRsl/vYJqKILJ2A7P6Fhp 1SaA== 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=upVJ8NdF2RJHFq4X48hZJZlhKrx7py4PTScWLBggiVo=; b=hDxHcyTXYDtwDO2XU13tFG0vllKoFmSI5Wj4vazLeEnrnZ5gG8ryFELMW1bQ+NEsPd jwopnY8rtN4T3HKFhvQ5EVkoxvoNAb43bygU6NG/JSDKFpcPP2iFTDFDFimKLIwOLdK3 f4wk5ZHO9qr9XDbwpd1NwWdiw3dQQoy2H5XJasS7mKW+dCy4cgP1ANOFWU6EpYWlT+Z8 3gK+a3hwnl4dH09VfngEE1x7yme3qckm33yCvh10KmOz3+fkZHFw7Wb6eh5rD6ifoLCC u10zEBXRn11HI3EjZoh3nkrSyE2gEXnspN2xoFBye6Zg8r2IZXWxXU5NwRJdKB9XIURQ 2pBw== X-Gm-Message-State: AOAM531PpTlywZy+CYgPdqsa/fgutT9W8R9w/7qV/afqchOJgJTJwK69 hDXlvK10kRBLeQhZYSRLc7q1+I0LOwM= X-Google-Smtp-Source: ABdhPJxosKeG5LaqADCgcYga82nLeJ/GJ0TKUDNexT6YPUtb8v8U/e2EGqQLjwR/q2Gb0Skh2t75Cg== X-Received: by 2002:a17:902:c517:b029:d6:e179:2097 with SMTP id o23-20020a170902c517b02900d6e1792097mr1627665plx.70.1610016222478; Thu, 07 Jan 2021 02:43:42 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id a23sm1769493pju.31.2021.01.07.02.43.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jan 2021 02:43:41 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Jan 2021 18:43:18 +0800 Message-Id: <1610016199-29309-2-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: <1609947331-6849-1-git-send-email-lance.lmwang> <1610016199-29309-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 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 798b789..e6d1235 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -891,6 +891,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 Thu Jan 7 10:43:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24820 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 B499D44A79F for ; Thu, 7 Jan 2021 12:43:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E6A3689995; Thu, 7 Jan 2021 12:43:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6B12688136 for ; Thu, 7 Jan 2021 12:43:45 +0200 (EET) Received: by mail-pf1-f172.google.com with SMTP id c79so3619652pfc.2 for ; Thu, 07 Jan 2021 02:43:45 -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=JDF43S4o9MRXT6A+kL7j2MRHn5aNmO1WEpR6AQ/PTus=; b=aCy2LRul+I5PVdt8FAbm+zmwTp9HsmY1Ml5gkVf4LHKtUWZQWj940Yyztk7hYvvXeK PFEbsL+QSBSHmI3sYWucSY/H3P83AvyGR68QZDee2uxW4UqTy+fYJFmWaL0TIxwt9TDa I7tpccUES3R0ibjDGqLGBB3DtpxD1DBymA6Meof6+DeG/5sgYb5gzVASBmsoHlfsQ0/V VrPxwiF16bvu7QLIakIsNmWAOZnlnt5Zsu6oBqfWry/QLenxShRmnRkzVWuxxuhWvNLo O7vNindZW+HdI68SUPsehaRPOaRchgrbGDZGS+3qhKbgYjAkirGDvwz88291rGMZo2A8 aq0g== 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=JDF43S4o9MRXT6A+kL7j2MRHn5aNmO1WEpR6AQ/PTus=; b=Wo2qxCY1aLNlEkKtH9LcdTEkGYZAiwBfQkMsLm5OKFXuXDEhPOpg/D4aQiNfvwcG0t iNzeDbVS5Tvu1ZSmW5lDYFiai2CkUvsRZArTroL55oqZ4VEZP9vm5uFFdapKeQkocmll hdQod0T/8D6E6BYwQgXssWM2XrH+hY+zfEZRPK236SrfpL+w/dpLHu/uujyxyCXSOMSi gLpVshW5bIMVaIndlnJAIRBMJ/bCAuoso/PD0ZybksA4upGSNiwDbSb4uI70dFOYwGoG DBTam3vuhA9kGtaQiAt5BdCF3aOgPtJs939yXRSAm/N7P921jV8P1zWSLkav1WkTK0U+ gvqQ== X-Gm-Message-State: AOAM5335o74cVt8whmQnGFYHShulm9S0CVFZzOtzjW4oh3Z5vVqVVFEG i5QY+K6G6YxspLaZIRbYYoX5fiELMgQ= X-Google-Smtp-Source: ABdhPJwzWUIYeYRR2Jbx3i+TeziSjIr3uss8b/hblcL7JDGWsRRNu6fzEjTPU+VJvTq3zE4bQRZTUA== X-Received: by 2002:a62:2606:0:b029:1a5:a755:5568 with SMTP id m6-20020a6226060000b02901a5a7555568mr8344763pfm.65.1610016224144; Thu, 07 Jan 2021 02:43:44 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id a23sm1769493pju.31.2021.01.07.02.43.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jan 2021 02:43:43 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Jan 2021 18:43:19 +0800 Message-Id: <1610016199-29309-3-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: <1609947331-6849-1-git-send-email-lance.lmwang> <1610016199-29309-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/3] avformat/mxfenc: prefer to use the existing metadata 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 Please check metadata with below command: ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy out.mxf ./ffmpeg -i out.mxf company_name : FFmpeg product_name : OP1a Muxer product_version : 58.65.101o => company_name : SONY product_name : eVTR product_version : 1.00 So need to update fate-mxf fate test. Signed-off-by: Limin Wang --- libavformat/mxfenc.c | 12 ++++++++---- tests/ref/fate/mxf-d10-user-comments | 2 +- tests/ref/fate/mxf-opatom-user-comments | 2 +- tests/ref/fate/mxf-reel_name | 2 +- tests/ref/fate/mxf-user-comments | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) 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); diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments index de4f26c..4aebcaf 100644 --- a/tests/ref/fate/mxf-d10-user-comments +++ b/tests/ref/fate/mxf-d10-user-comments @@ -1 +1 @@ -68f0fa62b6a676894afbbe4c34ebf70b +84e289a83797e793bfa0d3a31f94ac6c diff --git a/tests/ref/fate/mxf-opatom-user-comments b/tests/ref/fate/mxf-opatom-user-comments index 90e3fb2..374a72a 100644 --- a/tests/ref/fate/mxf-opatom-user-comments +++ b/tests/ref/fate/mxf-opatom-user-comments @@ -1 +1 @@ -f6760a9e710ba478bc3949f3e5c9b34a +e7c41639b79ac54c4df05475fb0eea66 diff --git a/tests/ref/fate/mxf-reel_name b/tests/ref/fate/mxf-reel_name index 16022b1..6e3218f 100644 --- a/tests/ref/fate/mxf-reel_name +++ b/tests/ref/fate/mxf-reel_name @@ -1 +1 @@ -73a891041b2fc836a893ffb49fff4fff +be4c1b76138c855ac3e2d2579cbecc17 diff --git a/tests/ref/fate/mxf-user-comments b/tests/ref/fate/mxf-user-comments index ddf51d9..46db6a3 100644 --- a/tests/ref/fate/mxf-user-comments +++ b/tests/ref/fate/mxf-user-comments @@ -1 +1 @@ -1255faf854223a74d707553121e5eca3 +8f2360104655971dc5fb68f98eda1b84