From patchwork Wed Jun 14 03:00:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 3970 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp110745vsw; Tue, 13 Jun 2017 20:01:06 -0700 (PDT) X-Received: by 10.28.91.209 with SMTP id p200mr4639937wmb.67.1497409266735; Tue, 13 Jun 2017 20:01:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497409266; cv=none; d=google.com; s=arc-20160816; b=sRxid2brpYySWRiqQVEl1hKns7dVOVPhgm1Ms3SZxc43qP1VsV+Kzo3sNr0wEhXn2G 5y0Tf/DzUa1uof5rbWQoW4t9Lf77m+tuyZUMvB1B7xnKJ3OGnAu7BgvkPYZf8BElHAv1 BJhQfjCy/KjXvU2Emt6y4/OjGMjW2aQVWAtYeXPiM30wktB1wmYD+LC5AWd+H8Ufq3sI AjIPaQYNYbEHC2W6nZgXZhBv2U7jkt07zHl/JdU0RlJBdaWkAwR1rstdJx0M5mqc2mcD eW0giKWYjZzMQ7uj7Jv6JpGGbPlrLPXOvyGW3Vg5YCJx4wXsJgLy2rGmEpzRCRNoF3Dr 6iFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=bCyyIbeZ9d6t1MjjjRnStYY/69AHgh7YOmrKcV6CV1k=; b=E/2dcqu9veiPDIBDO2fq9pIFGYmvzkTqGPRkzG7QO6UXiTOsIQrloESMVt01Q3/HiD DlvNFqm2OFFAcWav70iPvtHcOVrJ2+Num88obWuYJZO765GokCI5MO8dENTWlbyZl3cV Un7suaSviQ4bt5IeOa88B3VQlNAKY+ijAWnVyKYGn32o84NoNr2DsvGl06YLeDpMMe5l k6jQupy5fkahdZ3u4awfnL9EWsQ3t1TWZCApE632jtR2SlmiSQtA5i5Pg2zNdIyvEcAh rCiVOWHBkCPlOF2+3XIvLPk1eBJabLM7wm4EFkuqmmISlebS3/ROuwAXhCySUmtTeAI9 Dr0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; 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=NONE 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 2si1887082wmp.127.2017.06.13.20.01.05; Tue, 13 Jun 2017 20:01:06 -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; 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=NONE 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 CACA5689890; Wed, 14 Jun 2017 06:00:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f170.google.com (mail-pf0-f170.google.com [209.85.192.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F60E688284 for ; Wed, 14 Jun 2017 06:00:53 +0300 (EEST) Received: by mail-pf0-f170.google.com with SMTP id 83so76834606pfr.0 for ; Tue, 13 Jun 2017 20:00:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=ZTkWFNa3c03IU1yzXalG38MkEDCokIQEl61owvaflzA=; b=d/9GmLdg8/v9pA5AERXcpusF4TOxbeWtdBUkoDw5/nuoysih3vWnXv0jlJG9+Rdgy8 ozqfQ4Vm2yw2pbjzTu4U1SvwRJl4t5//HBNZZ6bJea3uyQP10yar/y4IjFoBwve7dju/ 98d8mlqgH3tkDIz4zZg/aPG4O3FnnQ4R+NOAO7WhA5ccYDJ+/3XEoegh1sUNN1BniIIA B6NjDaLiZYGLuK4nrvE4TUEjmMguVH2JKWnB4ZuSzYl0FzTnikJ2b7bjvzMqZdAeL2ZN XKd6QAbpHlEqvO6ZSmwIsj+2Ds6kP957yowapLxO4a8EXoQDvsQ3sxlpT5kIHZ/lkyZs U5gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=ZTkWFNa3c03IU1yzXalG38MkEDCokIQEl61owvaflzA=; b=laskK+rX81HodF+P1pnhbSMRy7UDBDOE8dSubUrHPyj5WCvfM3DCLZ3gCcKnrXxKGX MK40tMvVVq0E4L8PyFf81F8JXCfldmerJ2KVEQetllWpNQxGPTOCuS7PYGX3k8iW+UJ8 g1aNCbxdGfUwZxSrkmCwRzUqO91JcPQXepeOgJ8bconooTR37lNFQB/KmpgvUm06oAiI 916JGvxUTml4HzkKafiMYSQmKJFxVYSRuEAbYyf/sYTo/3P0jW1FfCIhw/bzqY0fJcPt 4dJFz7J0cvJGjSZNSgMgija8a0yFbFayRzh9c5bvQzkD/jneKzilipjx5wdpx4EIDq9+ AFdw== X-Gm-Message-State: AKS2vOy25ufeZPniP1QNzkxrLQKGGenhbl8LjL4jbDEZoAOKYtX86nJF MY+JFmmhJL7nBg== X-Received: by 10.99.120.11 with SMTP id t11mr2223940pgc.35.1497409254153; Tue, 13 Jun 2017 20:00:54 -0700 (PDT) Received: from [10.239.204.66] (fmdmzpr02-ext.fm.intel.com. [192.55.55.37]) by smtp.gmail.com with ESMTPSA id r85sm21249500pfd.100.2017.06.13.20.00.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Jun 2017 20:00:53 -0700 (PDT) To: FFmpeg development discussions and patches , Michael Niedermayer From: Jun Zhao Message-ID: Date: Wed, 14 Jun 2017 11:00:50 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH V5 1/4] lavc/golomb: add value range comment for set_ue_golomb(). 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" V5: Split the patch. V4: Fix rang check error in assert base on Mark's review V3: Clean the code logic base on Michael's review. V2: Add set_ue_golomb_long() to support 32bits UE golomb and update the unit test. From 4600950115a215d64cf049233195cfd035ac11cb Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Wed, 14 Jun 2017 10:08:58 +0800 Subject: [PATCH V5 1/4] lavc/golomb: add value range comment for set_ue_golomb(). set_ue_golomb just support 2^16 - 2 at most, becase this function call put_bits, and put_bits just support write up to 31 bits, when write 32 bit in put_bits, it's will overwrite the bit buffer, and the default assert level is 0, the av_assert2(n <= 31 && value < (1U << n)) in put_bits can not be trigger runtime. Signed-off-by: Jun Zhao --- libavcodec/golomb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 4f5514795a..1e834f9327 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -458,7 +458,7 @@ static inline int get_te(GetBitContext *s, int r, char *file, const char *func, #endif /* TRACE */ /** - * write unsigned exp golomb code. + * write unsigned exp golomb code. 2^16 - 2 at most */ static inline void set_ue_golomb(PutBitContext *pb, int i) {