From patchwork Tue Aug 28 01:59:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 10157 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp7080447jap; Mon, 27 Aug 2018 18:59:25 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZQx5jCrGeTgArhHQXVRWmFhGLvU85gAnNDuo0HPKHQr068GlnSDYimg2rpwmXCWGGxUm6b X-Received: by 2002:a1c:3712:: with SMTP id e18-v6mr6827904wma.84.1535421565015; Mon, 27 Aug 2018 18:59:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535421565; cv=none; d=google.com; s=arc-20160816; b=FUr1fgj5lpET6cPu5BhDdLwgo497sQIHGr5eqYelR5kN4Q8LTSpZpsD02yZLGVj1+w ebQHzAi0ViBc207jyPH+StTF6SJC5nfNDhh4fQkKVA4GaovQ9wdOTH3xqHJ/szdAD7Hb KnVVc4uWsmknKdsra9RQjgP9KdBhJQA3OZb/npA9BRYuf5p2r+OsyIR31MT00N3VfH+x p84ISRcMFcgDGlok+YB8Gh1ktAslX8c6y30c4wVbo9Dcb9GBXraX2W1sw5Pa5/VlDxRp +22yJ9nTVspSZsDmk7AOeOI5VnXkjbyGBKHNlMCCKz7D20XbhXJGdFoY6fpN24pQodyP POgQ== 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: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:arc-authentication-results; bh=tyakD1gZmKCLpmlj/E6a64nuLi6sdjic0I2D0zBUDjU=; b=Fqq8XAorg3XMiAHhZQbg3lc+VdDe70BxCPhtok0dZjOqDBlLAJTfLfGtkS5gde7nHT rRPDBiNBQW7EQqd6W1Ib4EWYQ+38VqmZH1CfesqKOcpievCL4c+9lUJrd6/IZdylkUam p8FO7dTe9lqg19FWTyI0mjcMN+pFqN+DPXP26aZFcvsVY+YV1Lw+DbgOrzhasRUiD9Eg zG0To+FRr031DILgklNuIXWw+aR598KsKIdrLEC1vEnUBy1fZOJYTe95WWP5xTdDsfzJ aNVsRU0OFfvAR22tUM+EjWNWZjhO+KREMglUVmDLSinZ6OTR1LnEb+Cr10psnrZfWOnZ g0QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pKQjrdaQ; 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 p8-v6si788738wrd.112.2018.08.27.18.59.24; Mon, 27 Aug 2018 18:59:24 -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=20161025 header.b=pKQjrdaQ; 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 12637689C30; Tue, 28 Aug 2018 04:59:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBBF6688251 for ; Tue, 28 Aug 2018 04:59:12 +0300 (EEST) Received: by mail-qt0-f196.google.com with SMTP id j7-v6so33003qtp.2 for ; Mon, 27 Aug 2018 18:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=r0HyW3NhqD56mlvThonWX2U8PyfRjuuDQaestug9bck=; b=pKQjrdaQYgENG7N55frG+cyYf7Oox9KGx94toXHxzRtHKXCx40U+IVkATJp13LydKT dMy9xfCJjPVyTgjUj6fYCFtT/nmzQcPMtSVLUl6aCXXM3YrTPuUBrhsZcPY/qZrW8myT jHBbbCAvZTl9d2Ct3ziSAWyWSzFYC08bKwApYjSCQQeyR/SRmsIVJqYfxijlCJCoQHmz SlduG212Cz9VcNsE3vm/nI1PqkU4qRPuNSDhaKxAJAvpn7iDIUhwfsqn72i9k7RbAXDh JOQU4C8Wia7m2pWs6f15hyt7ZgMH/x69X8JGsvRnw9MWecusZZhttXO6+6WuT2bZ1kSn 6RqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=r0HyW3NhqD56mlvThonWX2U8PyfRjuuDQaestug9bck=; b=B0uusy6INo1ywOd1BAvoNhT0i53rJIAfsGAvl+dhk2rQIeT1jHEPSfOGjESW8ejqUY 03BAF+jAGJ+7312AIAQMPeYsP+F+CGQgUG4OdRuzFLOcNPOHIAfX2U3goag3yLG7LNMS Xy4cyyCOlORko0ytIoiPncynFGrWRJyiUUSEJfpvE1K86X7UGKzNCVQ+539n4AD0VOhF l/QuavkDbVc5fAmsbK7NArCQxBDB3thY3cm5jm3MrnWS/FJwOwOwFN6uBT85gqXml6oE pBWzPqeZu/FcxVdt/HaF0rhTGrVx4Ud1Uz9I92HKsTweAk6hmQe9ohRCPkvGnGbjwG3T ABdw== X-Gm-Message-State: APzg51COfXhHHQPr7ipNGnLCn1+cGLKyFH2i0AxH0w9SAWVDAb65z0jc inYoOzq4mOV6HEA61FgM0fn6HHQd X-Received: by 2002:ac8:1981:: with SMTP id u1-v6mr17098422qtj.296.1535421554935; Mon, 27 Aug 2018 18:59:14 -0700 (PDT) Received: from localhost.localdomain ([181.231.186.237]) by smtp.gmail.com with ESMTPSA id f2-v6sm460340qkm.51.2018.08.27.18.59.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Aug 2018 18:59:14 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Aug 2018 22:59:04 -0300 Message-Id: <20180828015904.7572-1-jamrial@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH] avformat/vpcc: fix values in VP9 level detection heuristics 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The levels are stored as decimal values, not hexadecimal. Signed-off-by: James Almer --- libavformat/vpcc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavformat/vpcc.c b/libavformat/vpcc.c index 79514483af..e0b7f288a6 100644 --- a/libavformat/vpcc.c +++ b/libavformat/vpcc.c @@ -81,33 +81,33 @@ static int get_vp9_level(AVCodecParameters *par, AVRational *frame_rate) { if (picture_size <= 0) { return 0; } else if (sample_rate <= 829440 && picture_size <= 36864) { - return 0x10; + return 10; } else if (sample_rate <= 2764800 && picture_size <= 73728) { - return 0x11; + return 11; } else if (sample_rate <= 4608000 && picture_size <= 122880) { - return 0x20; + return 20; } else if (sample_rate <= 9216000 && picture_size <= 245760) { - return 0x21; + return 21; } else if (sample_rate <= 20736000 && picture_size <= 552960) { - return 0x30; + return 30; } else if (sample_rate <= 36864000 && picture_size <= 983040) { - return 0x31; + return 31; } else if (sample_rate <= 83558400 && picture_size <= 2228224) { - return 0x40; + return 40; } else if (sample_rate <= 160432128 && picture_size <= 2228224) { - return 0x41; + return 41; } else if (sample_rate <= 311951360 && picture_size <= 8912896) { - return 0x50; + return 50; } else if (sample_rate <= 588251136 && picture_size <= 8912896) { - return 0x51; + return 51; } else if (sample_rate <= 1176502272 && picture_size <= 8912896) { - return 0x52; + return 52; } else if (sample_rate <= 1176502272 && picture_size <= 35651584) { - return 0x60; + return 60; } else if (sample_rate <= 2353004544 && picture_size <= 35651584) { - return 0x61; + return 61; } else if (sample_rate <= 4706009088 && picture_size <= 35651584) { - return 0x62; + return 62; } else { return 0; }