[FFmpeg-cvslog] ffplay: always display audio visualization if mode is set

Marton Balint git at videolan.org
Sat Dec 29 04:40:36 CET 2012


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Wed Dec 26 00:06:19 2012 +0100| [ec89ea30225780fedf702d7e8740fbf92418112c] | committer: Marton Balint

ffplay: always display audio visualization if mode is set

Fixes ticket #1903.

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec89ea30225780fedf702d7e8740fbf92418112c
---

 ffplay.c |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index caba6d7..c8dbda5 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1296,6 +1296,9 @@ static void video_refresh(void *opaque)
     if (!is->paused && get_master_sync_type(is) == AV_SYNC_EXTERNAL_CLOCK && is->realtime)
         check_external_clock_speed(is);
 
+    if (!display_disable && is->show_mode != SHOW_MODE_VIDEO && is->audio_st)
+        video_display(is);
+
     if (is->video_st) {
         if (is->force_refresh)
             pictq_prev_picture(is);
@@ -1396,7 +1399,7 @@ retry:
 
 display:
             /* display picture */
-            if (!display_disable)
+            if (!display_disable && is->show_mode == SHOW_MODE_VIDEO)
                 video_display(is);
 
             pictq_next_picture(is);
@@ -1404,15 +1407,6 @@ display:
             if (is->step && !is->paused)
                 stream_toggle_pause(is);
         }
-    } else if (is->audio_st) {
-        /* draw the next audio frame */
-
-        /* if only audio stream, then display the audio bars (better
-           than nothing, just to test the implementation */
-
-        /* display picture */
-        if (!display_disable)
-            video_display(is);
     }
     is->force_refresh = 0;
     if (show_status) {



More information about the ffmpeg-cvslog mailing list