From patchwork Fri Jan 8 06:32:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24841 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 B214844A2DA for ; Fri, 8 Jan 2021 08:32:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 857856898D8; Fri, 8 Jan 2021 08:32:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BB95687FAA for ; Fri, 8 Jan 2021 08:32:30 +0200 (EET) Received: by mail-pj1-f44.google.com with SMTP id lj6so3127158pjb.0 for ; Thu, 07 Jan 2021 22:32:30 -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=TGDdX9VhxYR6I2xUmOzdb77T01TZk38ZLn5/WrWgmh4=; b=RtabUIhPGS01AZkYsAVk/NENI65c0F/H2a6nQMg785qGoyIBetDLvNhOJJfSXUEAV/ K1KwTs8U/LYD0tSriEdH4MgFTXFO0fgyxUnxZ6GPzPLgT2T6b6bSEU1n/F4BWbwuwXIY K0ix5o7EbJk+5v7pxH9W5bDKos649nJUCFowdoEYgT2/AXWMCaqr2oL/1jQB3aYoJf+P ka6JKZUtvW5pVmEzgInuuRHBVsXT+0DbTVa+eGVECBdlYV2TTohRlxNT0uv/Jbq4qmwe 44Ctc++oBirU7dIxtpu//bRQPFrGlMSR0qOxRgj5i1IFcYjjc/cG0/dRmzRp+IT3dEHX oCkQ== 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=TGDdX9VhxYR6I2xUmOzdb77T01TZk38ZLn5/WrWgmh4=; b=R18UScugIrz8gRDQHQGBpKT1DnHePSRpz6yFrP+6YB+gFb/JaoLcvMVGD3yVIB9HuD nJDNjfljVXO8OojtnSYg/WbFRSFR7Uc//JA9b+l2aPXqhgPb6rzaDqHQh0WGAptnyFfn GirqeKuGEyye3EoLI06iJnWTiw7qv+ueSR7fZl2AnpN+wBmdHyz3KMrHIV3iotb6vLp3 A7nK0PtfTfLSHLRSwlvNRe052hFo8nJN5fmw5weyr+NWxoweptz/7zvC9hfvu5ZRWdD6 iuoxJTu5M1EJFbyioRNRAgSw2k+V4wa346+UA5D85EcrDb+OBsKwnjtjlkDQolRwtrTN RWdw== X-Gm-Message-State: AOAM532dXYmQqLuofZ4lUMTcotCkz0qtr5j321u08FZbzkaA0l2Mt1Fy nDeSgMGeeGDfFlxAZ+GEXHKUlncvDr4= X-Google-Smtp-Source: ABdhPJxGXqDCPXV3kXlss4JYmi8NXvp6SRJoXfIgzIOmUSSvYDjguGIeo7HhiwqNUzmllyxGmsLCMQ== X-Received: by 2002:a17:902:6b02:b029:da:c6c0:d650 with SMTP id o2-20020a1709026b02b02900dac6c0d650mr2407618plk.74.1610087548113; Thu, 07 Jan 2021 22:32:28 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id f9sm7573612pfa.41.2021.01.07.22.32.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jan 2021 22:32:27 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jan 2021 14:32:20 +0800 Message-Id: <1610087542-12587-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 v3 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 | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 13c346a..28987e0 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -633,6 +633,8 @@ 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); + int net_ret = 0; h->is_streamed = 1; @@ -641,12 +643,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 +714,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 +744,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 +765,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 ((net_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 ((net_ret = setsockopt (udp_fd, SOL_SOCKET, SO_BROADCAST, &(s->is_broadcast), sizeof(s->is_broadcast))) != 0) #endif goto fail; } @@ -788,7 +790,7 @@ 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 ((net_ret = setsockopt (udp_fd, IPPROTO_IP, IP_TOS, &dscp, sizeof(dscp))) != 0) goto fail; } @@ -802,7 +804,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 && (net_ret = bind(udp_fd,(struct sockaddr *)&my_addr, len)) < 0) { ff_log_net_error(h, AV_LOG_ERROR, "bind failed"); goto fail; } @@ -814,28 +816,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 ((net_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 ((net_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 ((net_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 ((net_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,7 +846,7 @@ 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 ((net_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; } @@ -867,7 +869,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 (net_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 +890,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); @@ -919,11 +919,13 @@ static int udp_open(URLContext *h, const char *uri, int flags) pthread_mutex_destroy(&s->mutex); #endif fail: + if (net_ret < 0) + ret = ff_neterrno(); if (udp_fd >= 0) 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 Fri Jan 8 06:32:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24842 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 AB64344A2DA for ; Fri, 8 Jan 2021 08:32:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9459B689AB4; Fri, 8 Jan 2021 08:32:38 +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 CC64E689DA7 for ; Fri, 8 Jan 2021 08:32:31 +0200 (EET) Received: by mail-pg1-f172.google.com with SMTP id i7so7033388pgc.8 for ; Thu, 07 Jan 2021 22:32:31 -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=dKuh3RStvFIrC6OFj9R9iBd0HrRS252V4FHc0nlFqpA=; b=TSX5MGKr0lXU+0fVgDSh2waFuCn+DChP0W/80sS2heLb/bR5urDcbkSiPaF/O5g8An RmMej91nIzGTlQigsrxK07ePFdCClu6n9O7k4n9fWZaMiHbznF0Yg/FMMS7JoHaaVPjn r4omp7TQnzVxZZBVyNSBez2ftd53XXP+llPuxkSMQrcidk7mRKfDEQdKb0f3HqU78l7Q stlkzjMXOibXW1F4gaHx2AiGHSxoS6Nq8kTOmV2VEyCRkTKm/LZfZwV5GqJ0a3TvUAwh mXEjUQr4NbV+RQoB3VDcIS9/jxZQZ6A2nw/oT2nb2wMiKWQ9Ps+bSZQ0YHGhdDqn7XKg uxXA== 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=dKuh3RStvFIrC6OFj9R9iBd0HrRS252V4FHc0nlFqpA=; b=bMLmk/WXFcpWMJACmBL0PrWhqAQc3OyVAA+XQm0rvyDweQCUwxgL3/cCaDGKQBsShn V7L9K0GZJonsirs9tGNbxggJnBFZpXM1bBysBB425C2OCA+z8QvKLDJdHCyQd2kuEsZ9 lyucsAT9mG3RxoOyQDO3ojMA2HJzly6kiRsUqHgMcqAd9xtkumVcF1aCTfmV0VTekHcp s2uCE5QHLCR4Xc4C2b5mqHz38s7wjl0vDmIxq7x9fbpBc5arb4sUvD+qtJzLEIvviLa4 OMz8GeQCZPYFnz0H34bLzQ0VOffGdgMs/ef4B4JdJ3ia0jYFuqU4PZnUNEcKipD7zd6Z DZMw== X-Gm-Message-State: AOAM530lQpZavRYBdXhV1D9rW7psTLumbCUCj0h/Ku1js8EAN0sh5zTq XxI5H0vf+pPPtdBdCn/qqWMteCVBmlg= X-Google-Smtp-Source: ABdhPJzpSg4gh+4Qq9DKTL8v7AoSlPo5seeXpB+8m/qQqHSdmhoiVc/umnBfLCPogrPa+emXthVMtg== X-Received: by 2002:a05:6a00:882:b029:19c:5287:4a1e with SMTP id q2-20020a056a000882b029019c52874a1emr5535760pfj.44.1610087549735; Thu, 07 Jan 2021 22:32:29 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id f9sm7573612pfa.41.2021.01.07.22.32.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jan 2021 22:32:29 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jan 2021 14:32:21 +0800 Message-Id: <1610087542-12587-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1610087542-12587-1-git-send-email-lance.lmwang@gmail.com> References: <1610016199-29309-1-git-send-email-lance.lmwang@gmail.com> <1610087542-12587-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 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 28987e0..333a612 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -892,6 +892,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 Fri Jan 8 06:32:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24843 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 BD7FB44A2DA for ; Fri, 8 Jan 2021 08:32:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D4A3689F86; Fri, 8 Jan 2021 08:32:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37888689A15 for ; Fri, 8 Jan 2021 08:32:33 +0200 (EET) Received: by mail-pg1-f178.google.com with SMTP id n7so7051451pgg.2 for ; Thu, 07 Jan 2021 22:32:33 -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=ar8YvzWy3RJRdxQtCQwqnU83hrIokafBQQRnScTiIqILpx5h3QI7sgeGVBpAVdc/QH REFo7cqm+vzNkDR+8gOOM4M50eTwGacL35BRWwmJ1qXHOPGcZVmX8xzTGJ91wWtAY4Uz ypTu8pWZHGI1hdU5duZ90N2yfMqzUjhKu3hNRg4w7YyTrDe0C8WHwMTaLDDozKhIz1DZ TcojhBof1mYG6rs+Hkeoc8x7eZn9XlNTATnOI/JvQHMq4w2ixcBgZmNW3SzSPLYsXqf+ lYQ3fGEoCfpemkwXOaTiges6x9utdYyzDbIwyFqwu9yRpbWsfHKu6ny+Gh79FVpE8MIZ ZNVw== 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=nCWDleQt98Rm4wbdLxmQ0GkxoHmOMjnzEcZmwEG5xLriDFVQxj99FzoVqyBc8DMYVo LzSxVvyZ++98TEwgY0KN2/zmOeJVA8F3dlevDdSsbRBw011aWGhUk90N29Hbmvech7eW EHwCVyxTCGpGiP3PUbBiLVgI1ZUjazVaCu5Qdvse0DWVVxKNK/AA6qcWFaoBh2oGgZem l9ZUKzaMxfq7tKudvtaNQqQzOJgJN0sf5tQrSKSHWBgsyf0N0ZOy6EFbdBaZNcG3oONA MBSOg1ZVGBXTJ1nJfK8NsRV/YnFfu1gvyHPkZwBJNlT9nMH0nOFewKHpinv3gX1aKyVE 5p1g== X-Gm-Message-State: AOAM531fWWyBu6DY1f+LeFUevDwFliitxqfLr+VZr1KW8vHQ4txONWEh XUg1OJVBI1m76kLskQB2VdEP32tJAzw= X-Google-Smtp-Source: ABdhPJzkG4HdnF/OhNqUvMRg8jPaOSxc6JXhRxgwNvM7i+umKR+k1/lL1o4shtYzN6YzN3/nxKXtSQ== X-Received: by 2002:a63:794:: with SMTP id 142mr5490001pgh.187.1610087551392; Thu, 07 Jan 2021 22:32:31 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id f9sm7573612pfa.41.2021.01.07.22.32.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jan 2021 22:32:30 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jan 2021 14:32:22 +0800 Message-Id: <1610087542-12587-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1610087542-12587-1-git-send-email-lance.lmwang@gmail.com> References: <1610016199-29309-1-git-send-email-lance.lmwang@gmail.com> <1610087542-12587-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 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