summaryrefslogtreecommitdiffstats
path: root/ffplay.c
Commit message (Collapse)AuthorAgeFilesLines
* ffplay: add smarter method for determining video picture durationMarton Balint2013-11-051-1/+13
| | | | | | | | | - consider it an invalid PTS when the next PTS value is the same as the current one - in case of invalid or unknown PTS, return vp->duration This fixes ffplay part of ticket #3005. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: add frame duration estimated from frame rate to VideoPictureMarton Balint2013-11-051-2/+8
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: avoid code duplication in AVFILTER enabled and disabled caseMarton Balint2013-11-051-6/+5
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: add support for libswresample optionsMarton Balint2013-10-261-0/+8
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: use av_frame_get_pkt_pos instead directly accessing pkt posMarton Balint2013-10-261-2/+2
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: factor out picture freeing codeMarton Balint2013-10-261-10/+11
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: update and extend documentation for channel and stream switchingMarton Balint2013-10-261-2/+2
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: add support for changing the channel by the C keyMarton Balint2013-10-131-0/+6
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: cycle through the streams of the current program, and not every streamMarton Balint2013-10-131-2/+20
| | | | | | | When changing the audio, video or subtitle stream, from now on, ffplay will cycle through the streams of the current program. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: add null packet after attached pics packetMarton Balint2013-10-131-0/+1
| | | | | | Fixes ticket #2904. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: factor out putting null packet into the queueMarton Balint2013-10-131-14/+14
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: avoid direct access to lowres use av_codec_g/set_lowres()Michael Niedermayer2013-10-031-6/+7
| | | | | Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffplay: avoid direct access to max_lowres use av_codec_get_max_lowres()Michael Niedermayer2013-10-031-3/+3
| | | | | | | | This avoids future ABI issues when the field is moved to the end of the struct. Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffplay: make next_nb_channels[] static constMichael Niedermayer2013-08-241-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffplay: check for filter EOF return codesMarton Balint2013-08-091-0/+4
| | | | | | Fixes ticket #2800. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: ensure the decoder is flushed before exiting or loopingMarton Balint2013-08-091-8/+17
| | | | | | | | | | Also make sure that we only exit or restart the video if it is not paused and if the picture queue is empty. There is still room for improvement (filters may also buffer some frames), but the patch fixes the most common use cases and ticket #2783 as well. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: fix memleak of non-bitmap subtitlesMarton Balint2013-08-091-0/+2
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: free subtitle pictures on exitMarton Balint2013-08-091-0/+2
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-261-1/+2
|\ | | | | | | | | | | | | | | | | | | | | * qatar/master: miscellaneous typo fixes Conflicts: configure libavformat/avisynth.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: improve error message in case of failure, mention filtergraph ↵Stefano Sabatini2013-07-211-1/+2
| | | | | | | | configuration
* | ffplay: fix build with disabled avfilterMarton Balint2013-07-211-0/+4
| | | | | | | | | | | | Got broken in b383498e. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use start_time as next audio pts on flush when seeking is not supportedMarton Balint2013-07-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | Theoretically using start_time should also work if seeking is available and we could determine that the next packet after a flush packet is the first packet of a stream, but I could not think of an easy and clean way to do that, that is why I sticked to the no seeking available condition for now. Fixes ticket #2647. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: estimate audio frame pts from the previous frame pts valuesMarton Balint2013-07-201-2/+9
| | | | | | | | | | | | | | | | | | | | | | Previously we estimated the audio packet pts instead of the frame pts, therefore it only worked within a single packet (containing multiple frames). The new method works accross seperate audio packets as well and also handles better the case if a decoder buffers several packets before outputting a decoded frame. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: simplify audio decodingMarton Balint2013-07-201-13/+7
| | | | | | | | | | | | | | Also use negative stream_index for signaling obsolete audio packets. Using the size alone is not enough, because size is 0 for null packets as well. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove explicit idct optionMichael Niedermayer2013-07-131-3/+0
| | | | | | | | | | | | | | this allows named idct options to be used Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: assume 0 stream start time if start time is unset in duration checkMarton Balint2013-07-091-1/+3
| | | | | | | | | | | | Fixes ticket #2103 and #2743. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: do not update audio clock with old audio pts if current frame is ↵Marton Balint2013-07-091-5/+8
| | | | | | | | | | | | AV_NOPTS_VALUE Signed-off-by: Marton Balint <cus@passwd.hu>
* | lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at ↵Stefano Sabatini2013-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the next bump Add function avfilter_graph_parse_ptr() and favor it in place of avfilter_graph_parse(), which will be restored with the old/Libav signature at the next bump. If HAVE_INCOMPATIBLE_LIBAV_API is enabled it will use the Libav-compatible signature for avfilter_graph_parse(). At the next major bump the current implementation of avfilter_graph_parse() should be dropped in favor of the Libav/old implementation. Should address trac ticket #2672.
* | ffplay: always send zero packets to flush audio decodersMarton Balint2013-07-011-2/+1
| | | | | | | | | | | | | | Zero packets are needed not for codecs with CODEC_CAP_DELAY but for multithreaded decoders as well. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use frame->pkt_pts instead of pkt->pts in audio pts calculationMarton Balint2013-07-011-2/+2
| | | | | | | | | | | | Fixes ticket #2717. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: simplify and fix flushing out old subtitles on seekingMarton Balint2013-06-261-24/+9
| | | | | | | | | | | | Fixes the additional issue reported in ticket #2666. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove remains of the old audio and video clock VideoState variablesMarton Balint2013-06-171-4/+0
| | | | | | | | | | | | 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-171-2/+2
| | | | | | | | | | | | | | 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-171-1/+1
| | | | | | | | | | | | 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-041-33/+48
| | | | | | | | | | | | Fixes ticket #2630. Reviewed-by: Marton Balint
* | ffplay: detect when the created overlay buffers are not valid for the wanted ↵Marton Balint2013-06-011-1/+3
| | | | | | | | | | | | | | | | | | 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-011-3/+8
| | | | | | | | | | | | | | 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-011-1/+4
| | | | | | | | | | | | 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-011-2/+3
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: only update pts if not redisplaying a frameMarton Balint2013-06-011-1/+1
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix compute_target_delay to better handle frames with long durationsMarton Balint2013-06-011-5/+11
| | | | | | | | 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-011-1/+6
| | | | | | | | | | | | | | | | | | 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-011-80/+75
| | | | | | | | | | | | 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-011-4/+4
| | | | | | | | | | | | | | | | 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-281-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
OpenPOWER on IntegriCloud