* [FFmpeg-devel] [PATCH] fftools/ffplay: split filters & show modes cycling into separate keys
@ 2023-12-19 2:02 Ondřej Fiala
2023-12-19 2:45 ` Zhao Zhili
0 siblings, 1 reply; 3+ messages in thread
From: Ondřej Fiala @ 2023-12-19 2:02 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Ondřej Fiala
---
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) {
--
2.43.0
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH] fftools/ffplay: split filters & show modes cycling into separate keys
2023-12-19 2:02 [FFmpeg-devel] [PATCH] fftools/ffplay: split filters & show modes cycling into separate keys Ondřej Fiala
@ 2023-12-19 2:45 ` Zhao Zhili
0 siblings, 0 replies; 3+ messages in thread
From: Zhao Zhili @ 2023-12-19 2:45 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Ondřej Fiala
> On Dec 19, 2023, at 10:02, Ondřej Fiala <ofiala@airmail.cc> wrote:
>
> ---
> 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);
> - }
Now it could be simplified as cur_stream->vfilter_idx = (cur_stream->vfilter_idx + 1) % nb_vfilters.
> break;
> case SDLK_PAGEUP:
> if (cur_stream->ic->nb_chapters <= 1) {
> --
> 2.43.0
>
> _______________________________________________
> 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".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
* [FFmpeg-devel] Fwd: [PATCH] fftools/ffplay: split filters & show modes cycling into separate keys
@ 2024-03-26 2:18 Ondřej Fiala
2024-03-28 16:46 ` Ondřej Fiala
0 siblings, 1 reply; 3+ messages in thread
From: Ondřej Fiala @ 2024-03-26 2:18 UTC (permalink / raw)
To: ffmpeg-devel
I am forwarding a patch from December that seems to have been overlooked.
See the original threads in the archive:
https://ffmpeg.org/pipermail/ffmpeg-devel/2023-December/318613.html
https://ffmpeg.org/pipermail/ffmpeg-devel/2023-December/318654.html
Forwarded message from Ondřej Fiala on Tue Dec 19, 2023 at 3:02 AM:
---
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) {
--
2.43.0
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] Fwd: [PATCH] fftools/ffplay: split filters & show modes cycling into separate keys
2024-03-26 2:18 [FFmpeg-devel] Fwd: " Ondřej Fiala
@ 2024-03-28 16:46 ` Ondřej Fiala
2024-03-28 16:48 ` [FFmpeg-devel] " epirat07
0 siblings, 1 reply; 3+ messages in thread
From: Ondřej Fiala @ 2024-03-28 16:46 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Just want to make sure, since I am aware of some cases of large commercial email
providers blocking my email provider... did anyone with a gmail address receive
this patch?
Thanks,
Ondřej
On Tue Mar 26, 2024 at 3:18 AM CET, Ondřej Fiala wrote:
> I am forwarding a patch from December that seems to have been overlooked.
>
> See the original threads in the archive:
> https://ffmpeg.org/pipermail/ffmpeg-devel/2023-December/318613.html
> https://ffmpeg.org/pipermail/ffmpeg-devel/2023-December/318654.html
>
> Forwarded message from Ondřej Fiala on Tue Dec 19, 2023 at 3:02 AM:
> ---
> 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) {
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH] fftools/ffplay: split filters & show modes cycling into separate keys
2024-03-28 16:46 ` Ondřej Fiala
@ 2024-03-28 16:48 ` epirat07
0 siblings, 0 replies; 3+ messages in thread
From: epirat07 @ 2024-03-28 16:48 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On 28 Mar 2024, at 17:46, Ondřej Fiala wrote:
> Just want to make sure, since I am aware of some cases of large commercial email
> providers blocking my email provider... did anyone with a gmail address receive
> this patch?
>
Yes
> Thanks,
> Ondřej
>
> On Tue Mar 26, 2024 at 3:18 AM CET, Ondřej Fiala wrote:
>> I am forwarding a patch from December that seems to have been overlooked.
>>
>> See the original threads in the archive:
>> https://ffmpeg.org/pipermail/ffmpeg-devel/2023-December/318613.html
>> https://ffmpeg.org/pipermail/ffmpeg-devel/2023-December/318654.html
>>
>> Forwarded message from Ondřej Fiala on Tue Dec 19, 2023 at 3:02 AM:
>> ---
>> 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) {
>
> _______________________________________________
> 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".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-28 16:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-19 2:02 [FFmpeg-devel] [PATCH] fftools/ffplay: split filters & show modes cycling into separate keys Ondřej Fiala
2023-12-19 2:45 ` Zhao Zhili
2024-03-26 2:18 [FFmpeg-devel] Fwd: " Ondřej Fiala
2024-03-28 16:46 ` Ondřej Fiala
2024-03-28 16:48 ` [FFmpeg-devel] " epirat07
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git