summaryrefslogtreecommitdiffstats
path: root/ffplay.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'Michael Niedermayer2013-04-281-1/+1
|\ | | | | | | | | | | | | | | | | | | * 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-211-0/+4
| | | | | | | | | | | | 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-201-1/+2
| | | | | | | | | | | | 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-201-11/+11
| | | | | | | | | | | | Assuming 0 pts may lead to bad framedrop decisions... Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: simplify aspect ratio calculationMarton Balint2013-04-201-5/+2
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use format title metadata to set window caption.Clément Bœsch2013-04-171-0/+3
| |
* | ffplay: replace opaque/params for buffersinksMichael Niedermayer2013-04-121-26/+24
| | | | | | | | | | | | This fixes a regression caused by droping opaque. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'Michael Niedermayer2013-04-121-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-111-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-29/+12
| | | | | | | | | | | | Also use frame->pts instead of a standalone variable Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix indentationMarton Balint2013-04-081-25/+24
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: handle audio buffersink output properly with buffering filtersMarton Balint2013-04-081-8/+18
| | | | | | | | | | | | 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-081-4/+7
| | | | | | | | | | | | Fixes ticket #2408. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use seek per time for ogg by defaultMichael Niedermayer2013-04-021-1/+1
| | | | | | | | | | | | | | 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-301-5/+12
| | | | | | | | | | | | | | | | 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-301-1/+3
| | | | | | | | | | | | | | 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-301-0/+3
| | | | | | | | | | 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-231-0/+1
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: silence warning of mixed enumeration typesPaul B Mahol2013-03-191-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffplay: remove options skiploop, skipidct, skipframeStefano Sabatini2013-03-171-9/+0
| | | | | | | | | | | | | | | | | | 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-171-1/+0
| | | | | | | | | | | | Fix warning: ffplay.c: In function ‘video_thread’: ffplay.c:1890:21: warning: unused variable ‘codec’ [-Wunused-variable]
* | ffplay: add -af optionMarton Balint2013-03-171-2/+167
| | | | | | | | | | | | | | 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-171-3/+5
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use frame->pts if available for setting the audio clockMarton Balint2013-03-171-8/+11
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: restructure audio stream opening codeMarton Balint2013-03-171-12/+12
| | | | | | | | | | | | Preparation for -af support. Signed-off-by: Marton Balint <cus@passwd.hu>
* | 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.
OpenPOWER on IntegriCloud