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 9DD3E46F22 for ; Thu, 24 Aug 2023 21:00:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 331FB68C668; Fri, 25 Aug 2023 00:00:29 +0300 (EEST) Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68EA668BE9D for ; Fri, 25 Aug 2023 00:00:22 +0300 (EEST) Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-6bd0a96e63dso223902a34.2 for ; Thu, 24 Aug 2023 14:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692910820; x=1693515620; 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=4rRkJQKHU/svfqyNqu4UQA53e5HL/KfUFdxr7QB5UYA=; b=QvyPqSvhteoXfceF+69VOOSRCAQkkXRDUCYTe+izCY50GQd6ehqDOKh6iVP0T2U+Qi n8xY24qorTBBTUJ5uvg5AAvSwmOP8nw8AJTQw3agx1ys+myiLG7S3/VG+6gPmt7xxZ+/ Eqjhjzwj2MINhihlVoUt2AoCisY1mdXtt0A9J95125DfP8UMPrn8ayMnrqlteXuKNAZ/ UquZ6qW0Vkpm3ZwHu2JS4EbfzAGrPNdD78Dr/M2jfWu0yMcdmwH6bB4r8tKfPPbOXHyE 8i0csNNxOcbAB62Nq8mzn60szZrvT9JXafseltNlFONyiZf+QW9Ck73kaSKLZNtQIlRL wFgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692910820; x=1693515620; 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=4rRkJQKHU/svfqyNqu4UQA53e5HL/KfUFdxr7QB5UYA=; b=L/T9/yto7twZQ0631O2Ko1Ee+g2J5332JB2KXFUYUHwzSGdB/HWjreGHmlH1r7OOkR 5GB/n+QvMTuR4dPWn2er2Xu+znc4PIoY/kqWyFIWGDYDIp1zBxBQPcye9IazP0mZ/vcu iMTMeVa8sPVtgsnVeLGaWWxX311VFsVRW4vL2RgxawhTDmUlxLhS4Oep1vxLIWdKAgbG Nz6xXKkN8We7Or9zbFWGVwsIuo8Q/oi5XLNT01W7K98a4UTZRZp037ti1sQz4HxPdwXD RHlQBTVL4h8yvMjwcwvk/PYxBtmq54Ifg2jzvKkyj3qA63Pkw9+OyNUlwcel7If4EWYL GH5g== X-Gm-Message-State: AOJu0YzRUfNq6jBLL+512qD65rEv37Fknffe9Td7Dv1/RmnvhdjxKhdX NZpvvBym647no4WP90jlTuf+WDGrg3A= X-Google-Smtp-Source: AGHT+IH04QISdxUFiZ0dmZwr1M/Hv8I5/OvwOn8EU+tyaB6pp8ZDBwVgnr4LFcpl6MbRg0DlFQRc9Q== X-Received: by 2002:a9d:639a:0:b0:6b9:35dd:8587 with SMTP id w26-20020a9d639a000000b006b935dd8587mr3259717otk.37.1692910820244; Thu, 24 Aug 2023 14:00:20 -0700 (PDT) Received: from [192.168.0.16] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id k2-20020a056830150200b006b8c6eb962esm202334otp.52.2023.08.24.14.00.19 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Aug 2023 14:00:19 -0700 (PDT) Message-ID: <5f27fd0b-b189-8f7b-fff7-89745ea0575a@gmail.com> Date: Thu, 24 Aug 2023 18:00:21 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] OSQ lossless audio format support 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 8/24/2023 6:52 AM, Paul B Mahol wrote: > +static int osq_receive_frame(AVCodecContext *avctx, AVFrame *frame) > +{ > + OSQContext *s = avctx->priv_data; > + GetBitContext *gb = &s->gb; > + int ret, n; > + > + while (s->bitstream_size < s->max_framesize) { > + int size; > + > + if (!s->pkt->data) { > + ret = ff_decode_get_packet(avctx, s->pkt); > + if (ret == AVERROR_EOF && s->bitstream_size > 0) > + break; > + if (ret < 0) > + return ret; > + } > + > + size = FFMIN(s->pkt->size - s->pkt_offset, s->max_framesize - s->bitstream_size); > + memcpy(s->bitstream + s->bitstream_size, s->pkt->data + s->pkt_offset, size); > + s->bitstream_size += size; > + s->pkt_offset += size; > + > + if (s->pkt_offset == s->pkt->size) { > + av_packet_unref(s->pkt); > + s->pkt_offset = 0; > + } This looks like you're assembling a packet of max_framesize bytes. You should instead do that in a parser, and ensure here that the packets fed to this decoder are <= max_framesize. > + } > + > + frame->nb_samples = FFMIN(s->frame_samples, s->nb_samples); > + if (frame->nb_samples <= 0) > + return AVERROR_EOF; > + > + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) > + goto fail; > + > + if ((ret = init_get_bits8(gb, s->bitstream, s->bitstream_size)) < 0) > + goto fail; > + > + if ((ret = osq_decode_block(avctx, frame)) < 0) > + goto fail; > + > + s->nb_samples -= frame->nb_samples; > + > + n = get_bits_count(gb) / 8; > + if (n > s->bitstream_size) { > + ret = AVERROR_INVALIDDATA; > + goto fail; > + } > + > + memmove(s->bitstream, &s->bitstream[n], s->bitstream_size - n); > + s->bitstream_size -= n; > + > + return 0; > + > +fail: > + s->bitstream_size = 0; > + s->pkt_offset = 0; > + av_packet_unref(s->pkt); > + > + return ret; > +} > + > +const AVInputFormat ff_osq_demuxer = { > + .name = "osq", > + .long_name = NULL_IF_CONFIG_SMALL("raw OSQ"), > + .read_probe = osq_probe, > + .read_header = osq_read_header, > + .read_packet = ff_raw_read_partial_packet, Instead of sending an arbitrarily sized packet (1024 bytes as of now), you should set codecpar->frame_size and propagate packets with that amount of bytes instead. A parser is still needed, though, for non seekable input (a pipe). And in case the decoder is fed with non lavf input. > + .extensions = "osq", > + .flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK | AVFMT_NOTIMESTAMPS, > + .raw_codec_id = AV_CODEC_ID_OSQ, > + .priv_data_size = sizeof(FFRawDemuxerContext), > + .priv_class = &ff_raw_demuxer_class, > +}; _______________________________________________ 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".