summaryrefslogtreecommitdiff
path: root/ffplay.c
Commit message (Collapse)AuthorAge
* ffplay: use av_clip() instead of nested min & maxClément Bœsch2015-06-06
| | | | Note: {wanted,min,max}_samples are int variables.
* ffplay&cmdutils:Factor get_rotation() code outMichael Niedermayer2015-05-03
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffplay: unify displaymatrix based rotation codeMichael Niedermayer2015-05-03
| | | | | Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37'Michael Niedermayer2015-05-02
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37': avplay: Add support for rotated video Conflicts: configure doc/ffplay.texi ffplay.c See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '21180b73239c6360aa28496d4879713b7ba4a8e5'Michael Niedermayer2015-05-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '21180b73239c6360aa28496d4879713b7ba4a8e5': avplay: Factorize code for adding filters to the filter pipeline Conflicts: ffplay.c See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'Michael Niedermayer2015-04-30
|\| | | | | | | | | | | | | | | | | | | * commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e': avplay: Do not print a possibly uninitialized value Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'Michael Niedermayer2015-04-20
|\| | | | | | | | | | | | | | | | | | | * commit '336d2f0979b43a39bd11a047d798b7990d8b07c6': avplay: Free frame and graph when memory allocation fails Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7'Michael Niedermayer2015-03-22
|\| | | | | | | | | | | | | | | | | | | * commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7': avplay: Check memory allocation Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: Switch to show waves mode if allocation/init of RDFT failsMichael Niedermayer2015-03-04
| | | | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Paweł <pantrombka@gmail.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | * commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4': avplay: Check format allocation inside decode_thread() Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | * commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97': avplay: Check frame allocation inside video_thread() Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: factorize thread starting and stopping code into decoderMarton Balint2015-02-10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: make eof part of videostate and signal it when opening a streamMarton Balint2015-02-10
| | | | | | | | | | | | | | Otherwise we may not flush a decoder when a new stream is opened during an already eof condition. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: update frame timer based on last updated clock time when toggling pauseMarton Balint2015-02-10
| | | | | | | | | | | | It is better than using simply video clock, because video clock may be NAN. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: Fallback to dts if pts is unavailable in pkt_in_play_range calculationMichael Niedermayer2015-02-02
| | | | | | | | | | Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: dump format before selecting streamsMarton Balint2015-01-01
| | | | | | | | | | | | | | This helps the user to see the available streams just before the error message if the stream specifiers do not match. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: add support for stream specifiers in -ast, -vst, -sst optionsMarton Balint2015-01-01
| | | | | | | | | | | | Also fix the outdated documentation of these options. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove unused no_background from videostateMarton Balint2015-01-01
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove flushed state from decoder contextMarton Balint2015-01-01
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix mem leak when opening input or parsing options fail.Benoit Fouet2014-11-22
| | | | | | | | | | Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: signal the frame queue before closing audioMarton Balint2014-11-11
| | | | | | | | | | | | | | Fixed regression caused by 631ac655c00e978e19d05dab572bc1ffd6078c63 when ffplay does not quit if the audio thread is blocked. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Set -scan_all_pmts 1 in ffmpeg, ffplay and ffprobe if not set by user.Carl Eugen Hoyos2014-11-09
| | | | | | | | Fixes ticket #3762.
* | ffplay: only output null packet once on EOFMarton Balint2014-11-09
| | | | | | | | | | | | The generic decoder properly flushes the codecs with one null packet as well. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix indentation after last commitMarton Balint2014-11-09
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: implement separete audio decoder threadMarton Balint2014-11-09
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove manual bug option handling codeMarton Balint2014-10-17
| | | | | | | | | | | | It is supported as a codec option, and those are already parsed. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove delays when paused from video and subtitle threadMarton Balint2014-10-17
| | | | | | | | | | | | Once the frame queue is full, we will wait anyway. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | | | | | * commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc': avplay: Always free opts Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | | | | | * commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767': avplay: Always free find_stream_info options Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: dont leave swresampler in half initialized stateMarton Balint2014-10-09
| | | | | | | | | | | | | | | | | | | | On init failure, let's just free it, so next time it will be recreated from start. Also fixes Coverity CID 1241515. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: Separate AVFrame from AVSubtitleMichael Niedermayer2014-09-27
| | | | | | | | | | | | | | | | | | | | This is more robust and should avoid false positives in coverity That is if the type is ever mixed up, after this patch that would just be a null pointer dereference instead of a random possibly out of array access Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: use av_codec_get_pkt_timebase()Michael Niedermayer2014-09-24
| | | | | | | | | | | | Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: move pts calculating code to generic decoderMarton Balint2014-09-23
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: factorize decoder functions to generic decoderMarton Balint2014-09-23
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: handle fullscreen status on resize eventMarton Balint2014-09-23
| | | | | | | | | | | | | | | | | | | | In some cases resize events can happen even during fullscreen, so let's pass the proper flag to SDL_SetVideoMode. Fixes ticket #3964. Reported-by: Jeff Dwork <jeff@reggie.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: try to fix build failure on appleMichael Niedermayer2014-09-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: use frame queue to determine last used posMarton Balint2014-09-16
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: factorize frame queue operationsMarton Balint2014-09-16
| | | | | | | | | | | | | | | | | | Create a generic frame and a frame queue struct to handle video picture queues and subtitle picture queues with common code. Also add the possibility to queue AVFrames, however at the moment we only use SDL_Overlay buffers for video and AVSubtitles for subtitles. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Revert the default for ffplay to -noautoexit.Carl Eugen Hoyos2014-09-08
| | | | | | | | Reviewed-by: Marton Balint
* | ffplay: make autoexit the defaultMichael Niedermayer2014-09-06
| | | | | | | | | | See: f9bc65e399d1883da21ae03d07b09348a11a5f49 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: use av_malloc_array()Michael Niedermayer2014-08-26
| | | | | | | | | | Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use new av_dict_set_int helper function.Reimar Döffinger2014-08-16
| | | | | | | | | | | | | | Get rid of the many, slightly differing, implementations of basically the same thing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Drop remaining unneeded != NULLMichael Niedermayer2014-08-15
| | | | | | | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | replace calls to url_feof() with avio_feof()James Almer2014-08-08
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: increase subtitle que sizeMichael Niedermayer2014-07-12
| | | | | | | | | | | | | | Fixes part of Ticket2516 with ffplay Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: decrease audio_diff_thresholdMarton Balint2014-06-24
| | | | | | | | | | | | | | | | Since audio clock calculations are more accurate now, it is safe to decrease the sync treshold to compensate the larger buffers caused by less frequent audio callbacks. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: decrease max audio callbacks per secondMarton Balint2014-06-24
| | | | | | | | | | | | | | | | | | Too many audio callbacks per second can cause buffer underruns especially under load. As now we take into accound the elapsed time after an audio callback when determining current audio clock, it is not that important to use small buffer sizes and frequent audio callbacks, so lets remove the comment. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: calculate SDL audio buffer size based on sample rateMarton Balint2014-06-24
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>