aboutsummaryrefslogtreecommitdiffstats
path: root/ffplay.c
Commit message (Collapse)AuthorAgeFilesLines
* Use new av_dict_set_int helper function.Reimar Döffinger2014-08-161-1/+1
| | | | | | | 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-151-1/+1
| | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-151-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-2/+2
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: increase subtitle que sizeMichael Niedermayer2014-07-121-1/+1
| | | | | | | | | | | | | | 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-241-1/+1
| | | | | | | | | | | | | | | | 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-241-3/+2
| | | | | | | | | | | | | | | | | | 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-241-4/+6
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: pass simple integers to calculate_display_rect and ↵Marton Balint2014-06-241-14/+13
| | | | | | | | | | | | | | | | set_default_window_size No change in functionality. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: eliminate pictq_prev_pictureMarton Balint2014-06-241-29/+25
| | | | | | | | | | | | | | | | | | | | | | Instead of directly rolling back the frame queue, keep the last displayed picture in the queue and use a boolean variable to keep track if it is displayed or not. This makes the code cleaner because it removes the complicated logic in pictq_prev_picture. There should be no change in functionality. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove -ec handling codeMichael Niedermayer2014-06-171-3/+0
| | | | | | | | | | | | Its handled by the generic option code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: support rotated video.Clément Bœsch2014-05-231-8/+43
| | | | | | | | | | | | | | with -f lavfi -i testsrc=s=hd1080 as source: rotate=90*PI/180 vs transpose=clock: 42fps -> 64fps rotate=180*PI/180 vs vflip,hflip: 75fps -> 77fps rotate=270*PI/180 vs transpose=cclock: 43fps -> 63fps
* | ffplay: Use av_gettime_relative()Olivier Langlois2014-05-171-13/+13
| | | | | | | | | | | | | | | | | | | | Whenever av_gettime() is used to measure relative period of time, av_gettime_relative() is prefered as it guarantee monotonic time on supported platforms. Signed-off-by: Olivier Langlois <olivier@trillion01.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: add support for toggling between multiple video filters with the w keyMarton Balint2014-05-171-6/+30
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: try multiple sample rates if audio open failsMarton Balint2014-05-171-5/+15
| | | | | | | | | | | | Should fix ticket #3509. Signed-off-by: Marton Balint <cus@passwd.hu>
* | cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" ↵John Peebles2014-05-171-1/+1
| | | | | | | | | | | | | | | | because MSVC only defines _WIN32 With the previous patch, this should fix ticket #3580 as well. Signed-off-by: John Peebles <johnpeeb@gmail.com>
* | ffplay: fix compilation with Visual StudioMarton Balint2014-05-171-1/+4
| | | | | | | | | | | | | | | | Based on a patch by achristensen from trac.ffmpeg.org. Partially fixes ticket #3580. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: increase AV_SYNC_THRESHOLD_MIN to 0.04Marton Balint2014-05-171-1/+1
| | | | | | | | | | | | | | | | Less than 0.04 sec delays should not be noticable, and it helps us with 50fps content where some timing errors can cause a frame dup where it is not really necessary. Signed-off-by: Marton Balint <cus@passwd.hu>
* | avformat: add av_format_inject_global_side_data(), and disable it by defaultMichael Niedermayer2014-04-151-0/+2
| | | | | | | | | | | | | | | | | | | | After this commit applications needs to call av_format_inject_global_side_data() or handle AVStream side data by some other means if they want it not to be lost. This fixes a API incompatibility with libav. libav API does not allow the data to be passed through AVPackets Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: display information on stream cyclingMichael Niedermayer2014-03-121-0/+5
| | | | | | | | | | Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'Michael Niedermayer2014-02-101-4/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d': avplay: add support for seeking to chapter marks Conflicts: doc/ffplay.texi ffplay.c ffplay uses pageup/down for seeking by +-10min thus this use of the keys conflicts. The merge thus uses them to seek to chapters when there are some or +-10min when there are not Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: flush subtitle codecs as well with null packetsMarton Balint2014-02-051-0/+2
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: reorder the filters to ensure that inputs of the custom filters are ↵Marton Balint2014-02-051-1/+6
| | | | | | | | | | | | | | | | merged first For more info see http://ffmpeg.org/pipermail/ffmpeg-user/2013-December/018761.html Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove redundant prototypeLukasz Marek2014-01-271-2/+0
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: do not wait for the picture allocation to finish on exitMarton Balint2013-12-291-1/+1
| | | | | | | | | | | | | | | | When SDL could not allocate a YUV overlay or open a window, the video thread got locked up because it waited for the allocation to finish forever. Reported-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove two unneeded av_free_packet callsMarton Balint2013-12-291-2/+0
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove some unneded av_frame_unref callsMarton Balint2013-12-291-2/+0
| | | | | | | | | | | | av_buffersrc_add_frame implicitly unreferences the added frame. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove unneeded avcodec_get_frame_defaultsMarton Balint2013-12-291-2/+0
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use precalculated frame size and bytes per sec valuesMarton Balint2013-12-291-6/+3
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: precalculate audio output frame size and byte per secMarton Balint2013-12-291-0/+8
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'Michael Niedermayer2013-12-111-1/+0
|\| | | | | | | | | | | | | | | | | | | * commit '84f131921ffb43d8070d5680e91f6a24d66ccac4': avplay: do not call avcodec_get_frame_defaults(). Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: set default window size before starting audioMarton Balint2013-12-061-0/+7
| | | | | | | | | | | | Fixes ticket #2381. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: factor out function setting default window sizeMarton Balint2013-12-061-6/+10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove no longer necessary codec flushMarton Balint2013-12-061-1/+0
| | | | | | | | | | | | | | | | It was introduced in c2e8691c07ca52de7b6b00ba8f2b30c56fd786d7, but since we no longer no longer provide a custom get_buffer callback, the original cause of the issue is gone. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: do not wait for flushing the picture queue on flush packetMarton Balint2013-12-061-9/+4
| | | | | | | | | | | | | | | | It is no longer necessary. Also do frame timer and video current pos reset in the main thread because with the wait removed, the timing would not be optimal in the read thread. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: do not call avcodec_register_all() explicitlyStefano Sabatini2013-11-251-1/+0
| | | | | | | | avcodec_register_all() is implicitly called by av_register_all().
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-241-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'Michael Niedermayer2013-11-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b9c3b4505206143d85398c1410949319fa1180f': Replace all instances of avcodec_alloc_frame() with av_frame_alloc(). Conflicts: doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c libavcodec/alacenc.c libavcodec/libopenjpegenc.c libavcodec/libvpxenc.c libavcodec/pcm.c libavcodec/xbmenc.c libavcodec/xwdenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: calculate last frame duration from vp->pts instead of frame_last_ptsMarton Balint2013-11-161-27/+5
| | | | | | | | | | | | | | | | Also do not update current pts on dropped frames, it is no longer necessary. Fixes regression part of ticket #2507. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: simplify early frame drop codeMarton Balint2013-11-161-6/+5
| | | | | | | | | | | | Also never early frame drop the first frame after a flush. Signed-off-by: Marton Balint <cus@passwd.hu>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-27 21:15:40 +0000