From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0DD1A468F2 for ; Sat, 24 Jun 2023 12:21:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 97EF368C03F; Sat, 24 Jun 2023 15:21:47 +0300 (EEST) Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DBE168B775 for ; Sat, 24 Jun 2023 15:21:41 +0300 (EEST) Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-1a98cf01151so1410241fac.2 for ; Sat, 24 Jun 2023 05:21:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687609299; x=1690201299; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=6tS0SFgK2ag9XNT7eFqG4Mcg6CYyZ1DFj0/AKAnvJTQ=; b=HYb2Em9zmoX6mT3mi8KRiw0pRE6cGsupxGuGSDdT5ai2bLcpFLPMdxB8wMAW/I4h+n oDnZpQRki44759Bp5a97WWGu3I9p9KKDb6Tm6P5HF9UQ/4XGI3VCKxvhF3LKTQCqELg5 J8I5gN46np4UtMO5zi7bya9Kih88e/yQi1ic8bYGfTPQCbwxyFieF+4JWjyJMsEjqbWe UMZu3Bu5aFB4XtP5OZqiwbGoFM594P4pb4yFcPWu+3rcLhixKRWnp0sEFe9ogynYCPlQ 08M3rjmyMLZGVranBjJlueLmjiV7gpCqKR5ndbGrTtHlMX738xiTzoO7IdqICx6FR+ed 4yHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687609299; x=1690201299; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6tS0SFgK2ag9XNT7eFqG4Mcg6CYyZ1DFj0/AKAnvJTQ=; b=U7qvL1/Mm+Fidq8h+pwC4jAdseCKmHvopaUwCR7dGY4dUihAvlGZZG+SVgxAd5rPZJ QlD0Iy6lydf7N5PaPprIx3GMmmMMC3luo4UQk0/BKSRiqbrrUP5jOc0ZPxzkbdalBVwM +G2QmQ3zINCWB5ds++wzaTn4NnX6ob/HL/578HyVGPEBhxbzuGzOPFATvH5qsvLkw1x/ rv55Qm72IczQu3AmLM1+igi8T0+pO/TL1CuYL9BMDX5JrFK9mquaU1qFikwPsmLI37B4 qSeut30SdeTu76GiXvqaL2VeNq9+sXgiT0ANqY5c+GKMQ2c4zLHQil8SKb5wAO0sq0bF hjHw== X-Gm-Message-State: AC+VfDwazbQUIvwBS4wLrzoSp4wc8b6nzStyOsx9BJSpdILe03CuXFGL C7PERmsOyqVmC+uu8dKMrh7M3ngKDdA= X-Google-Smtp-Source: ACHHUZ6yrG3zYMzb4F9y55WMTXX3dp5l9eIrwqbgk6DS86547fui/UY0VfvAFgXs+w+tVf5Fm8eRZg== X-Received: by 2002:a05:6871:894:b0:1a2:cfd7:bfdc with SMTP id r20-20020a056871089400b001a2cfd7bfdcmr30345196oaq.6.1687609298917; Sat, 24 Jun 2023 05:21:38 -0700 (PDT) Received: from [192.168.0.12] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id h13-20020a056870d24d00b0019fa4c4127asm1079735oac.45.2023.06.24.05.21.36 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 24 Jun 2023 05:21:38 -0700 (PDT) Message-ID: Date: Sat, 24 Jun 2023 09:21:37 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230624043853.12237-1-leo.izen@gmail.com> <20230624043853.12237-4-leo.izen@gmail.com> From: James Almer In-Reply-To: <20230624043853.12237-4-leo.izen@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH v3 3/4] avformat/jpegxl: remove jpegxl_probe, instead call avcodec/jpegxl_parse 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 6/24/2023 1:38 AM, Leo Izen wrote: > diff --git a/libavformat/Makefile b/libavformat/Makefile > index 2b90b788c0..0637199c9d 100644 > --- a/libavformat/Makefile > +++ b/libavformat/Makefile > @@ -283,7 +283,7 @@ OBJS-$(CONFIG_IMAGE_HDR_PIPE_DEMUXER) += img2dec.o img2.o > OBJS-$(CONFIG_IMAGE_J2K_PIPE_DEMUXER) += img2dec.o img2.o > OBJS-$(CONFIG_IMAGE_JPEG_PIPE_DEMUXER) += img2dec.o img2.o > OBJS-$(CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER) += img2dec.o img2.o > -OBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += img2dec.o img2.o jpegxl_probe.o > +OBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += img2dec.o img2.o jpegxl_parse.o > OBJS-$(CONFIG_IMAGE_PAM_PIPE_DEMUXER) += img2dec.o img2.o > OBJS-$(CONFIG_IMAGE_PBM_PIPE_DEMUXER) += img2dec.o img2.o > OBJS-$(CONFIG_IMAGE_PCX_PIPE_DEMUXER) += img2dec.o img2.o > @@ -320,7 +320,7 @@ OBJS-$(CONFIG_IVF_MUXER) += ivfenc.o > OBJS-$(CONFIG_IVR_DEMUXER) += rmdec.o rm.o rmsipr.o > OBJS-$(CONFIG_JACOSUB_DEMUXER) += jacosubdec.o subtitles.o > OBJS-$(CONFIG_JACOSUB_MUXER) += jacosubenc.o rawenc.o > -OBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_anim_dec.o jpegxl_probe.o > +OBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_anim_dec.o jpegxl_parse.o These two will compile jpegxl_parse.o twice on static builds, once in lavc and once in lavf, which is a waste. You instead need to add STLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o STLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o to libavcodec/Makefile > OBJS-$(CONFIG_JV_DEMUXER) += jvdec.o > OBJS-$(CONFIG_KUX_DEMUXER) += flvdec.o > OBJS-$(CONFIG_KVAG_DEMUXER) += kvag.o > @@ -715,6 +715,7 @@ SHLIBOBJS += log2_tab.o to_upper4.o > SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o > SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o > SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o > +SHLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o Missing the pipe demuxer here too. > SHLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o > SHLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o > SHLIBOBJS-$(CONFIG_MP3_MUXER) += mpegaudiotabs.o > diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c > index b986d3a502..72b2c76405 100644 > --- a/libavformat/img2dec.c > +++ b/libavformat/img2dec.c > @@ -36,7 +36,7 @@ > #include "avio_internal.h" > #include "internal.h" > #include "img2.h" > -#include "jpegxl_probe.h" > +#include "libavcodec/jpegxl_parse.h" > #include "libavcodec/mjpeg.h" > #include "libavcodec/vbn.h" > #include "libavcodec/xwd.h" > @@ -850,7 +850,7 @@ static int jpegxl_probe(const AVProbeData *p) > if (AV_RL16(b) != FF_JPEGXL_CODESTREAM_SIGNATURE_LE) > return 0; > #if CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER > - if (ff_jpegxl_verify_codestream_header(p->buf, p->buf_size, 1) >= 0) > + if (ff_jpegxl_parse_codestream_header(p->buf, p->buf_size, 1, NULL) >= 0) If it's only for the probe function, can't you add a reduced version here that can also conclude the stream is jpegxl? That way you don't need it to depend on lavc code and simplifies the stuff above. > return AVPROBE_SCORE_MAX - 2; _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".