From patchwork Tue Feb 14 21:27:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 40394 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp4739935pzk; Tue, 14 Feb 2023 13:27:35 -0800 (PST) X-Google-Smtp-Source: AK7set8e6hjxWQ45wJA4/EApO6A6dVRtje0WFhAAc3aFWKEBhhFA/bk9qoQ73GnUdIOKl9mrrbSD X-Received: by 2002:a17:906:c14e:b0:86f:64bb:47eb with SMTP id dp14-20020a170906c14e00b0086f64bb47ebmr4890394ejc.3.1676410054826; Tue, 14 Feb 2023 13:27:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676410054; cv=none; d=google.com; s=arc-20160816; b=UFME3GNCUa9zMPcKLQItCRosN8xk1VT52ZAZm0UXmozMwxtsO7K/HlscZ5XavYOo/T gvm5vL6MvleZEdpdNaLPjNzsaIpfFf8IKTxDjzqHraHwnSEojE/mDi88RyqgqoUIzLTl DStiWQk9kngR723n59sG0vinenErAKgcsGcRVq9OG/PTrgwqyBPctTcJRSxd7SZ7yegf q0By3HrsrfMPaH1Cp6V9rgFET6RVIYRTp1plHOjMNEkNfd94rFTLB/r+fjSkdVG8fC0I jVXO3Owp82DTzrEC74w6z12PwppSXhB78a9E4rEzR6S5rt9xV64TRzDl6TM5+yzny/dH vo0Q== 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:mime-version:dkim-signature:delivered-to; bh=UCcx5zUxuNKqn01lp2DxaF2yY276bRhN56W8GSvKJAc=; b=hveV+HUEu6s5eoQpuk0jK3gtxhrIMUOJ8Ww4Naq9rN6FdoufhQsJAJ9sUr/KYD7MPs VU9UpCnVvOd077j7DnAnF1xJUcOvVmo/AL1uc7XXPlbCwnuRKl9fG3711uWPf6uecfuf 7AZh658IsCMm0eOA4RcNbLy4Ium4fzMPCnzZQIn7Y0oGoJVutmv0yrG1m9+z3t1Rlfax v8n63WZvCQg1z96nzWvonDb4Frkflr0xxl55wOMMgv9th32H3hhVaH8CJLyXdShNIRXh tm6oMezqLoaYJfk58R1Pl3gESfVTwicOOcdG+tr9WRPb39DfCzdQB+EPL8M9VoRYf6KZ gNgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TLN7mEA8; 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 vf6-20020a170907238600b008b12688eab6si3609344ejb.56.2023.02.14.13.27.34; Tue, 14 Feb 2023 13:27:34 -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=TLN7mEA8; 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 7F7706808AB; Tue, 14 Feb 2023 23:27:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f46.google.com (mail-vs1-f46.google.com [209.85.217.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDDC66808AB for ; Tue, 14 Feb 2023 23:27:23 +0200 (EET) Received: by mail-vs1-f46.google.com with SMTP id h10so7824617vsu.11 for ; Tue, 14 Feb 2023 13:27:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=+NeSCX0eIvyMcGtrDhjewAYoG0yxDIpbeXIsPkJ8hi0=; b=TLN7mEA8xQeP6YYQFkEmnyJcv6H5RVEnyoVxl2Yawuhbr51KfgHrnpDjkcqgzADYfw 8SfyDID9HkwtFc6OcNkBE0yLfL1JUhFbx/x6SXWJDG1hKAwlxpV4JD4wwm3WPbIpB1ve vJ7wGf/xBjNd6KmUkUNNm8PWZwfBbgPgymGClAGen9HgSnMyPjy5OlFVDhJyzx6JNJif KS6Q2Cq/Le/dDokRtvrOILEHeWj8l5mGEYWF9otS58ktZdzqjlt1KT1/A6HBYC4ZwWS4 wUrF9HVNx8g+8jSQH/0vZlVbcUPEPeNM4ct6AW27Zr/67cUQ4NH7+LT/+C+7hwL3d9JR lCSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+NeSCX0eIvyMcGtrDhjewAYoG0yxDIpbeXIsPkJ8hi0=; b=OSHgW2mNya9Yoc60TAA/p78s4I426SBn6okL+IfuJOaHVkl0wUZCmTN1UTlYvSg3rN su8aQhOrMc0lF8Clp+sgjxrUgaJv1OM5/nw7dHpiFEM4of3dYEJnMQ7mGZKPBWYWPM2r 7D2uVEO0amlM7VmVwJtMJpMp0MPPCrt3yerAEuXnTa9vuFyZalnYPenhonnc2iGpJOUK uyrHpHvRNaPa6hqoV9XMlflk2crisPDCG6sJGEcZF7CRMaj2iorP54pi5jpV7sC0T34w I8fL3kSGT5Ce1+Hv0QXAADzRr5DIGb89Q2eFIjo6gCS7b/M00DWU6ftSmsMa7/ZYTtyC P0Rw== X-Gm-Message-State: AO0yUKWQbLwIR3WK2SeIVF1wiRKu5nH8Jw7/vTNaGj6ceQxbmnLy3hpw Vf2JvkuMquwRbwO9wovCCGs1IIRNUt1nY3PxuV8F3Xq/ X-Received: by 2002:a05:6102:51a:b0:412:257e:ec15 with SMTP id l26-20020a056102051a00b00412257eec15mr60806vsa.6.1676410042251; Tue, 14 Feb 2023 13:27:22 -0800 (PST) MIME-Version: 1.0 From: Paul B Mahol Date: Tue, 14 Feb 2023 22:27:02 +0100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avformat/cdg: add probe 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: d5XtJTwJTixi Patch attached. From b0cd65c70465da729d950dfff1c20129e81462fc Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 14 Feb 2023 22:25:42 +0100 Subject: [PATCH] avformat/cdg: add probe Signed-off-by: Paul B Mahol --- libavformat/cdg.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libavformat/cdg.c b/libavformat/cdg.c index 36f25e7f66..f598285911 100644 --- a/libavformat/cdg.c +++ b/libavformat/cdg.c @@ -26,6 +26,22 @@ #define CDG_COMMAND 0x09 #define CDG_MASK 0x3F +static int read_probe(const AVProbeData *p) +{ + const int cnt = p->buf_size / CDG_PACKET_SIZE; + int score = 0; + + for (int i = 0; i < cnt; i++) { + const int x = p->buf[i * CDG_PACKET_SIZE] & CDG_MASK; + + score += x == CDG_COMMAND; + if (x != CDG_COMMAND && x != 0) + return 0; + } + + return FFMIN(score, AVPROBE_SCORE_MAX); +} + static int read_header(AVFormatContext *s) { AVStream *vst; @@ -70,6 +86,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) const AVInputFormat ff_cdg_demuxer = { .name = "cdg", .long_name = NULL_IF_CONFIG_SMALL("CD Graphics"), + .read_probe = read_probe, .read_header = read_header, .read_packet = read_packet, .flags = AVFMT_GENERIC_INDEX, -- 2.39.1