From patchwork Wed Oct 27 14:27:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31236 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp43369ioa; Wed, 27 Oct 2021 07:27:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzRFILLq+Zzm1SVzt4x7hzNyvMveqIMCpZ069WLmxX0kGzr6B+20hRM1LQrWWe73KUZMnw X-Received: by 2002:a05:6402:26d3:: with SMTP id x19mr45329020edd.291.1635344854300; Wed, 27 Oct 2021 07:27:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635344854; cv=none; d=google.com; s=arc-20160816; b=BbipklLqYQGYCVZZz32Y/xQoMcWSMOpkhnjqoinTBbyPB6eBFi4oQ0GP3IfJK5IvBD 9DI8Z0uVcITV8eJEBHVn29u3Ny8X8/oeRztZC0teAbzINHW4m1J79vblAvi8gtcfReGC UE8FdBufLzVzuRFS79ZbygNoZ4Q76G1LaO22O244kfL7c6sXFrx42Ru/gXch8z+RvY2G o0FCo/tOYLfA63xtsogOcLOJJgYRcYByalv5Mldq3coKVjEBw484CJqExtZlVoDP/aal ofvsAaum0HAfr8/ZUxIYO9riCNVQ4gt1Bf+M8rESjUNB4AV3K8aiXPItNLJvixOSekoc rmwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=FEwuWsSPpoU/2wXQOFyOLG85BQfH3ZK4ADsdZmgo7AM=; b=HgOQbT8NF1pSDaSrNqygwHB25JCUBciNg9DSjf3Pcf3Wd0K9tK4fiN/8mcpaZVScYb 0A+O03/FyV1fA96hnS+xIj40GurpFMbTOtcnvSuKSihoq+PC9AVS+dKJJbJJTBsyhIZX ZHm8nOuILoi2nL/iyv4aOwV4S2x94cjdoN1oBVyF8eudhTEg85wASQAyMWuAQWQQwseM vBOHWuo+z74eY5mt6RH4BQF1hYUU0eySsDFQaSoFMa+39qhLyIG8g0bHtuHw+IlVheT0 uBLozDuDvagMkxqrO0guuPICBYeEWGK4S897kPQJQlzwwAnWLJeCjqBJHsa/JTT6tzln xy4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fQps6A1l; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gt42si28960ejc.129.2021.10.27.07.27.33; Wed, 27 Oct 2021 07:27:34 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fQps6A1l; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19DF168A998; Wed, 27 Oct 2021 17:27:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D240E68A87F for ; Wed, 27 Oct 2021 17:27:24 +0300 (EEST) Received: by mail-pl1-f173.google.com with SMTP id v16so2108275ple.9 for ; Wed, 27 Oct 2021 07:27:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=7kn5j7z82ixfT1iJyHi2j3qm9RUmp5VcARZjxixGVHo=; b=fQps6A1lcJ+bbCLvf4lB4+kTCywr1+RGo/6ow+XyQFQ8QNijVOEKnckPQJVJnRg+zC itJ6Cyzt5atSXjJ4oOk+VK5XyouS6bRG3ny58q+HRKTvqhOfmUlUw6ht2Jl8fSaxRrCx f10B9RyXwzhB63+SKHbDK+cgu7gicTTKl9iQO8zB3O52Qh17hKAbwjopRbOJUmoZ+QFE fkI9LC+AnhqniJonn54Ra8jSwmERRv2g/EVPLX+fOl7L7YtHPZ7vIZbMK0oDKlfTYVtT vgL/s9stLFcWTK98+gXxyrm/hqbCelMvh5dtTnlLzZ5uZ+NbWV80uhqEWsvAecZELO8t 48Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7kn5j7z82ixfT1iJyHi2j3qm9RUmp5VcARZjxixGVHo=; b=6NtuWHJHHJ2SC7lP/8eXgIct37Uj+1zrsaheEKeBVgjLkRQozMqH8RVdlRr6qZ7fsZ mgw7lNLWUf0nhKiXRyqtJu9xu5jJgHK9REP+JOTiuTM7wN4V1CqOeqDVAWFYluSobqQa WDtwSjXInJjMPnuHyT3p0dME+UGAoZHTFJRaz8INKJ9fFhlLD9/ZvAquW6x2ImYCZFnR Hc9mS6XmyYzxHhFZ5KfNLXZwHM4EUnfYvfQnZcdttrQ++zp6RMedbT+qT4TCRJMRUpU+ 4maf+RP4BoiGX0y/cc2qqDF+JRxfFyptAXKwWIc5fPeaf4S0N7VV5k+R9v4IbAufb0G3 dCHg== X-Gm-Message-State: AOAM531hyGh5H+omHrZAKE/BFkTzyBWU01nXVm41Hq3hqlgj2odQ3/sr 7AqB8R7+nad2019FPN1sYBq9JXtURTQ= X-Received: by 2002:a17:902:7783:b0:13d:fee6:8095 with SMTP id o3-20020a170902778300b0013dfee68095mr28713224pll.7.1635344842466; Wed, 27 Oct 2021 07:27:22 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n7sm179964pfd.37.2021.10.27.07.27.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Oct 2021 07:27:22 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Oct 2021 22:27:15 +0800 Message-Id: <1635344836-23293-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/2] avutil/parseutils: add qhd(Quad HD) or wqhd(Wide Quad HD) for 1440p X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: NhBviHRxnD4w From: Limin Wang Signed-off-by: Limin Wang --- libavutil/parseutils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 7f678cd..19bbdde 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -102,6 +102,7 @@ static const VideoSizeAbbr video_size_abbrs[] = { { "wsxga", 1600,1024 }, { "wuxga", 1920,1200 }, { "woxga", 2560,1600 }, + { "wqhd", 2560,1440 }, { "wqsxga", 3200,2048 }, { "wquxga", 3840,2400 }, { "whsxga", 6400,4096 }, @@ -111,6 +112,7 @@ static const VideoSizeAbbr video_size_abbrs[] = { { "hd480", 852, 480 }, { "hd720", 1280, 720 }, { "hd1080", 1920,1080 }, + { "qhd", 2560,1440 }, { "2k", 2048,1080 }, /* Digital Cinema System Specification */ { "2kdci", 2048,1080 }, { "2kflat", 1998,1080 }, From patchwork Wed Oct 27 14:27:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31237 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp43572ioa; Wed, 27 Oct 2021 07:27:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/dzfSgv1Zulf7OqSKWTsGzgM6bRo7O4eNl90aIaWbYo6DEwxTC4z116sPv71syVW5e3vL X-Received: by 2002:a17:906:6a0a:: with SMTP id qw10mr22962998ejc.466.1635344864282; Wed, 27 Oct 2021 07:27:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635344864; cv=none; d=google.com; s=arc-20160816; b=DwYKg07n6A0M4P9HNpHrMdTETszbaDXTiBjWzDaNSeF+ZyRj8hMhqvp7KPfKQXdqQR n+tCKisE0vafS7g2P+rt7s7yDM6e31sW1Xh8azsXkLHmE/MwcAUaa5KGI1Sw2R9h34pK ESABS9ijkSm4OdnYO0yLFWexPeEreROb8V+CuSTB6gw6Tir8A+mVQF9zKIeBABTT7L6e 4bHb1u39ZDKlGb5BSrT29r2Q0KljLRHHzkvgLZ0RONl/brwVRx6CLDQukAjWbazLGtxC Tbh4u5oUdQzOCsh+s+j6X2i9glGybEQnOfnaUzCKID2k5akYEj0+WMkVZ9NZXrpNpr2K 6TTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=yB5YCMSVI62bWgZcu6lLq0Bci+W417r9i2yutQNo7IE=; b=LMIQes9k8D0MpYg/LKce+mGZVXjaHEiUjsnbt0H8aqrpQM4to3AnA6UVaDiilRzqn1 WF9nGJ0fJGzedWAKTXuRWt6xba41SfbHkzp8I/0mrllDdhqkYn7iH8Bw5sJ0z76ZZoe6 8mszbpI3uMdh+Z7mxrAg831cq7Mjo80hiEWpKiQI4ez4MXNT5gBaB87zRT47ffsq45cs ydJCeYbxeVBmsTZRDvtdyykH5cJE6dRQJTETNkuW/A0dNeHnQNQBSiuocZ4CLtcRZQvd wH8mjPD8Z5Droa8rv+umZuUaXMkMBjGOUq10Rb2boidh4hP9+VEBhSjxEHuthdL7/8Mj UupQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="jXwt+/5j"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gb42si17946ejc.301.2021.10.27.07.27.43; Wed, 27 Oct 2021 07:27:44 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="jXwt+/5j"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 26F9168A9C0; Wed, 27 Oct 2021 17:27:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 725B268A948 for ; Wed, 27 Oct 2021 17:27:25 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id z11so2116432plg.8 for ; Wed, 27 Oct 2021 07:27:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QlSE/sbjqLKfjp55QI/DHvhDcPmqRvyBuHVYsRjATOg=; b=jXwt+/5jTTL8QPDj/4gyQg6zXEICtRSWkyNKep8NUn3nPgBNcXSOTEua+JHERFm36t n/LAif/8N51hTRXaFFNvcLkQ3zekEvEYxCGL45/Hoiv0zdpBEJhTG175PtOjt8Gd9Wah K9m+H2Bkt1Pvu4xwgqE84KNK3/5aPH6cnMYJZsoaHy+55/XN/jiwdn9z1Dgy6QQCaH2U Jc67ZFGoJW+V68uD+q/pn2r5yp/RMmIMtZWlavaAN5uCG4DCDX1LiDSMBKaJ8DAAf231 hBht+tv6WIT8YNeY+9qdmVSnFpwjEsRcReUToszU85ZXdc4XeqOvkqxhLlVkoAYP31TX 97Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QlSE/sbjqLKfjp55QI/DHvhDcPmqRvyBuHVYsRjATOg=; b=ZPjYZylYQLDjUINN4QdA/cJBRtRmErA64rDMb5BXQqbMaPhGw3VxoGybVE3Y5a6dwQ MWAB59644yTavMEcnGpcW4psCzgPrETC+hvY9b9cMzVw4PkMSn8eBjQUgXUmK8QsDqTP vva71ElGkA9tKC8gMR1EIMiXLG/RW5f4Ihbv2mY2RhWR1OZz/r/YvDI9Cmvi3scqdhK9 IJOkPpVXmircsXelUna479eWXhAtN0BF0SB3dvks/Z5d5qgxlwy+fa17zLW7qsJiObFm gr5Ng7nVzLbsQVGhLfhz/z8KVwQR8Uuzl6ltusiOAduwCCiAMplYiLBco+9RGniwU2fW JEsA== X-Gm-Message-State: AOAM530vbRBT0ydEL1zUSy0cnA96ztmII8F6DqCTDbBAD4urtg6DKxpe R3iis5RrNaIGDdjU5bliJv4EjiHjWWM= X-Received: by 2002:a17:90a:644d:: with SMTP id y13mr6274086pjm.10.1635344843780; Wed, 27 Oct 2021 07:27:23 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n7sm179964pfd.37.2021.10.27.07.27.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Oct 2021 07:27:23 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Oct 2021 22:27:16 +0800 Message-Id: <1635344836-23293-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1635344836-23293-1-git-send-email-lance.lmwang@gmail.com> References: <1635344836-23293-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/dashenc: Fix comparing double with 0 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: U2mXtBi7weVv From: Limin Wang Signed-off-by: Limin Wang --- libavformat/dashenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 06bbf36..94e77c7 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -551,7 +551,7 @@ static void write_hls_media_playlist(OutputStream *os, AVFormatContext *s, for (i = start_index; i < os->nb_segments; i++) { Segment *seg = os->segments[i]; - if (prog_date_time == 0) { + if (fabs(prog_date_time) < 1e-7) { if (os->nb_segments == 1) prog_date_time = c->start_time_s; else