From patchwork Sat Feb 26 15:33:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34528 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1176468nkx; Sat, 26 Feb 2022 07:34:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJxBaBFHMidEzVvK8M5tcVaiav7gt7mPTsibL0CJkE+JXrn9bS1HcGG2NjYiF9FKG+b3yDbB X-Received: by 2002:a17:907:9196:b0:69f:2625:3f2e with SMTP id bp22-20020a170907919600b0069f26253f2emr9806594ejb.575.1645889677439; Sat, 26 Feb 2022 07:34:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645889677; cv=none; d=google.com; s=arc-20160816; b=HciDz7G1P44tiwBhy5cdEF0Fo0UZ4b3M6bHXpu113VDresCLfjAT3XPVPBQm6Hjo05 Zs1lgWJTwrOb2+wGowmImiRqk8DHhNHb5+a9QBbvajwO/rtmP26UJbh06Zn+NefDlXKB Nkh7tL62cU7kAUSGTP2N/WIw/8xSWcpEjM7A024w3JE0Vv2x5U0U8UEWq9Z5Uir6ZQvT St0WlOfLiSxjcVmIpPADFdWai6jvLSMwWQhjTXJZvuODNOeOmAikXexR2pyF7tDTucJe BpW8T81pnxKRDBBBQTGeSdZ4+Avy68KEY9htFdp+god+ipyCe6i72nxAfK63HUlbGXoo 5lWg== 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=JyX40PR/lup3XnbTAO9NnzJdpE0Rd4Hki0kCjmIj3RU=; b=MdHfsgMwQu2pDgnboEeiBT/sp7rIw87gFIFS3MmvMHlDz72uA1EgbNw3EhND5vuTJa te3cQWBPLY7nIwuPkSdJocloQSUwGFuLqKChO5RdhWf1JVIuTxOY4RAzl2biFY7UuXxp sO/QhWirpp5Rtt7L4Et/DsDcsjzFXz60FsNAnvZUydiPTRwVb12MS5P88WcH9R+wRlnk xrEj+8Sqmu4EOl6pcVrFj3hOEdUf2j8nHxlZbEdwKnTDH50clLK+X5BH4XZfGnKqM+jr fMaERqt6vQOnnUI4x+L04Nmq/kLXBJLY7Om8ZDt9viDrsXvsAu4KgWpY67vO2ZLXVFBL SSZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fL5gAJFn; 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 cm1-20020a0564020c8100b00410d2a0d015si3788760edb.485.2022.02.26.07.34.36; Sat, 26 Feb 2022 07:34:37 -0800 (PST) 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=20210112 header.b=fL5gAJFn; 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 9B30768ADDB; Sat, 26 Feb 2022 17:34:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6223680AC0 for ; Sat, 26 Feb 2022 17:34:25 +0200 (EET) Received: by mail-ot1-f48.google.com with SMTP id s1-20020a056830148100b005acfdcb1f4bso5945115otq.4 for ; Sat, 26 Feb 2022 07:34:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=h3zQlUkbCS9ZSjIsQ9QVJXahsrqvSkG98fj5hIf1C4M=; b=fL5gAJFnITvZI0gJXyFj3BE/SqVKIkOHBobKTBnBv0Q3zgI1IXRCKgjWNrG4qvVddD 34CqDJ4P+WahlHkAAXEbPWA7YDVNsmBG4CxWk2Mh5dze/doG/fCwIkUe8u5gtsQIN+if WYXa7EaGvdI+bbWWZ/NMDMPA9SNRCBzMeKb36MKZgr5evIDG5v9u5JqEJXZCSbJMaSFL g8K2Lchon9kbT7sejVvC+6ZSQ7IPZNPGSU5GORKUWTDNTkl4C4JUpEBZ2pD/UMf/GyFc 3wfcuYs2UrPTmBRDL8q/dSRZZAous1mylIN4TO7VlK4VzRUxAByZS0dFje4nNtAm4fVg SzGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=h3zQlUkbCS9ZSjIsQ9QVJXahsrqvSkG98fj5hIf1C4M=; b=WbO35uZyXECnwHzLqT9qceCTGM8Bdydx5EustrbVewc5yD0vHHsbS2nq5LmDUWyRGv GIm9HXvTRvxa6rQmdfkbWq2HOfSI8huJLhtK/BZx5cJtQaXqVUKLvdC5xwbuUNAFDm9a RZXqDFVrpGL9lAGtdnaECZJjIyoWeIK3YJHYAJkTKW5hChYChPwb+ORw91YBCxdAM+y/ YLlh3/r0QqEEL27ccg/pedGDd1PpuvbvI/aXzI4Cqk67k/N5Uwnd7E+kGiE8x/cmyLPY hA46R9KEnE9QJufeRrz4aX7GD38QmwKHAvO5a+EmjNIMb1dFdXnBFawClOcRoxNUknt9 ts4w== X-Gm-Message-State: AOAM530ym13neamlhSkFxqexr62WbNJtFhxPKJkuVJUo+HsHTInP1sXb tIf5N+YQWumuPCuiKUeD5YHZZpfA3H5/zQ== X-Received: by 2002:a05:6830:1e28:b0:5af:6776:2fd9 with SMTP id t8-20020a0568301e2800b005af67762fd9mr5191864otr.342.1645889664004; Sat, 26 Feb 2022 07:34:24 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i8-20020a4ad388000000b0031be0573b59sm2487030oos.5.2022.02.26.07.34.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Feb 2022 07:34:23 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Feb 2022 12:33:53 -0300 Message-Id: <20220226153354.1951-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2 v2] avutil: make lzo always compile 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: wFLamNHp01jb Having optionally installed headers is a bad idea as there's no way to know if they are present or not, and the module is small enough that it's pointless having it be optional. Signed-off-by: James Almer --- libavutil/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavutil/Makefile b/libavutil/Makefile index d17876df1a..b867d3b362 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -52,6 +52,7 @@ HEADERS = adler32.h \ intreadwrite.h \ lfg.h \ log.h \ + lzo.h \ macros.h \ mathematics.h \ mastering_display_metadata.h \ @@ -87,8 +88,6 @@ HEADERS = adler32.h \ tx.h \ film_grain_params.h \ -HEADERS-$(CONFIG_LZO) += lzo.h - ARCH_HEADERS = bswap.h \ intmath.h \ intreadwrite.h \ @@ -139,6 +138,7 @@ OBJS = adler32.o \ lls.o \ log.o \ log2_tab.o \ + lzo.o \ mathematics.o \ mastering_display_metadata.o \ md5.o \ @@ -180,7 +180,6 @@ OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o OBJS-$(CONFIG_D3D11VA) += hwcontext_d3d11va.o OBJS-$(CONFIG_DXVA2) += hwcontext_dxva2.o OBJS-$(CONFIG_LIBDRM) += hwcontext_drm.o -OBJS-$(CONFIG_LZO) += lzo.o OBJS-$(CONFIG_MACOS_KPERF) += macos_kperf.o OBJS-$(CONFIG_MEDIACODEC) += hwcontext_mediacodec.o OBJS-$(CONFIG_OPENCL) += hwcontext_opencl.o From patchwork Sat Feb 26 15:33:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34529 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1176590nkx; Sat, 26 Feb 2022 07:34:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJwM6YhBT9W9+E0M0wtU2fby+cWpoeWXEkhXqnsgdIacGxytzeEbJIMMj/D8uhTwPaGkJ3c6 X-Received: by 2002:a17:907:98a5:b0:6ce:8c66:e75e with SMTP id ju5-20020a17090798a500b006ce8c66e75emr10269519ejc.239.1645889687597; Sat, 26 Feb 2022 07:34:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645889687; cv=none; d=google.com; s=arc-20160816; b=bqmgmDBcatEZhg02ZbLtqw8UPmJsqYiEBa7+xkEFpFhiSXZp3LGHm0Tcl0YaS/lnPk ld6ncTXXi2K4ZQmSVt1477mDWobgmC4y2ya7lYVHprrMYg7InKe8E1hi5Fj1gkAcIcfy WgVpIFPg5QrWFQzQ64mJm/SM5pK+opswmAvJRUmTxeYflUkDU8K4SCLi6KutUFcVODFb s0MUSxy3HB3grWUjtMjM94L4XjuvzXpmtvRKqQ+J3zhtT7gBQJhmlrGtoJqz44M0TH+V i/3BpGjUxMuwZeJYp5s32SnPxPNTmiVlncqtdzMHR7USv07W6otBM7t+cNPMpSJMuc0h RrlQ== 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=6JK9eK4Smnwq68EMCodt3Mt/ebxuzSA0NxCwLh0CeRQ=; b=YlWdZ+IJk2RvnQdzpG4U8FCZhmCyZPULzUyfYN9wxgPtQWidq1BYmCFlNPTMmPqk0O JIVSy8OiiHg8Yj0QfNd7/4OwMHZjt/HLIRv6p4to15ka0UjKgX5KbuXfH9xCfZk7kUHt 442Aw4LS2YhwFDD2aylFeWXR2Kg1m0Rrva1Ekb3EtAzdPuj2H0a2/Wk3lrE8lirwEPmO d9hfZ1xZJQUDmW86zILFrF5tS7alArQkgVvTk8W4Gy1PNR9WQ/kJSV50wTu5NI02EACh e5CqBpRxZjdnEfmlk3kQ6Vga1IVLxdx0wZFq1T7cXtWltGl6d3U72/TXnm7UvLRHE3i3 tTcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=cy9SaNCe; 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 mp14-20020a1709071b0e00b006d037ec0be5si3872020ejc.361.2022.02.26.07.34.47; Sat, 26 Feb 2022 07:34:47 -0800 (PST) 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=20210112 header.b=cy9SaNCe; 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 2A69C68AE7C; Sat, 26 Feb 2022 17:34:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F6BD68ADD4 for ; Sat, 26 Feb 2022 17:34:27 +0200 (EET) Received: by mail-oi1-f174.google.com with SMTP id l25so9889913oic.13 for ; Sat, 26 Feb 2022 07:34:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ggOJ92LIhch8fB3sLPqg90yl4SlzrivVaVLa///Q8RI=; b=cy9SaNCe51C9DXvjsXMnvKkjUAxh/Dav/QbSNtF/KFg18ghwYmeAXFEQYtFtRTCRMG TfVke3FobhqrN2SczruqNG6WIdu/SsLLG7X35ls0MjYbNrvgN+hEhd/Qp/Q7wQ5XaFM4 2G542LGd9UOSl8FBltlbbCY1cKK9ML27elPKMf8aKh3WMaWryga89iYVfSEhs4nDVQLm qppn7b/ol89h1mgdFwt0ligY/aeAAlBC3Orf2Fihp/t9qfJpRahy+mcPbzyGmNF5lNYD j8TPK2JGG4xdgwgkBSw7NLDvdudK/trdwqBMdqq1jp82uP8cpvZYf9IhBQYRbwAjOfuy WfUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ggOJ92LIhch8fB3sLPqg90yl4SlzrivVaVLa///Q8RI=; b=LJhssRepEGJnJrX+tQ/ZiEsxS/WmVLYHNVFDeiTgeJax+rTaRn4+mYuj8Q3CqzXqNA SEigZKNCQ75gpp/YS7B9Oiy9YT6BwJLNIlKmGF+YHTaGHMd4rEwlUVFJAQEp2NsNN5kq pGpQVe8VQoItFTo8ZDgUNNxNGo4nWbhuYYZPEMQLyBVEYbHCBY+kpQB0xK1GAuv+okE4 QaZBlv5TZkrKP2Qq8mYsRQlXQswyEWBwqRjNarV134Pfjshp7v1sZSwM43ZuHOcrDqfG plCNwwESEnOXdy7UZiRbjxvuQUSNtK2ffM8N4knpG3wD5XZoaqlYjWzuon3Q1z/AsFIO wK5g== X-Gm-Message-State: AOAM531W647k/ATDUas80d8ob0IwRRwILzzu6B2GWXaxWPu5pJC978wF jRI+xAUenocdG8jQ2ygo8SPjLdtuamqU2A== X-Received: by 2002:a05:6808:2ca:b0:2d4:b8de:8888 with SMTP id a10-20020a05680802ca00b002d4b8de8888mr3014380oid.149.1645889665357; Sat, 26 Feb 2022 07:34:25 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i8-20020a4ad388000000b0031be0573b59sm2487030oos.5.2022.02.26.07.34.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Feb 2022 07:34:24 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Feb 2022 12:33:54 -0300 Message-Id: <20220226153354.1951-2-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220226153354.1951-1-jamrial@gmail.com> References: <20220226153354.1951-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] configure: stop allowing disabling lzo 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: OXKpdCB6yVop The module is now always compiled in. Signed-off-by: James Almer --- configure | 7 ++----- libavformat/matroskadec.c | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 4dab8d4715..8c69ab0c86 100755 --- a/configure +++ b/configure @@ -140,7 +140,6 @@ Component options: --disable-dwt disable DWT code --disable-error-resilience disable error resilience code --disable-lsp disable LSP code - --disable-lzo disable LZO decoder code --disable-mdct disable MDCT code --disable-rdft disable RDFT code --disable-fft disable FFT code @@ -1975,7 +1974,6 @@ SUBSYSTEM_LIST=" fast_unaligned fft lsp - lzo mdct pixelutils network @@ -2780,7 +2778,6 @@ clearvideo_decoder_select="idctdsp" cllc_decoder_select="bswapdsp" comfortnoise_encoder_select="lpc" cook_decoder_select="audiodsp mdct sinewin" -cscd_decoder_select="lzo" cscd_decoder_suggest="zlib" dca_decoder_select="mdct" dca_encoder_select="mdct" @@ -2896,7 +2893,7 @@ mxpeg_decoder_select="mjpeg_decoder" nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin" notchlc_decoder_select="lzf" -nuv_decoder_select="idctdsp lzo" +nuv_decoder_select="idctdsp" on2avc_decoder_select="mdct" opus_decoder_deps="swresample" opus_decoder_select="mdct15" @@ -3423,7 +3420,7 @@ ivf_muxer_select="av1_metadata_bsf vp9_superframe_bsf" latm_muxer_select="aac_adtstoasc_bsf mpeg4audio" matroska_audio_muxer_select="matroska_muxer" matroska_demuxer_select="riffdec" -matroska_demuxer_suggest="bzlib lzo zlib" +matroska_demuxer_suggest="bzlib zlib" matroska_muxer_select="mpeg4audio riffenc vp9_superframe_bsf aac_adtstoasc_bsf" mlp_demuxer_select="mlp_parser" mmf_muxer_select="riffenc" diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 31e5111225..36b96df351 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1684,7 +1684,6 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, memcpy(pkt_data + header_size, data, isize); break; } -#if CONFIG_LZO case MATROSKA_TRACK_ENCODING_COMP_LZO: do { int insize = isize; @@ -1704,7 +1703,6 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, } pkt_size -= olen; break; -#endif #if CONFIG_ZLIB case MATROSKA_TRACK_ENCODING_COMP_ZLIB: { @@ -2527,9 +2525,7 @@ static int matroska_parse_tracks(AVFormatContext *s) #if CONFIG_BZLIB encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB && #endif -#if CONFIG_LZO encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO && -#endif encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP) { encodings[0].scope = 0; av_log(matroska->ctx, AV_LOG_ERROR,