| Message ID | 20231219020220.6838-1-ofiala@airmail.cc |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] fftools/ffplay: split filters & show modes cycling into separate keys | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
> 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".
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) {