From patchwork Wed Nov 1 17:33:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 5816 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1040841jah; Wed, 1 Nov 2017 10:33:38 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TY1N5SEVcGwydkwkfgYH8RuaqRIDjGSJVOlzHn3AwgsgP5uKc7kOCm3Wupayi0Yj89LHUg X-Received: by 10.223.172.245 with SMTP id o108mr515923wrc.122.1509557618576; Wed, 01 Nov 2017 10:33:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509557618; cv=none; d=google.com; s=arc-20160816; b=lVO6IHSnUFMj7Y1WldH7KNqQF7zzJBG7PgKOk8mqodC4exyQelgDdVZ7ublByxopmy drAziqjAuh9HpuEGt0Nu1dOup3zleCPJYbLz2MDWMX1kOxjiTlzg20LxF5FnDLVqzFp+ kyn8XTRqibUHx3k+PaFaGfI0PFlYs7qBumg80ZTjLALGS8RPgpljmoJGtCrV6UpfE7gV jOXygtIqiJ5y8GydpWXuKYK1prFw6wvWDK3aIXlEo4NhsL2ybs7IMpgdlQWWgxc/DneG r4S4V9g1l1OTn9vHNnRSa1cx1SxUZGSpzYX9A7iB9hXml6xWEiteKjq3Gk7NCMj0dmmW SvNg== 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:to :message-id:date:from:references:in-reply-to:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=JoGU/AwAGCbxZdK3i3qF/teEjAdoWbEWbETBGU4Izcw=; b=cVAx0Df6y6RBz3SKE4RRhprY0qSdGjCkIbuiwXJevYb2o/otfKbAdgUN67KX5bC13I +J7RRAzslrSvsWjZZoVuFh+NOOwa+EbzfjH/chqldo5wkxn37Y2uhodYWjKAD61xcWMs Wk188ihKtoXqVhh7Zq5mcJUO1OEkCI+CvjFHrGGC6veRx/Iu7l9MIEoomK6fovRHGknW kzReZIbni+SS3afV8oXfH2dpjeR64mnMNlNAy/uPrpbDveIesxOb4r+93mVhv4enp+/D VzueJPbMCXpd7PtYSsbWK/xm+C9z1b2SFJQW9kxOu7Mi90IrJtsbNzuUjFzfxea7riq3 3pDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ffsDpt1s; 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 f15si1129967wmg.97.2017.11.01.10.33.38; Wed, 01 Nov 2017 10:33:38 -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=ffsDpt1s; 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 312EB68A157; Wed, 1 Nov 2017 19:33:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f182.google.com (mail-io0-f182.google.com [209.85.223.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B83F689FC8 for ; Wed, 1 Nov 2017 19:33:21 +0200 (EET) Received: by mail-io0-f182.google.com with SMTP id 134so7770491ioo.0 for ; Wed, 01 Nov 2017 10:33:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=Z5wriq0yPJjXJA99e7yqbDl2umqw67OGx6Shg40hRHU=; b=ffsDpt1scdfk50OKLP8mGTB8HJAPjNRsvsCk/v/quhiQNTlRHQmpeA4PYXYcNNGBYO /qBa6VB9KiLabjQZksoIvIosimOe8zxLH6DX4t3y0WUK5FqjZC3b/mtnDBJ4h1vmm67Q TecRElwTHYEKD7liYWiYkR5u0ebPaM3VjFQxgjpE19xFrbpnCu0dYJE8fw0vCL6Os4Z7 P1y+2SedJqEWwsF8TaNmMyBlntrHe4onV1PsvgUCUNvyXT5IEsDA8hKsOEGsZ/foqRIC 19p2gSXDypZzqfB0sjygbZGdIn6ILRaDw3TIqelCik/QEAtLHdRxFZfw3+p/dCkllf0M K2mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=Z5wriq0yPJjXJA99e7yqbDl2umqw67OGx6Shg40hRHU=; b=iSMNBnvTJZ7SCoaDyk8nEIOGk06iTpi89DP8eziCvRttnU8vgWBvr7UhSrswS/8ao2 mwcxiq9bCm2PrvxGY3+cwfNrdtReAytoid/XbPi1llx+EFOxN1G0ggKSWVY6IKPzIYkj t1aEjAwL5Cw/j/QzAg9nj9njcgVvXOrI7GG+776+VF5gwXL9NN1Wn+ioWgh7UQ3a1YBO oC88idXhr5I0/OmtLMMkjqiHYE1GvZAfxvTO0KZGbt13HmfqomCrOv1Fhm5tejerlr03 5cvO36RJUtGLjuu5wTz6u+hXK5+9sC4Tj0UaR1KPrI9nkptlGNDiklEiK7HgmTLg2si3 r1MA== X-Gm-Message-State: AMCzsaXnpc8hR0tgG5AsHAheJWOKIO0nRf2oLnPeS/e+PjxS3b6oeUUY jNflo1qrgGkI7bGs5jEAxJjl7s0RcnQMCeHgfdk= X-Received: by 10.36.8.136 with SMTP id 130mr1528297itc.18.1509557610255; Wed, 01 Nov 2017 10:33:30 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.63.101 with HTTP; Wed, 1 Nov 2017 10:33:09 -0700 (PDT) In-Reply-To: References: From: Carl Eugen Hoyos Date: Wed, 1 Nov 2017 18:33:09 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH]lavc/pcm-dvd: Do not use an incompatible pointer on big-endian. 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" 2017-11-01 18:18 GMT+01:00 Hendrik Leppkes : > On Wed, Nov 1, 2017 at 5:13 PM, Carl Eugen Hoyos wrote: >> Hi! >> >> Attached patch silences a gcc warning, tested with Fever.vob >> >> >> @@ -163,10 +162,12 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src, >> switch (avctx->bits_per_coded_sample) { >> case 16: { >> #if HAVE_BIGENDIAN >> + int8_t *dst16 = dst; >> bytestream2_get_buffer(&gb, dst16, blocks * s->block_size); >> - dst16 += blocks * s->block_size / 2; >> + dst16 += blocks * s->block_size; >> #else >> int samples = blocks * avctx->channels; >> + int16_t *dst16 = dst; >> do { >> *dst16++ = bytestream2_get_be16u(&gb); >> } while (--samples); > > This results in quite misleading code. dst16 is named like that > because its a 16-bit pointer, using the same pointer with different > types based on this ifdef seems error-prone in the future. Agree, new patch attached. Thank you, Carl Eugen From 8a2b3dd7be86c0494cb2f09088fb1ad92e910571 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 1 Nov 2017 18:24:15 +0100 Subject: [PATCH] lavc/pcm-bluray: Do not use incompatible pointers on big-endian. Fixes the following gcc warnings: libavcodec/pcm-bluray.c:172:45: warning: passing argument 2 of 'bytestream2_get_buffer' from incompatible pointer type libavcodec/pcm-bluray.c:192:49: warning: passing argument 2 of 'bytestream2_get_buffer' from incompatible pointer type --- libavcodec/pcm-bluray.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c index 517d7b5..8f961c3 100644 --- a/libavcodec/pcm-bluray.c +++ b/libavcodec/pcm-bluray.c @@ -169,7 +169,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, samples *= num_source_channels; if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, buf_size); + bytestream2_get_buffer(&gb, frame->data[0], buf_size); #else do { *dst16++ = bytestream2_get_be16u(&gb); @@ -189,8 +189,9 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { do { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, avctx->channels * 2); - dst16 += avctx->channels; + uint8_t *dst = frame->data[0]; + bytestream2_get_buffer(&gb, dst, avctx->channels * 2); + dst += avctx->channels * 2; #else channel = avctx->channels; do { -- 1.7.10.4