summaryrefslogtreecommitdiff
path: root/ffplay.c
Commit message (Collapse)AuthorAge
* ffplay: remove remains of the old audio and video clock VideoState variablesMarton Balint2013-06-17
| | | | | | The unified clock state holds this information now. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: fix missed conversion of video_current_pts to vidclk.pts in subtitlesMarton Balint2013-06-17
| | | | | | | Fixes regression with subtitles introduced in f2175a6. Fixes ticket #2666. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: cast vp->height to int64 in buffer size checkMarton Balint2013-06-17
| | | | | | Fixes Coverity CID 1026769 and 1026756. Signed-off-by: Marton Balint <cus@passwd.hu>
* Use av_log() instead of fprintf() in ffplay.Carl Eugen Hoyos2013-06-04
| | | | | | Fixes ticket #2630. Reviewed-by: Marton Balint
* ffplay: detect when the created overlay buffers are not valid for the wanted ↵Marton Balint2013-06-01
| | | | | | | | | overlay height Fixes cases when the picture height was bigger than the maximum supported overlay height... Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: do not allow wider window than 16383Marton Balint2013-06-01
| | | | | | | SDL surface pitch is 16bit, to avoid possible overflows, we limit the window width to 16383. Fixes ticket #2428. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: use 0 frame delay if redisplaying an already displayed frameMarton Balint2013-06-01
| | | | | | With the previous patches this finally fixes ticket #1707. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: use more sane frame timer resetting logicMarton Balint2013-06-01
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: only update pts if not redisplaying a frameMarton Balint2013-06-01
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: fix compute_target_delay to better handle frames with long durationsMarton Balint2013-06-01
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: if playing only audio or video only, show the master clock diff in ↵Marton Balint2013-06-01
| | | | | | | | | status line Showing A-V diff has no use if there is no audio and video stream, but showing the audio or video clock difference to the master clock can be useful. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: factorize clock functionsMarton Balint2013-06-01
| | | | | | There should be no change in functionality. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: decrease video picture queue size to 3Marton Balint2013-06-01
| | | | | | | | It was raised to 4 because of a theoretical issue, if we ensure that we do not return from the display function without popping one picture from the queue, then its OK to use the old size. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: dont forget passing lowres to private optionsMichael Niedermayer2013-05-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'Michael Niedermayer2013-04-28
|\ | | | | | | | | | | | | | | | | | | * commit '26a44143efb513a602542fb59aee87b1fc62af51': avplay: remove a warning Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: check av_samples_get_buffer_size() returnMichael Niedermayer2013-04-21
| | | | | | | | | | | | Fixes CID1005310 Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: only do early frame drop if video queue is not emptyMarton Balint2013-04-20
| | | | | | | | | | | | Fixes ticket #2446. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use AV_NOPTS_VALUE video frame pts instead of using 0Marton Balint2013-04-20
| | | | | | | | | | | | Assuming 0 pts may lead to bad framedrop decisions... Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: simplify aspect ratio calculationMarton Balint2013-04-20
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use format title metadata to set window caption.Clément Bœsch2013-04-17
| |
* | ffplay: replace opaque/params for buffersinksMichael Niedermayer2013-04-12
| | | | | | | | | | | | This fixes a regression caused by droping opaque. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'Michael Niedermayer2013-04-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da': lavfi: change the filter registering system to match the other libraries Conflicts: cmdutils.c ffplay.c libavfilter/avfilter.c libavfilter/avfilter.h This removes the ability to put AVFilters in read only memory and having them shareable. Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'Michael Niedermayer2013-04-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38f0c0781a6e099f11c0acec07f9b8be742190c4': lavfi: merge avfiltergraph.h into avfilter.h Conflicts: doc/APIchanges ffmpeg_filter.c libavfilter/avfilter.h libavfilter/avfiltergraph.h libavfilter/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: simplify video pts calculationMarton Balint2013-04-08
| | | | | | | | | | | | Also use frame->pts instead of a standalone variable Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix indentationMarton Balint2013-04-08
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: handle audio buffersink output properly with buffering filtersMarton Balint2013-04-08
| | | | | | | | | | | | Fixes cases when the audio filter generates less or more frames than the input. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: set time_base of audio filter buffer srcMarton Balint2013-04-08
| | | | | | | | | | | | Fixes ticket #2408. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use seek per time for ogg by defaultMichael Niedermayer2013-04-02
| | | | | | | | | | | | | | Fixes Ticket2383 Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: always queue attachment pictures after flushing the video packet queueMarton Balint2013-03-30
| | | | | | | | | | | | | | | | Requeue them after seeking and also after opening a video stream. Also don't fill the video queue in case of an attached picture video stream since there will be no more than one packet from that stream. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix early frame dropped pts serialMarton Balint2013-03-30
| | | | | | | | | | | | | | Fixes early frame drop which was kind of broken since 26c208cf0ff59efd7786528884a64d35fc42e9bf. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use av_guess_frame_rate()Michael Niedermayer2013-03-30
| | | | | | | | | | Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: avoid frame data leak on early frame dropMarton Balint2013-03-23
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: silence warning of mixed enumeration typesPaul B Mahol2013-03-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffplay: remove options skiploop, skipidct, skipframeStefano Sabatini2013-03-17
| | | | | | | | | | | | | | | | | | The corresponding codec options (skip_loop, skip_idct, skip_frame) can be set in a more flexible way. This technically causes a user interface break, but since the options were not even documented and we just released a major version that should not be a serious issue.
* | ffplay: remove unused variable "codec"Stefano Sabatini2013-03-17
| | | | | | | | | | | | Fix warning: ffplay.c: In function ‘video_thread’: ffplay.c:1890:21: warning: unused variable ‘codec’ [-Wunused-variable]
* | ffplay: add -af optionMarton Balint2013-03-17
| | | | | | | | | | | | | | Based on a patch by Stefano Sabatini <stefasab@gmail.com>: http://ffmpeg.org/pipermail/ffmpeg-devel/2013-February/138452.html Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use refcounted frames for audioMarton Balint2013-03-17
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use frame->pts if available for setting the audio clockMarton Balint2013-03-17
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: restructure audio stream opening codeMarton Balint2013-03-17
| | | | | | | | | | | | Preparation for -af support. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4'Michael Niedermayer2013-03-13
|\| | | | | | | | | | | | | | | | | | | * 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-12
| |
* | Merge commit '354468fc12dcf93e7fb4af552e18906771913273'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: do not cycle through unavailable show modesMarton Balint2013-02-27
| | | | | | | | | | | | Fixes ticket #2200. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: add option to disable subtitlingMarton Balint2013-02-27
| | | | | | | | | | | | Fixes ticket #2201. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use NAN to signal invalid external clockMarton Balint2013-02-27
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: if audio or video clock is invalid return NANMarton Balint2013-02-27
| | | | | | | | | | | | | | 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-27
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: return true for pictq_prev_picture if it was successfulMarton Balint2013-02-27
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: only quit from audio_decode_frame before decoding when pausedMarton Balint2013-02-27
| | | | | | | | | | | | | | 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>