From patchwork Tue Dec 19 02:02:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ond=C5=99ej_Fiala?= X-Patchwork-Id: 45234 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp7747171pzf; Mon, 18 Dec 2023 18:03:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IE1gkrR0hI/hiwMMGGQan09eyjmWjEpDpH40ua0lk+O50ML3/7PgCVSIPmup9ILoaSoTYYc X-Received: by 2002:a17:906:748e:b0:a23:34f1:b02d with SMTP id e14-20020a170906748e00b00a2334f1b02dmr301336ejl.7.1702951381524; Mon, 18 Dec 2023 18:03:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702951381; cv=none; d=google.com; s=arc-20160816; b=zGn17TbhH20kpNt8qcmMn9sTTkIMjaphyXHEZV61sIaNUXJ+rSIIcpRwqB+BcSwtj/ 9r3GA9Ha3vmw9M8num3QVHEEjt0g0Kw0fWniDfKJwPrva39GLRJWA2uyY1ObFoXTu7F9 ayuXIWwwtS1MDfMn71KmoeNKae21NNGB3YGCecBVAA2dMuznX2pKyFj9SN8Hl9B1ws9Z jmjCC0OyFaDGxwgBJO8yrMrnBLMBW0ip6fFYbKytI0zumThMRco8Te4si/a+CAacn99c +Mlnw1x6jZjGLk7gU+ibGU1ZrW1RS/jdPZFfxHT4M7ss3nOnfqGLGYVgZrIfRhnNpXa2 7DYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to :dkim-signature:from:delivered-to; bh=Y1h/tYgqUoo/620HutlfMyPrKmhC3UINSBUURX7x1ps=; fh=//hSQKIOrCUL5ZzCv6oZp/9x8vEh1JMLuiESFakqXYM=; b=OmHIL/CVLQfowUt5kG3+y/flZEO+snEJWlFM0e+SSmiXbY3oI2/IKC8qODC7Z1SBxn 8Yq1mHD/3Uj6hC+jo4cciOlNDpcRbjnxEYh78h0sXkBqSzhnLNnhOhdVbPPt57ofJBrM AWfiddkBZjeQkpNKfInpon765l9wkoTPgT19ougA3eyFL3ehCLQW6g+ul84yKb7jOM1s N4pn/OXYKwkbw822dU1zUbgcLz2GDTgxBLR1i1JCKZcdaf7NmUrf1pK2iaii1NVqKotJ PPsXo+PgZ4Kt7QPCZ76y+Oq3Uy2a7u8Wzux2T0IdldPBXgkoB0msCgFmhzBaA2uYDla1 EKnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@airmail.cc header.s=mail header.b=1Krd8v1p; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l3-20020a1709065a8300b00a235c9d3cb5si1114562ejq.647.2023.12.18.18.02.59; Mon, 18 Dec 2023 18:03:01 -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=@airmail.cc header.s=mail header.b=1Krd8v1p; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD38768CF76; Tue, 19 Dec 2023 04:02:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.cock.li (mail.cock.li [37.120.193.123]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20E7A68CE49 for ; Tue, 19 Dec 2023 04:02:48 +0200 (EET) From: =?utf-8?q?Ond=C5=99ej_Fiala?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=airmail.cc; s=mail; t=1702951367; bh=qXep+G0OrTBv1vKxK1x15lIhm4qDJatRBeCwLD+UIkQ=; h=From:To:Cc:Subject:Date:From; b=1Krd8v1peYHSd6F8y84ofYaBIWtIpgLiAMcCGCTrkT5KHnrPsxSeDVMgM1LeH0Kqy vpcDnXIPb0bV8tBHFB8jbBPo7JDFFHuGkHUxs7176IBg6ySqF5zL4ICXO1jMtwQAhP rigFuCl45sP4Tp7DSwa0ffyElKUm970BlKjxRQt4wXN96wPvtSgF0umZxHaN8mf5Dj dQnR7Gne6plh4P4rr/WwBxh/dtxYEfn8+XB4d5A+LtpZPKQH7lP14nTCPgOPQvt5NV SAPjai55R1YNfQzues6voBmoQftmDbMNClwYzIKurnCaaX44FKN1IfdhUOmzEJI7lx 9u6GU+TOIfhWQ== To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Dec 2023 03:02:20 +0100 Message-ID: <20231219020220.6838-1-ofiala@airmail.cc> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffplay: split filters & show modes cycling into separate keys 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 Cc: =?utf-8?q?Ond=C5=99ej_Fiala?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: X4cDNyg+BdNY --- It's annoying to have to go through the audio visualization modes when you just want to switch back-and-forth between two video filters. It also makes the code simpler. doc/ffplay.texi | 5 ++++- fftools/ffplay.c | 10 ++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/doc/ffplay.texi b/doc/ffplay.texi index 93f77eeece..91d138a974 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -241,8 +241,11 @@ Cycle subtitle channel in the current program. @item c Cycle program. +@item d +Cycle show modes. + @item w -Cycle video filters or show modes. +Cycle video filters. @item s Step to the next frame. diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 873ee8cc74..2eb616a88a 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -3370,14 +3370,12 @@ static void event_loop(VideoState *cur_stream) case SDLK_t: stream_cycle_channel(cur_stream, AVMEDIA_TYPE_SUBTITLE); break; + case SDLK_d: + toggle_audio_display(cur_stream); + break; case SDLK_w: - if (cur_stream->show_mode == SHOW_MODE_VIDEO && cur_stream->vfilter_idx < nb_vfilters - 1) { - if (++cur_stream->vfilter_idx >= nb_vfilters) - cur_stream->vfilter_idx = 0; - } else { + if (++cur_stream->vfilter_idx >= nb_vfilters) cur_stream->vfilter_idx = 0; - toggle_audio_display(cur_stream); - } break; case SDLK_PAGEUP: if (cur_stream->ic->nb_chapters <= 1) {