summaryrefslogtreecommitdiffstats
path: root/ffplay.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4'Michael Niedermayer2013-03-131-2/+0
|\ | | | | | | | | | | | | | | | | | | * commit '2eaa3663fda750dac66d41fe8541a8744d5563a4': avplay: enable only when SDL 1.2 is found Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove references to the "ff" variant of buffersink.Nicolas George2013-03-121-1/+1
| |
* | Merge commit '354468fc12dcf93e7fb4af552e18906771913273'Michael Niedermayer2013-03-121-60/+19
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '354468fc12dcf93e7fb4af552e18906771913273': avplay: switch to new refcounted frames API avconv: convert to new refcounted AVFrame API Conflicts: cmdutils.c ffmpeg.c ffmpeg.h ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: use AVFrame accessor functionsMichael Niedermayer2013-03-011-6/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: do not cycle through unavailable show modesMarton Balint2013-02-271-5/+11
| | | | | | | | | | | | Fixes ticket #2200. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: add option to disable subtitlingMarton Balint2013-02-271-1/+3
| | | | | | | | | | | | Fixes ticket #2201. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use NAN to signal invalid external clockMarton Balint2013-02-271-5/+4
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: if audio or video clock is invalid return NANMarton Balint2013-02-271-4/+16
| | | | | | | | | | | | | | This helps us not to make bad decision (frame dropping, audio compensation) right after seeking when we do not know yet the recent audio or video clock. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: allow frame dropping if we redisplay an already displayed frameMarton Balint2013-02-271-3/+7
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: return true for pictq_prev_picture if it was successfulMarton Balint2013-02-271-1/+4
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: only quit from audio_decode_frame before decoding when pausedMarton Balint2013-02-271-1/+1
| | | | | | | | | | | | | | This way the audio clock is updated to a proper value even when the video is paused. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: drop remaining frames in current audio avpacket when seekingMarton Balint2013-02-271-0/+3
| | | | | | | | | | | | Fixes ticket #1928. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: signal seek event to read threadMarton Balint2013-02-271-0/+1
| | | | | | | | | | | | Improves seek delay. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: reindent and remove pointless cast in audio_decode_frame() codeStefano Sabatini2013-02-241-2/+2
| |
* | ffplay: set type for channel_layout AudioParams field to int64_tStefano Sabatini2013-02-241-1/+1
| | | | | | | | Reflect the type of the corresponding field in lavc/lavfi.
* | ffplay: only display frames if there are no pending eventsMarton Balint2013-02-151-7/+6
| | | | | | | | | | | | | | Otherwise events could just pile up if displaying a frame takes more time than the duration of the frame. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove remains of video_clockMarton Balint2013-02-151-23/+6
| | | | | | | | | | | | | | | | We are now using a pts based approach, libavutil/libavcodec should provide the correct pts-es anyway. This also fixes an issue when seeking to a frame with a pts set to zero. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove refresh thread to achieve more precise frame delayMarton Balint2013-02-151-37/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | We use a refresh loop which displays the frames and also does the polling for pending events in a non-blocking way. If we know the required delay until the next frame, then exactly that amount of sleeping will be done. After each handled event we check if we have to display a frame which kind of makes displaying the frame a high priority event. This improves greatly the smoothness of the video output especially with 50fps content. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Revert "Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'"Michael Niedermayer2013-02-101-3/+0
| | | | | | | | | | | | | | | | | | This reverts commit d80820655362645ae1c65d457287d7d12c04a44f, reversing changes made to 30085bd43e35acf931429dc445db5bc1869be022. This is not needed Requested-by: Marton Balint
* | Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'Michael Niedermayer2013-02-101-0/+3
|\ \ | |/ | | | | | | | | | | * commit 'db0a943266be29ff0596872ebb418dfed75d00de': avplay: apply the stream sample_aspect_ratio to decoded video frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: report video frame changes only in debug modeStefano Sabatini2013-02-061-1/+1
| | | | | | | | | | In particular, remove distracting message: "Video frame changed from size:0x0 format:none serial:-1 to ..."
* | ffplay: extend feedback in case of video changesStefano Sabatini2013-02-061-2/+6
| |
* | ffplay: remove misleading comment from audio_decode_frame()Stefano Sabatini2013-02-031-1/+0
| |
* | ffplay: rename audio_decode_frame() variable "pts" to "audio_clock0"Stefano Sabatini2013-02-031-4/+4
| | | | | | | | The new name better expresses what the variable is.
* | ffplay: remove pts_ptr argument from audio_decode_frame()Stefano Sabatini2013-02-031-5/+3
| | | | | | | | The argument is no longer used outside the function. Simplify.
* | ffplay: drop redundant NULL sws_freeContext() check in stream_close()Stefano Sabatini2013-02-031-2/+1
| | | | | | | | sws_freeContext() already checks for NULL, simplify.
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2013-02-021-30/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: step to next frame if paused when seeking ffplay: move up pause functions ffplay: remember last window dimensions ffplay: fix order of setting show_mode ffplay: dynamically allocate audio buffer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: step to next frame if paused when seekingMarton Balint2013-02-021-0/+2
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: move up pause functionsMarton Balint2013-02-021-14/+14
| | | | | | | | | | | | | | | | | | No change in functionality. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: remember last window dimensionsMarton Balint2013-02-021-11/+14
| | | | | | | | | | | | | | | | | | | | | After this change the dimensions of single image videos will be remembered when coming back from full screen. The issue was mentioned in ticket #2174. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: fix order of setting show_modeMarton Balint2013-02-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Without the fix the refresh event may have got called with unset show mode. Fixes ticket #2174. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: dynamically allocate audio bufferMarton Balint2013-02-021-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | We simply remove the fixed length VideoState->audio_buf2 and use the previously unused VideoState->audio_buf1. Fixes ticket #2191. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | ffplay: extend doxy for audio_decode_frame()Stefano Sabatini2013-02-021-1/+7
|/ /
* | ffplay: flush video filters on seekMarton Balint2013-01-191-1/+4
| | | | | | | | | | | | | | | | Actually we just re-create the filters, since there is no way to flush them. Fixes hangup with yadif filter on seeking forward caused by a filtered frame with a pts before the seek. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use videoq.serial to detect obsolete framesMarton Balint2013-01-191-8/+3
| | | | | | | | | | | | | | | | | | | | | | Previously VideoPicture->skip was used for that, using videoq.serial enables us to detect obsolete frames right after pushing flush_pkt to the packet queue, so we don't have to wait for the decoder thread to pop the flush packet anymore. This is good because until now a full video picture queue may have blocked the decoder thread. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix sws_flagsMichael Niedermayer2013-01-131-0/+1
| | | | | | | | | | | | | | Fixes Ticket45 Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: extend documentation for the -vf optionStefano Sabatini2013-01-131-1/+1
| | | | | | | | In particular, make it consistent with the ffmpeg docs.
* | Replace references to "que" with the appropriate word.Clément Bœsch2013-01-031-6/+6
| | | | | | | | | | | | "que" sounds like a slang word to me. This commit renames a few variables, fix the comments and the logging messages (sometimes along with small other typo fixes).
* | ffplay: fix type of time_diff in waveform displayMarton Balint2012-12-281-1/+1
| | | | | | | | | | | | | | Fixes time diff overflow visible as showing the same few waveforms in a loop at the end of file. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: always display audio visualization if mode is setMarton Balint2012-12-281-10/+4
| | | | | | | | | | | | Fixes ticket #1903. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: hide cursor on no mouse movementMarton Balint2012-12-281-0/+13
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: reset external clock to unknown on startMarton Balint2012-12-281-1/+2
| | | | | | | | | | | | | | Fixes a delay and initial frame drops on starting realtime streams with external clock. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: only drop frames if not in frame step modeMarton Balint2012-12-281-1/+1
| | | | | | | | | | | | Fixes ticket #2053. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: move frame step pause from the video thread to video_refreshMarton Balint2012-12-281-3/+3
| | | | | | | | | | | | | | This way we pause the video right after we displayed a new frame. Partially fixes ticket #2053. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix greenish line on the right edge with some xv sizesMarton Balint2012-12-251-0/+20
| | | | | | | | | | | | | | | | | | | | If the XV image linesize was different from the width, SDL would create an overlay wider than the actually requested one. This causes a greenish line on the right, because the rightmost texel is blended with unset data. This patch introduces a function which duplicates the rightmost texel to the unset space, that way the blending will be done with duplicated border texels. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix another use of context instead of frame parametersMichael Niedermayer2012-12-221-3/+3
| | | | | | | | | | | | | | Fixes Ticket2050 Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: fix handling of resolution changes with h264-mtMichael Niedermayer2012-12-211-7/+7
| | | | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: provide some feedback in case the codec cannot be setStefano Sabatini2012-12-161-5/+11
| |
* | ffplay: set codec_id in codec contextStefano Sabatini2012-12-161-0/+1
| | | | | | | | | | | | | | | | Set codec id in case another codec is forced on the context (e.g. when the user specify the codec with -codec). For example fix: ffplay -vcodec pgmyuv -i "tests/vsynth1/%02d.pgm"
* | ffplay: improve robustness of opt_codec(), and add options acodec,vcodec,scodecStefano Sabatini2012-12-161-8/+21
| | | | | | | | | | | | | | Fail with a meaningfull error message in case of bogus input. Also the new options are more consistent with the rest of the tool options, since it does not support generic stream specifiers.
OpenPOWER on IntegriCloud