summaryrefslogtreecommitdiff
path: root/ffplay.c
Commit message (Collapse)AuthorAgeFilesLines
* Put remaining pieces of CODEC_FLAG_EMU_EDGE under FF_API_EMU_EDGE.Ronald S. Bultje2015-08-281-0/+4
| | | | | | The amv one probably looks suspicious, but since it's an intra-only codec, I couldn't possibly imagine what it would use the edge for, and the vsynth fate result doesn't change, so it's probably OK.
* ffplay: remove unused include libavutil/colorspace.hZhang Rui2015-08-281-1/+0
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffplay: increase MIN_FRAMES to 25Marton Balint2015-08-091-1/+1
| | | | | | | | | | | FFplay was using a 5 frame packet buffer, this is not much (e.g. 200 ms for 25fps video), when HLS is requesting a new segment via HTTP, it may take longer for the request to complete. Should fix ticket #4720. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: add specific constants for buffer fullness settings when using ↵Marton Balint2015-08-091-4/+6
| | | | | | external clock Signed-off-by: Marton Balint <cus@passwd.hu>
* cmdutils: remove sws_opts usage, simplify codeMichael Niedermayer2015-08-081-2/+13
| | | | | | It has become unused as all code was switched to AVDictionary Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffplay: pass all sws options to the filter graphMichael Niedermayer2015-08-081-3/+11
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffplay: do not block audio thread on WIN32Marton Balint2015-08-051-0/+7
| | | | | | | | | | | The windows SDL audio driver plays the old data in the buffer in a loop if it is not updated in time. So instead of waiting for data and blocking the the audio thread, return silence if no data is available. Should fix ticket #2289. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: Use sws_scale to scale subtitlesMichael Niedermayer2015-07-291-213/+71
| | | | | | | | | | | | | | | | Fixes some files from Ticket679 This also changes subtitles to 4:2:0 matching the output format and thus simplifying the blend code. This restricts placement to the chroma sample resolution though, speak up if you consider this a problem, say so, the code could be changed to use YUV444 for subtitles and scaling them down while blending, this would be slower though. The current code only uses a single swscale context and reinitializes it as needed, this could be changed as well if needed Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-271-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* \ Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-271-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffplay: use av_clip() instead of nested min & maxClément Bœsch2015-06-061-1/+1
| | | | | | | | Note: {wanted,min,max}_samples are int variables.
* | ffplay&cmdutils:Factor get_rotation() code outMichael Niedermayer2015-05-031-16/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: unify displaymatrix based rotation codeMichael Niedermayer2015-05-031-22/+23
| | | | | | | | | | Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37'Michael Niedermayer2015-05-021-0/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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-021-14/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-301-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-201-2/+8
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-201-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-221-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-041-1/+4
| | | | | | | | | | | | | | | | 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-171-0/+5
|\ \ | |/ | | | | | | | | | | * commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4': avplay: Check format allocation inside decode_thread() Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97'Michael Niedermayer2015-02-171-0/+3
|\ \ | |/ | | | | | | | | | | * 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-101-32/+22
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: make eof part of videostate and signal it when opening a streamMarton Balint2015-02-101-5/+7
| | | | | | | | | | | | | | 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-101-1/+1
| | | | | | | | | | | | 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-021-1/+3
| | | | | | | | | | Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: dump format before selecting streamsMarton Balint2015-01-011-3/+3
| | | | | | | | | | | | | | 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-011-13/+22
| | | | | | | | | | | | 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-011-1/+0
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove flushed state from decoder contextMarton Balint2015-01-011-4/+0
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix mem leak when opening input or parsing options fail.Benoit Fouet2014-11-221-2/+3
| | | | | | | | | | 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-111-2/+1
| | | | | | | | | | | | | | 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-091-0/+8
| | | | | | | | Fixes ticket #3762.
* | ffplay: only output null packet once on EOFMarton Balint2014-11-091-12/+10
| | | | | | | | | | | | 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-091-93/+89
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: implement separete audio decoder threadMarton Balint2014-11-091-112/+153
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove manual bug option handling codeMarton Balint2014-10-171-3/+0
| | | | | | | | | | | | 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-171-7/+0
| | | | | | | | | | | | Once the frame queue is full, we will wait anyway. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'Michael Niedermayer2014-10-171-7/+13
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc': avplay: Always free opts Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'Michael Niedermayer2014-10-171-3/+5
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-091-1/+3
| | | | | | | | | | | | | | | | | | | | 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-271-6/+5
| | | | | | | | | | | | | | | | | | | | 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-241-1/+1
| | | | | | | | | | | | 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-231-30/+37
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: factorize decoder functions to generic decoderMarton Balint2014-09-231-121/+140
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: handle fullscreen status on resize eventMarton Balint2014-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | 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-171-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: use frame queue to determine last used posMarton Balint2014-09-161-7/+15
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: factorize frame queue operationsMarton Balint2014-09-161-158/+199
| | | | | | | | | | | | | | | | | | 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-081-1/+1
| | | | | | | | Reviewed-by: Marton Balint
View Lorry Controller Status