From patchwork Sun Jul 18 01:21:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 28960 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3149119ios; Sat, 17 Jul 2021 18:22:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8geI9Z2+/m+1T1Ci9soGxEz+4qdjUvb6SFOlsi0fya5wG5erCUPVrJeak7kaOdUX4k5NX X-Received: by 2002:aa7:c1cc:: with SMTP id d12mr25301026edp.282.1626571356944; Sat, 17 Jul 2021 18:22:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626571356; cv=none; d=google.com; s=arc-20160816; b=pfGidBT4M8TaGjqrS+6L+iGGV1CgBNeMnfPU8r7WXiad391TXVDdsijKYNM61FmPEA wW6k8yqONSkwdFXvVZZUgbXXQq8p/n6997d+Qnku+M7j+MWTfjmdzXAsnEDQ3FxwUqbA QmE7vPcvRM/E6jR+4YbVzRfkze1yP/S4v4BcB96FtvGRtzfXXc/Glae6RY8iqN05C9jP OMAdXTcA41jJ6i2TZK8kc9/nb0wcCGHqykWpmO+lviKrL+sBi6GCMmejr42gPn61eDWS DH5mhYDUH1p6fEcPSNQgQBvhJi8Ulz0c54qmcdR46rtyc+K6QPtOcaHdaYrF1HVL0F1C kYZA== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=M+hDvfdrNpIugpuqj/3/GN+5l2mxdp5y7EW3xsEH97M=; b=KeJKzaSrQRO7wHzVUw/iUVdpkc27Q5R5U00Ue5Da5HRsMv9wl2OlVv0pc2wGR648kb 7IWTeY933SGT841ignv+S8CNzHscsFluax/yGRGwlYcmhukZGS+n3X+UCz28BEjOp/0f 9kmCI4J9HJtktZjD6CypJ+HgJYiKEJzaaTBt+lPOTEV0+LnlU4QfT+4nxqoaCaU2dSlo VYg9yVKgP7U+WNByRV3jKBnzDaU9qZdWLi89KzfeaQFN8+W0JSZLaRjhvuW8vg73rLnL 5jJRl726kS1CJ/0euq9PqDlNLM6Z9t0bawVzDCo3iSBAOiV4yGKmUJGvExGV+FmWhm8p PuuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=GZtyfxEL; 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=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m3si16700511edr.6.2021.07.17.18.22.36; Sat, 17 Jul 2021 18:22:36 -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=@zanevaniperen.com header.s=key1 header.b=GZtyfxEL; 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=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0781F689D48; Sun, 18 Jul 2021 04:22:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2E0168A457 for ; Sun, 18 Jul 2021 04:22:24 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1626571344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=IsEY2T92JJXGvczTsXbhm0J6A8/lqlQ2dRmFstSml7c=; b=GZtyfxELTus+7609Mbqx/NEGgjmt9XWJ/vwRNxBZfjoXsEGz8H4eTYwUlrhKmQz53Efs32 zI8j2inOXyqV8g/jX2N8CG8Sgf6RqbA2uVpbxrtchVCOupP/jpzESbVwZjbVn29k+K6lLH fq+ZSltT4VTZ5SrQBOYImavdVH2UKkhgbgDZxrziiGN6Hz1fyyLy6DOOLT3XY7uRKdLhy7 2rmAdk+14faVbohrfy2dpbvPi+BJcw3eJwYFAAODWOlNX7lMIyF3UlPL14WSF74Yx3RRB8 aemIOEHtJmNampTdqEUsq0yITQwH9Z3FKVSpjTB6s1k9PIIxF/Q/Rwo/GGKqvQ== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jul 2021 11:21:57 +1000 Message-Id: <20210718012204.97733-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 1/8] avcodec/argo: use pixel format provided by the demuxer 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +jETqOac57Nx But fall back to bits_per_raw_sample, in case we're with older libavformat. Signed-off-by: Zane van Iperen --- libavcodec/argo.c | 21 ++++++++++++++------- libavcodec/version.h | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/libavcodec/argo.c b/libavcodec/argo.c index 87c646f56c..9df5b8a8d3 100644 --- a/libavcodec/argo.c +++ b/libavcodec/argo.c @@ -676,13 +676,20 @@ static av_cold int decode_init(AVCodecContext *avctx) { ArgoContext *s = avctx->priv_data; - switch (avctx->bits_per_raw_sample) { - case 8: s->bpp = 1; - avctx->pix_fmt = AV_PIX_FMT_PAL8; break; - case 24: s->bpp = 4; - avctx->pix_fmt = AV_PIX_FMT_BGR0; break; - default: avpriv_request_sample(s, "depth == %u", avctx->bits_per_raw_sample); - return AVERROR_PATCHWELCOME; + if (avctx->pix_fmt == AV_PIX_FMT_NONE) { + /* For compat with older libavformat. */ + switch (avctx->bits_per_raw_sample) { + case 8: s->bpp = 1; + avctx->pix_fmt = AV_PIX_FMT_PAL8; break; + case 24: s->bpp = 4; + avctx->pix_fmt = AV_PIX_FMT_BGR0; break; + default: avpriv_request_sample(s, "depth == %u", avctx->bits_per_raw_sample); + return AVERROR_PATCHWELCOME; + } + } + + if (avctx->pix_fmt != AV_PIX_FMT_PAL8 && avctx->pix_fmt != AV_PIX_FMT_BGR0) { + return AVERROR_INVALIDDATA; } s->frame = av_frame_alloc(); diff --git a/libavcodec/version.h b/libavcodec/version.h index c660f70669..91325ce4e7 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 59 #define LIBAVCODEC_VERSION_MINOR 3 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ From patchwork Sun Jul 18 01:21:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 28961 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3149199ios; Sat, 17 Jul 2021 18:22:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYVPNhsAFVZgQRQ9LUTu31wC95JfnNAF9ED4OO+kI5llI6NpjpRw/U0DStAEcMOLjfgQ7n X-Received: by 2002:a17:906:150c:: with SMTP id b12mr19790474ejd.275.1626571368609; Sat, 17 Jul 2021 18:22:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626571368; cv=none; d=google.com; s=arc-20160816; b=cyi5GZtqFCJvRZDlntlTRomNorvTt3oiP/ytscpdZrgwkPKH4hX6QiPr/WvabJOEik ok83qGVRQvF4heQ66Ps9q4EkFAADnWVYQyh0m1ZPORjbDWxcWKoDYWA+c7/Abfkghdr9 PUevuN+7aEK3VUW+yEjek0pW/EfUDH3iwXMe3glP0pKPcgLgTA24nBwrXLVgFd2/QUci EBPH75ZNi7L0MBLMtWl+bwB7I9wB5Gy1kwFrUbdhxN6NXeFzdtkE3jlxdvoB7bwNPdFo /A4Jbh3zguvGl9WCMmPkZkP43JaWvF+GZW4IIhmo2Ue3j49N2pN/iaVtQDYtNVi9AKRb 8O+A== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=DeGGSqYLRxaODzMjONnKmlfm/1Vjzh5SSB5LovEkA2E=; b=DVwE8WNoAPCVQzisW6IAWa2YfXqC3JpYzxKV4qJ0Y8mn75qyt/FhZrt6X9RaXWCszZ 67PmZ5ZY/00m/bTpaU7KLVSHyMLZCyBmnISWmzYjsccRoxLK9VD7qUwkJ4N7mOz507hz SKdtzmeN/AV0PTX1yT2IAbHPPAX5mBDFVShfniaGYiy3+rrYQuSGybEngnU1SxqDwK95 lLXfW+KTUq803nc6MvmFhz9Zi+b3F9FEDb1k4KIk/db/ZnvYmWXTBydTwTd4fuuu+Zdo 8X/Ol37ANxZWNlOOYv2DIFAEXm/r0xh8BabfbWj75BsQJIUailurIfMzf+PxQVIf0qEZ X36Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=b6OVLmXZ; 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=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ay3si9912414ejb.646.2021.07.17.18.22.48; Sat, 17 Jul 2021 18:22:48 -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=@zanevaniperen.com header.s=key1 header.b=b6OVLmXZ; 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=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F69368A880; Sun, 18 Jul 2021 04:22:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FAEC68A787 for ; Sun, 18 Jul 2021 04:22:26 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1626571345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ojToAO+MR7xv7ub1ur70Hxdruqq4ywXfZHiNNt/hC2E=; b=b6OVLmXZDBwYPJD8ysdJjijLhDGM2IqwmQUBpeHXC6RNBocJyh4rJMkfPwhiSRWzitgmiR e/P0Ztmc9l1p5GApIEyuFuyTEzUFtM+sOwSTTWg9ISdMidDC2fTfRrgS0w3ycYjmV0XnsE YPOKiGWb4SvPMkU/s4pIK1E8g9QByM0le5jFW79uLJBNcG++ldRepwt8M/Vpwmerq8dDjz /WsF2x9k32ZgRfBnsarLHiI3pR4J9zHC4H1kE5Al+y2hOwfYTsjNSb6pPtqoCo52WMOwtV 4v3384ZYNqVgZPn41KCZPqsRpOWpEu1/qaWoHAweoN8YT708KxkaTr0KPMweMw== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jul 2021 11:21:58 +1000 Message-Id: <20210718012204.97733-2-zane@zanevaniperen.com> In-Reply-To: <20210718012204.97733-1-zane@zanevaniperen.com> References: <20210718012204.97733-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 2/8] avformat/argo_brp: set pixel format directly 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OHZNUHfLEUQd Signed-off-by: Zane van Iperen --- libavformat/argo_brp.c | 11 ++++++++++- libavformat/version.h | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libavformat/argo_brp.c b/libavformat/argo_brp.c index 059418cd1d..6cc0c4a3f8 100644 --- a/libavformat/argo_brp.c +++ b/libavformat/argo_brp.c @@ -230,7 +230,16 @@ static int argo_brp_read_header(AVFormatContext *s) st->codecpar->width = bvid->width; st->codecpar->height = bvid->height; st->nb_frames = bvid->num_frames; - st->codecpar->bits_per_raw_sample = bvid->depth; + + if (bvid->depth == 8) { + st->codecpar->format = AV_PIX_FMT_PAL8; + } else if (bvid->depth == 24) { + st->codecpar->format = AV_PIX_FMT_BGR0; + } else { + st->codecpar->format = AV_PIX_FMT_NONE; + avpriv_request_sample(s, "depth == %u", bvid->depth); + } + } else if (hdr->codec_id == BRP_CODEC_ID_BASF) { /* * It would make the demuxer significantly more complicated diff --git a/libavformat/version.h b/libavformat/version.h index 6519bba101..03eb20ad82 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 #define LIBAVFORMAT_VERSION_MINOR 4 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ From patchwork Sun Jul 18 01:21:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 28959 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3149291ios; Sat, 17 Jul 2021 18:22:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxkA3oYu+CHjrs3iaK2j6Re/HgFw8kV4eW/xZCpoxs5OEWDrlQUB867nfVqS2zOjEk2q4S X-Received: by 2002:a17:906:8306:: with SMTP id j6mr19806126ejx.505.1626571379703; Sat, 17 Jul 2021 18:22:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626571379; cv=none; d=google.com; s=arc-20160816; b=cALpp3PH+pAPCE9oLD/GZbDqrKR+W2ForDYqUsK6NaKUaMwXhOYiSvNpetL5A23/cS il7kaXFcVW2xb/ENgUGrehkK7EY9fjWzG8jZtrkgDFmtILP2MRRj0ZXQdLRXkx2TZHmZ y3RaBi5bZ1BhKyemS8RAky3ofhVXyMczQIGszzWxwYqFpU7zOJ0dwTGmzXB8KyvTI+x2 TTLxW2H8HtWK15uBt4ifEMc/zfOPwTE98AmxGBe8+cQHlaLrL65bvzuN8k8PxjZeJZt+ 2RPpaShfsga6jsXXJhysM4eZgyOUME3Q6KRITbh0CLZcQ2LmuEwai0Q24gYcqd8oIB5k JqcA== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=2MI3he1w6MltSMD+XG9JNxIZRDHdWbBp4Ydx28LqeIk=; b=088FjLS97VyqooIMnEJoP2N0yBAoTIksmqkEJZDdEKi5WGgpU1xd5f1OW2rJmfV0Jr rZjBtFi7trfb2ikhBXIg4jQHD/YmT/CXWLydPTazsX5O6aTzhV4D4x2hDXqAbd+oQ61S B4Kl5zLwiq0IU3pdid3XQoYR1mAsiMUbkTnMV/pqU1qpuAleoLQTwFVDfXa02BVWdZN1 aZbPsjF7/c0EBSqSrAtyWUTojYLVzd2ZXFiRQuyezxFkNadIddO6JBvT9m4hIvEMsFhR LoFpnAC5ELjQrs8sJ+X8DMNTSgtY2mN0h92H7rKxGCTw4KTzhucmVkRzglsJ36Pzymno BEcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=EeKGVknE; 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=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y20si16381854ejr.227.2021.07.17.18.22.57; Sat, 17 Jul 2021 18:22:59 -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=@zanevaniperen.com header.s=key1 header.b=EeKGVknE; 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=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36DBF68A882; Sun, 18 Jul 2021 04:22:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 33C0268A881 for ; Sun, 18 Jul 2021 04:22:28 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1626571347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=whVQxctyYjq/wGL8KwwHrAW91JCwea4swkxAaHxukRI=; b=EeKGVknE32vCPkBY/S2g8nHmbSGC8v1kNXBiKDmSoqz9gtKGI/2J92QmuPcU919OwvR1uJ SsiBNhthdjhFoamPf7aRYy2ajz9HOV2SMvsfNFQZFv6tyh1qqpyROVyP3xG5qPOI71WdQZ jLAmTAmuvHS7H55U/xwHk7uvGW+eQZJQqvzRJKWEC3Y9Lxsn+NB6JJBqqbzo5iQ+bklfqH VorbqBmke4h8XaLgA+M3yGyx+a6SaN3MzQTA1mvX1w0N8C+tmmf02qOQpiwfWkYdsa8AhI IBGsvc9tip2HtUUfx7yh1NzNohvI4fLMqX8pde8mlD8P4qDXgNc428nuHJI40g== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jul 2021 11:21:59 +1000 Message-Id: <20210718012204.97733-3-zane@zanevaniperen.com> In-Reply-To: <20210718012204.97733-1-zane@zanevaniperen.com> References: <20210718012204.97733-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 3/8] avformat/argo_cvg: don't set bits_per_raw_sample 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TiKGpRWAek3y Signed-off-by: Zane van Iperen --- libavformat/argo_cvg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c index 73db777199..37288a1496 100644 --- a/libavformat/argo_cvg.c +++ b/libavformat/argo_cvg.c @@ -183,7 +183,6 @@ static int argo_cvg_read_header(AVFormatContext *s) par->channel_layout = AV_CH_LAYOUT_MONO; par->bits_per_coded_sample = 4; - par->bits_per_raw_sample = 16; par->block_align = ARGO_CVG_BLOCK_ALIGN; par->bit_rate = par->sample_rate * par->bits_per_coded_sample; From patchwork Sun Jul 18 01:22:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 28957 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3149350ios; Sat, 17 Jul 2021 18:23:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7TUiRSc6WWDpANxCj6ynrVLK17bLKxtxq0FnLn9dzU9FLxUoYaUGKNfxO+F/nYJBwQgze X-Received: by 2002:a05:6402:1657:: with SMTP id s23mr1988751edx.180.1626571389063; Sat, 17 Jul 2021 18:23:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626571389; cv=none; d=google.com; s=arc-20160816; b=WB6qbNNydB7ZyPlq9YOqUMqIT3v3b0AYinSEIBBydRko1FpngXTfiDtMWVRV6wkfEe pa3lA8GjPBAiAnurpWOVdHuO6Mses5nSi8X4eYvbY6sN+psK0HC+LONB3q/0NfSxlGox sazAzXPjJ1SFvnedTfe3UFUvfTaaeN+uRsQ1PfdRqNV2mfsVUfyzo5wWOoEWydyHfONB 0miZIq6F4Fp4fTMihzDRUBqWGR4P/hvI2m0ylTQq6PjZ7bCsmV975eHUbttJ4MgufdPg taCN3Eym29FAuYcSOXLSyHjtrWJOK6RJGe+I+QhX2Fxe4LfssyWn3Z59l5ibGhfKs4v4 LgGA== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=BtCZcYS8ONqzTcE6dhbq1EfoHuyKhKNxDlyOrhuu13o=; b=FEFYrw8NbWr1bhVfjJSdnsEldojNCAnFjkwXAhjPDOwN0U20mAywoB/SHigF3RWq8n ZViZnquD9xfHfwjETkELGA3gatUG2SdybqeSMJi6p60wJMpgwTLXYRHxxpriHKtH9P8V EzmCJ3t5L+r5HLDs5X5jz9nVHPU9Q0kuIv1xloiUG+eJs6Ab3lc1dMGfMFFrZHDT+zjM 4FhX8SyCdX2EHG3Kvmcfc2AyF3NzFm9MwRVkEBQqoR/2mM7favAlA1/xfHo1KkQsrg1/ /W6kOL9MUmiWvx/oAA9n5P2DnWibdN5LWAGZ/MPbWDbXL3DEVrm1r0rc+sLXlZEAP6/3 HswA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=LP+bTRan; 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=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id oz27si605126ejb.250.2021.07.17.18.23.08; Sat, 17 Jul 2021 18:23:09 -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=@zanevaniperen.com header.s=key1 header.b=LP+bTRan; 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=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3BE0068A457; Sun, 18 Jul 2021 04:22:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF8EB68A882 for ; Sun, 18 Jul 2021 04:22:29 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1626571349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Cgj8Mfv63B1/E+Dw+ZYZY2bcEZKf0jBn3K93+Nm/KmY=; b=LP+bTRan+uThrh7r6OgaUtmCzJT0nG88r4inwNkU8+tmHeuWeDa6cy+X8INXD1WVLMGK81 D/JHNERqSB4gdsMvZUcRFGU3oW3kn6s1LhtrRPZlAO/YMGXDwLZPnxGBhlcv3+uPGHsX/V HSr/2nPBAKlntc4Y9dAhQgRuevNAXj2N4YPuxahbYOGn6sAPoTwy3FXKS6UwjEYWKsAIaH G47qMKM4X2Ab5NfK5oZAkVU8HHoAWRsbW+opJsZ1pCuCNUqFaB7Lk8MHPlLHsUolacuKxP tQ9LzpWIT0ZvWcyPOkS+Q6RvI+oa2N2ZPcOhVicVYQcOxfJ9IO55BTH9y+A2wg== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jul 2021 11:22:00 +1000 Message-Id: <20210718012204.97733-4-zane@zanevaniperen.com> In-Reply-To: <20210718012204.97733-1-zane@zanevaniperen.com> References: <20210718012204.97733-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 4/8] avformat/argo_asf: don't set bits_per_raw_sample 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lVmA1ScMqvUM Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index c3ac49fdc2..ef647ae20c 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -109,12 +109,7 @@ int ff_argo_asf_fill_stream(AVFormatContext *s, AVStream *st, const ArgoASFFileH st->codecpar->bits_per_coded_sample = 4; - if (ckhdr->flags & ASF_CF_BITS_PER_SAMPLE) - st->codecpar->bits_per_raw_sample = 16; - else - st->codecpar->bits_per_raw_sample = 8; - - if (st->codecpar->bits_per_raw_sample != 16) { + if (!(ckhdr->flags & ASF_CF_BITS_PER_SAMPLE)) { /* The header allows for these, but I've never seen any files with them. */ avpriv_request_sample(s, "Non 16-bit samples"); return AVERROR_PATCHWELCOME; From patchwork Sun Jul 18 01:22:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 28958 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3149432ios; Sat, 17 Jul 2021 18:23:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyv9qkxnoBYq+msJs1/xKEGPq/Xvf0eDJOxJGpQexr75kO7417wQlKj0kWnUYGwl1dSAXZ7 X-Received: by 2002:a17:906:6c8f:: with SMTP id s15mr20335454ejr.498.1626571400271; Sat, 17 Jul 2021 18:23:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626571400; cv=none; d=google.com; s=arc-20160816; b=iiGxRQfdbKHTsPEhw5YRi0mebeAiK3aGnoCMbzFMwyeXwZhkx0fkzziEbBA5Jb08Mx 1xSN7xymT3Rs3u6H3gzBUDgRSLpYY3/Wc5eOGhsrzzogUP88KcO34Ec2PLak9HK1mlZ1 rFNiebPQq1mHGwzsTvlvtP0DdY7V4jxAUyRpufC9ktNOpPt58yjKeeW8bGejIP50Pf3a ewqtjZ0TSR45AzH8nKQGZJMcDoRm2L4fQqAqmRbahqmOJ2U7LHU+99y9XA79Z8PwWbQN gkHCYxE2X5UVErYGBQFc9iMumyaMuItZzRKhVudcOd7KQxT57Bj2F761phhdibUDtOBO 9bLA== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=N5Xca4SSonfPA5eVBUtpW7Mdeac482YlDt3tJzkjAjc=; b=1A29RfE2p3m6LDefXBbEAZ0ROY7vOTd5dWCYT2skbxtsHgLPIyD6jJ5uWEkfyUhy2H A8/teV8QkNbW3BghQ9R/v5r4PEIrqr0pbjVUIL6QWFEoEweUtRJCt+4cwhVxSnGROUF6 v5A+4yfPsyiuXNGtntv52VGgl+bwa7WmxX5/wITO53F6c/FsD9Wom1oc4iOdLJNwTCDK 9D62VAxBP+y1DtrDCzHPhPFOkMoMUkg7D162m/34nSKwosFJ57Rn2K0dosufswcTi18N 3E9xhobrb0PhFVbxzZxeK58OXDyQw47zIY9RApYKysdCBnFLy13tTiOJkMwIB47leGoF e2ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=imDCPf9H; 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=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j5si16408050ejs.749.2021.07.17.18.23.19; Sat, 17 Jul 2021 18:23:20 -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=@zanevaniperen.com header.s=key1 header.b=imDCPf9H; 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=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 53A3568A8EE; Sun, 18 Jul 2021 04:22:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92B8968A8DC for ; Sun, 18 Jul 2021 04:22:31 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1626571351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oxjrjap596BVlWBExCxNFF+IrqhMsS49xP7LaPbT62E=; b=imDCPf9HySjWRMVm/c2xfIjGjnyhib58/H421B+Eo6Zmkvc6wZKRN5ifB04bIRmhjceCF6 d8IUW4URqyuGafAAfrDJp29W0LoHLyC+ulWtsC2Fhv2niQWr/5RMhLvFlL6ti6Gt/hnkdX 7KMAd26f8izXSXQd9zeduCG/gUlieIA8SVTtpe9Iu7NCIsFJ/K0CpCACp31ZShtw/ppEId gz5vij7NuxqXpgWzqUg8FccGdcEXqa+kLXoYIuzPh0jgK5eH7y9Cp+/L2lmkmxiKD+0bmI +5ojbh3DIb+mlHV4I8B/Crlf9w8Rq0+Lw8Qb0guxMzuI/dxBpNFM+crhA2iuaA== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jul 2021 11:22:01 +1000 Message-Id: <20210718012204.97733-5-zane@zanevaniperen.com> In-Reply-To: <20210718012204.97733-1-zane@zanevaniperen.com> References: <20210718012204.97733-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 5/8] avformat/alp: don't set bits_per_raw_sample 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7WRP3M5tdUCO Signed-off-by: Zane van Iperen --- libavformat/alp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/alp.c b/libavformat/alp.c index bc19f02083..4876015f4b 100644 --- a/libavformat/alp.c +++ b/libavformat/alp.c @@ -127,7 +127,6 @@ static int alp_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; par->bits_per_coded_sample = 4; - par->bits_per_raw_sample = 16; par->block_align = 1; par->bit_rate = par->channels * par->sample_rate * From patchwork Sun Jul 18 01:22:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 28963 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3149496ios; Sat, 17 Jul 2021 18:23:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPxz1NgzLLqM2lseHfo2P3L0i/bNfN+gcKCKttX2jS2vfEUsT4pRI42V7TXX7bMU4HEChU X-Received: by 2002:aa7:c39a:: with SMTP id k26mr25770799edq.24.1626571411039; Sat, 17 Jul 2021 18:23:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626571411; cv=none; d=google.com; s=arc-20160816; b=kr1Yzq0LPKlF2vtzsEquMGh1a+M4uwyo82G7HxJJPAyUdyIf+Dg8erut8Tx1/7sSRr tjuATqVmKMcY45iMwW624Y/RtniOltC0SJ7tcQy9u9czJ/nUW2SDfX/qypkkqoJIiMU6 CLBflBRspDZQS/Sbwc1pkExmxb9HD7+PcfZNPk7tQlSZBYwFqS8LGxB0XsUHBuo8bFau zyZo2sz2P2Q+YmVs+TTBw8pY53xoFn1d4CkPQqb7jvTZ3fRUfme/Z3Lq9ERztD6GS6Po PsznILs+KJwKstqgJWocOwLY+YL5L0M1hPpYHvRzeuo2fpmNrSQhMzN/rv3GLLJuGWUK gPzg== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Zxu2XvllK+DRNHWAdiS30rUvDb8WqRclLV/mO6u+nnk=; b=y/49qcLwxBUHZzTyBh9gAzT0Mc3FelXLvE9ML8EjTH/v6l40WFNCW3dBzVcWmDPKDA thivB1aNijaKV+7bGqyMgAcDhF1a7f1cKMU+/N55bVsnd9i7vQr3BSFOTACBC9Tq2ExE CKnB5l0P2JnhzCX/FQdu5LtUi6r8EkyacMtZ+aq1nLAXvUTotheAcbk2YJPLX90mkRXj ELZlVSCNeHk3u+BRhreFvdcgeXordxzqvh5MG0Rfj12FmbrgZrwIBLAbp3nyanwwc3dq O/aVihd3AaeGkIcZhCtVhS6qVNUB2ptGbFIS2xUHVceP6pfhINEscn6UOoz0RZCjVkkA 501w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=T9Aeot6Y; 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=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c11si19062409edy.282.2021.07.17.18.23.30; Sat, 17 Jul 2021 18:23:31 -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=@zanevaniperen.com header.s=key1 header.b=T9Aeot6Y; 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=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 682E468A8F3; Sun, 18 Jul 2021 04:22:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FF5A68A8F1 for ; Sun, 18 Jul 2021 04:22:33 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1626571353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9VJyhuaVPZoAl8wGhr5Gf+YeHnraOQnZwFtw8vwgWzU=; b=T9Aeot6YhLzGgjqvzLa0zVZM3vTztumtIjt8+VGnFyg+GN9RrJYuq0HXfby1f1W7dgGy+5 5n0Pmra3wLdu8LMKaCBawuVOsWSCqEPnw0U9YuPrupNLqejydYAokwpe5PZZMDuwRurbL3 M3gxSgA+m2r5555ZyNn2UKpEImdPOJOpD24y3gi4mBaCmfeyEdOafmAuYI0jfiOK8qVoMp jdG+r3qaj+nMtvf2omL3EEdR8HuYp7HrE5ZPJLQtTw50s/LvmSYex1WMEx6DGXKfNZ0/sj CCCx7QORpnXYxYPWXhzw03WbBo/3d/BvCdDRFdZ+itFfm0AOFhslmYhzxgtauw== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jul 2021 11:22:02 +1000 Message-Id: <20210718012204.97733-6-zane@zanevaniperen.com> In-Reply-To: <20210718012204.97733-1-zane@zanevaniperen.com> References: <20210718012204.97733-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 6/8] avformat/apm: don't set bits_per_raw_sample 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EE/BplHOcNwu Signed-off-by: Zane van Iperen --- libavformat/apm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/apm.c b/libavformat/apm.c index 6ae53b8712..6a047c5095 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -146,7 +146,6 @@ static int apm_read_header(AVFormatContext *s) par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_id = AV_CODEC_ID_ADPCM_IMA_APM; par->format = AV_SAMPLE_FMT_S16; - par->bits_per_raw_sample = 16; par->bit_rate = par->channels * par->sample_rate * par->bits_per_coded_sample; From patchwork Sun Jul 18 01:22:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 28962 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3149556ios; Sat, 17 Jul 2021 18:23:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0vYRRUUQYf3JA1wBTpSSPUKys+YDdRMMfZjVVao5+mNm+upQj3Vfrp/iNf69DMusxE7Nz X-Received: by 2002:a17:907:76ef:: with SMTP id kg15mr456529ejc.364.1626571421334; Sat, 17 Jul 2021 18:23:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626571421; cv=none; d=google.com; s=arc-20160816; b=AmZ2pfIIUJdkfUWnprQ5WloftSDFrllZMIoFBVPLlUZZupjcH24j63Amono6TebkgK mAw1iBhCv9k57sdZzXDAw/1/01b8wOzhYiRk7//8qteRjo9PhvaW+VhdYctFpiV3EM0Y ByBIblKKkQzyjzPJTHuOPFmPzXdOVXl1v7+MIO13pOZQFGtnGo22mEo/IKZQoXsKgI+x bMr/4iAmyPIuaaIPwG2I4bfxU0fdjRy+Sn256atK3wwmHRIlu37CqqAYjhkP90lDT3j4 SG6/buhpNXE51RXA/SQpeGh3q2wWEYZo7GIOpvywTKk1mJDUh1BGVpZQ6Evn3PAI24/i RQkA== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=BLJBVVPoM3hx7KPNRKhasDtnrslgsnmnn1k52eVkvyI=; b=v3r1uVwa7mLT11cInYKHQurhVOIG4/UcIyKxWBH6/R+k7Lbc6Y67MiYAuFURBMQhJZ hwCHNo1qPy65L3jud4siuvnQ2dCPffa1UbMjlr1YuHrQFvK5XMPMeqJ5IKHQJ1hsG+8/ h5t1bInYdHyJ4F9MTy/h5L6A5bI35qjKdCazQMwU+OMoWRJul/LTDNvfmlz8N7qKDUbj E2/FBdCEKOABYP67K7m/HGzRdTdOQ5tyPTmEVVZG8iGVI78dyWdMJ/CGGXNReYABk9gd bOqp7L3tgjwjgp66QLcnUMGBlEF4sb1INRZYpTxLsGJwMAQesuhdx8KwyOe5II4BPqPY Jt8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=AkHaCLw7; 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=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f8si15796134ejx.293.2021.07.17.18.23.41; Sat, 17 Jul 2021 18:23:41 -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=@zanevaniperen.com header.s=key1 header.b=AkHaCLw7; 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=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9603C68A906; Sun, 18 Jul 2021 04:22:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26FAD68A8F3 for ; Sun, 18 Jul 2021 04:22:35 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1626571354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Atq6h7AyMMb2w80Mqya3tj4qnYe48K8dQWHvYjZfp54=; b=AkHaCLw7oIVYoUAoO6uZq2XwTR1mSS5l579Fqw2HC2w/pOcVywxWo64sIHpPjaKfhrHde8 /HZDItU+VZ7BRieBPnLDSnKvRwy1/tHDc0Be4O5Jw3/w3skTdFbByfDQhvu2tT4uzOX56d Id/oNY8HonXJlsscY2XPIk0A7NvzjcglYGJW9qKVBDLauwJSY9JTYbHG9CWBoFPXOE8ISJ tjE3KoKew1wEGKzV0t4O0dkvrHUkfrkJSx7ijCpv8aZFwcZRfXk5d0iJOqngbzH5VccRWs HqE0lNV1SH4S3vTTvbMy8oYTMbejQHtf47aNJsAsNq3sYeiIWCg00kyPogvXUQ== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jul 2021 11:22:03 +1000 Message-Id: <20210718012204.97733-7-zane@zanevaniperen.com> In-Reply-To: <20210718012204.97733-1-zane@zanevaniperen.com> References: <20210718012204.97733-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 7/8] avformat/kvag: don't set bits_per_raw_sample 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zqDIgzmyP062 Signed-off-by: Zane van Iperen --- libavformat/kvag.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/kvag.c b/libavformat/kvag.c index 94dc1ddc04..b5ebe418e6 100644 --- a/libavformat/kvag.c +++ b/libavformat/kvag.c @@ -80,7 +80,6 @@ static int kvag_read_header(AVFormatContext *s) par->sample_rate = hdr.sample_rate; par->bits_per_coded_sample = 4; - par->bits_per_raw_sample = 16; par->block_align = 1; par->bit_rate = par->channels * (uint64_t)par->sample_rate * From patchwork Sun Jul 18 01:22:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 28956 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3149628ios; Sat, 17 Jul 2021 18:23:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfEF8WP7QC2AuVEGZgnMwziyLkhr3z3ArrkIPGX02MIIvvSOgdYjqNVH1H6oB5VmPvBczJ X-Received: by 2002:aa7:cb19:: with SMTP id s25mr25347684edt.194.1626571430671; Sat, 17 Jul 2021 18:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626571430; cv=none; d=google.com; s=arc-20160816; b=AhpJcn+rd/TgSAdJISdiw6QZdPCgWxZ56ZqTYTzF1y0a64T+YeQr3U5VxankDa2NP9 R2DjFktMjJ58V8oww8Go2qXvu9t0XwttqSTPqy4tBDSWHAHz9vF6LngFseQkSFEWjHFi sql3hLeHZPCPuaQcKSXUII8tjRJJNIQyxtyp7TUxN+c2fk2B0HSLuM5rph8pJJwSp8Up OoTJ1ASBlOqvtEUND0ZPvOPdge9QPgsVUKYWuMTzDKqtd6W8GOsRVVpOM11K/W7MUSd9 QukFQEGPub4pg+YQjWM2Fmd9QupK4LMmV5tr8AYHd7JTnYiWyVnt8Op8MJAqLq0qCYXv vfAQ== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=UFfXD0RF6BepDHGRX5hKOh2eeUHW4BWrOWAjwnHpn9Y=; b=G8b9DiW8pAsS24PFktL2dOAA+Jh+6xpZXX5pyQIC9cTIa4zQF6ZhVqDRCvSlmg4ioI DXxxiCQcJwLDkTTHZY5nAwo9H3azsMx0HpzkKCZljSkeBC3H5jwCoyWAC4r1P+gVbWIT TJZk9RJ210UKbRPsyC/mVhLsyXEVhGxIfqFHia4OJSTipuHAogGkyE3W0bYvEP/Wo15l kPSlWYv+G3Z2GqOeVeoIaAIwiFh1CO9Py1wE7/QgEK/JDlBS7oukyYYsY+ll6tKq87mn G73kl2TqpGvo23UqLTyBJY4mcpBOz8Ldw8wBIj5JOKsHg7/x2t5Q5axrpPCP8IYBYDxe AqQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=cOuityJw; 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=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f3si16621754ejj.302.2021.07.17.18.23.50; Sat, 17 Jul 2021 18:23:50 -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=@zanevaniperen.com header.s=key1 header.b=cOuityJw; 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=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 937B168A7ED; Sun, 18 Jul 2021 04:22:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E14D068A923 for ; Sun, 18 Jul 2021 04:22:36 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1626571356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t7051tb69N6zHew/qhnPLjAT+K5esKbVrnZ/YpY1zJc=; b=cOuityJwrCaEsJhkOHaWRRaCzkHmpsDwFPhuIzuh7IGZVbAtphdKzzmnaP/OB1/EIFw+Cb 2F/SmzPUlVxmlYlql/f2D/a0oibjTokUN2hc5avyMoZo52p6xRVtqVOYF+hK9wjFCdsmqB 1w2mz+TjfTj3sQes+d21lSyGWNNaDYk78Ddb/0mDFHfxenKRouqDek7CUv5uyZyC0AD9kI T1bSS1QhsJ4ED8/yUIMj2kWKWrC9SFiLHq2EjxcIZHy6FWnfIY3zLR9McR2/E1x8LVJJtL /BgLjQRjWijIleD4zRRDx2fN1KZNQCWO1U4ELB8JfhazlFKcO7+q7KHkwgtqOA== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jul 2021 11:22:04 +1000 Message-Id: <20210718012204.97733-8-zane@zanevaniperen.com> In-Reply-To: <20210718012204.97733-1-zane@zanevaniperen.com> References: <20210718012204.97733-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 8/8] avformat/pp_bnk: don't set bits_per_raw_sample 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: b1TLwHgUZzL8 Signed-off-by: Zane van Iperen --- libavformat/pp_bnk.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/pp_bnk.c b/libavformat/pp_bnk.c index dfe5343cde..821d14a4aa 100644 --- a/libavformat/pp_bnk.c +++ b/libavformat/pp_bnk.c @@ -214,7 +214,6 @@ static int pp_bnk_read_header(AVFormatContext *s) par->sample_rate = hdr.sample_rate; par->bits_per_coded_sample = 4; - par->bits_per_raw_sample = 16; par->block_align = 1; par->bit_rate = par->sample_rate * (int64_t)par->bits_per_coded_sample * par->channels;