From patchwork Wed Jun 14 03:02:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 3972 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp111206vsw; Tue, 13 Jun 2017 20:02:46 -0700 (PDT) X-Received: by 10.223.151.219 with SMTP id t27mr4504877wrb.90.1497409365940; Tue, 13 Jun 2017 20:02:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497409365; cv=none; d=google.com; s=arc-20160816; b=Ze68M1h+9bG1mRMdHiOovk3YbRezDc7Y94Jkz9w4l/I1akLRd0MTVbdADGsIpQJqJv EqMw3yqYef+dFEECSIb/ZSvbb5YKIWi2j6poaR1761AWp/CsQSSSqlJjFZq4htOYIcwU +rbGTRdXM0kT8a6M/pEa4OU6Z+Ke6jaX2ymcDB9yTc2i6J0j+HkEXwNrNqOwLy3KHSap YkQe6m/k4YzASNWCC3ehQ8EaTySbb6gNoFvBQiLSW6CThvM2WHgEOPGF8FdnMI2wJL11 dOuxBQuCY1nic2Hpu7EN0KS6cqzSEvKmjPxAZUkIV7W6O2+YwJ0ic+H4lrzFH+3gHsyG +tpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-disposition:content-language :mime-version:user-agent:date:message-id:from:to:dkim-signature :delivered-to:arc-authentication-results; bh=/yMmnLFkJbGrahYOOyLp4tcZlS+fohk0l6z2PeE2wDo=; b=G8B9Glioe4ryYLV8s3jCb4kVjJA+ZHYG2gr1PH2FLPTnCYudR/ehSJs9hIh3qJBLit c9S3BLvuHR+T1YMKH9ZgxPcnhrbdb5amXqbCpO13zSOuZpsmFvYKvDbBczYDv71Jn2Vy 8LZkckNWoS3qDMb1du23DHekr1JpIIdhpJIL4HKmYrXjhFSssmzL6WdjLiII60RESJWe W5E8QKngq31LJHZlP4QR+dAkjrrkz3TnwjSPnqdUJ7iBAYg9RnLnKA/F0P56HnpzoJRW Ye1vqRxxGySa6VgUncrVVDUfiW+8aFeA8FRqusujtr7oVYDvkHr/TDiJ20hLQ+6z3JuW FxmQ== 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 62si1713895wrg.43.2017.06.13.20.02.45; Tue, 13 Jun 2017 20:02:45 -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 22176688284; Wed, 14 Jun 2017 06:02:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f42.google.com (mail-pg0-f42.google.com [74.125.83.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4AAB688284 for ; Wed, 14 Jun 2017 06:02:34 +0300 (EEST) Received: by mail-pg0-f42.google.com with SMTP id f185so68957699pgc.0 for ; Tue, 13 Jun 2017 20:02:37 -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=PIT1X5vA+oJ7PKqlpOmsodH2oMA870UyB9HEf39fQsE=; b=qMUNhDLoDnpzw6vjXlfGMrK4UIw2Dlee9XrYZlppU/Enw2ARFtzQ8LxwpG78KrxiyW flpneA3q/dMfrW1aUKGgWkD49T7KTfL8uMGnDeK25gvvj0oiQEnf9nRIqsMGVIxTPPmN PvZ3EOmlV153DPMGvVnIra2IJN3aV6wMuo3pXIH064NTsBC9VlP9v62/N6FRo2A2GPJt qw8JZ+2V/tOVTuIK5FKUBXIevAkUFmPNMWHnITymhBBGX2MKI9/L3BIw+sRkP+AnxQqd 3K28tjZdl2LLaG2VPOhiKQnsRkPN0S3W72kXJk2mydv1EoepD50CcxH6W+F+vyzaqjpJ Gp4Q== 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=PIT1X5vA+oJ7PKqlpOmsodH2oMA870UyB9HEf39fQsE=; b=jDM16PWdcAuYV0n3/318x1NcmcLgziMMD8sdAmCJVotlrt28VhMS02wG1PRv1Iq0lK ADUMHD7eKR5VmzYF4YDaTY5bRq6NYWXFf7BdpHp/eFR0IOMr7auzZPwtV9mTPeSJqUYT YyVZWcNOHK9MEceYZ5KupGhyNnmltEiNWEmS91EYWRuZxg1bANelc56inxMmzCvjXyXS Iyq7ZHcyK+/y+cr8hJHKE5JxKEvI3LxcEuZr/DSxwfdhxREjqxAXHZ3sxE2GNVq53uMu QVSKHjKgpxROFMCNws0WnGEb9/sndD9ijTjvTf6/pVRMUdzAO/dwfqQtaNHRct5xL/6M pmPg== X-Gm-Message-State: AKS2vOwtHiTzvWCFSB7lvbPkD3onJXJbimBEovIMS9m5+8G7fGJTQND3 fSYl7HNsSaJ2DAd4 X-Received: by 10.99.145.74 with SMTP id l71mr2318587pge.1.1497409355481; Tue, 13 Jun 2017 20:02:35 -0700 (PDT) Received: from [10.239.204.66] (fmdmzpr02-ext.fm.intel.com. [192.55.55.37]) by smtp.gmail.com with ESMTPSA id y9sm24217205pgc.27.2017.06.13.20.02.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Jun 2017 20:02:34 -0700 (PDT) To: FFmpeg development discussions and patches , Michael Niedermayer From: Jun Zhao Message-ID: <5d5000a9-ba3a-d50d-e909-c5b599b8dea4@gmail.com> Date: Wed, 14 Jun 2017 11:02:32 +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 Content-Disposition: attachment; filename*0="0003-lavc-golobm-Add-set_ue_golomb_long-to-support-up-to-.pa"; filename*1="tch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH V5 3/4] lavc/golobm: Add set_ue_golomb_long to support up to 2^32 -2. 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" From e4ed2cf5a0282ca8bc24bf3d6535b8b445e23341 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Wed, 14 Jun 2017 10:35:20 +0800 Subject: [PATCH V5 3/4] lavc/golobm: Add set_ue_golomb_long to support up to 2^32 -2. add set_ue_golomb_long to support up to 2^32-2. Reviewed-by: Mark Thompson Reviewed-by: Michael Niedermayer Signed-off-by: Jun Zhao --- libavcodec/golomb.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 1e834f9327..efb1eff8aa 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -474,6 +474,21 @@ static inline void set_ue_golomb(PutBitContext *pb, int i) } /** + * write unsigned exp golomb code. 2^32-2 at most. + */ +static inline void set_ue_golomb_long(PutBitContext *pb, uint32_t i) +{ + av_assert2(i <= (UINT32_MAX - 1)); + + if (i < 256) + put_bits(pb, ff_ue_golomb_len[i], i + 1); + else { + int e = av_log2(i + 1); + put_bits64(pb, 2 * e + 1, i + 1); + } +} + +/** * write truncated unsigned exp golomb code. */ static inline void set_te_golomb(PutBitContext *pb, int i, int range)