summaryrefslogtreecommitdiff
path: root/ffplay.c
Commit message (Collapse)AuthorAge
* ffplay: dont wait 100ms if data is not yet readyMarton Balint2012-09-16
| | | | | | | Also signal the wait if audio buffer is empty. This fixes jerky audio with realtime sources. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: use PTS from the AVSubtitle structure.Nicolas George2012-09-15
|
* ffplay: increase sample array bufferMarton Balint2012-09-11
| | | | | | | | | A decoded and resampled audio frame may not fit in the current size which is not handled by the current code causing out of order waveform displays or even channel mixups. A todo is added because this part can certainly be improved to consume less memory but work reliably for any frame size. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: ensure that pictq_prev_picture never fills the picture queueMarton Balint2012-09-11
| | | | | | | It was theoretically possible for pictq_prev_picture to fill the picture queue which may have caused problems when a write to the queue was still in progress. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: simplify picture allocationMarton Balint2012-09-11
| | | | | | | | This also makes sure the aspect ratio of the picture is set before allocating the picture, this way video_open can calculate with the correct aspect ratio even for the first frame. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: make initial window size calculation based on aspect ratioMarton Balint2012-09-11
| | | | | | Fixes ticket #291. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: factor display rectangle calculation to its own functionMarton Balint2012-09-11
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* Merge remote-tracking branch 'cus/stable'Michael Niedermayer2012-09-01
|\ | | | | | | | | | | | | | | | | * cus/stable: ffplay: only free vfilters on exit ffplay: replace SDL_delay in read thread with SDL_CondWait ffplay: requeue last picture on forced video refresh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffplay: only free vfilters on exitMarton Balint2012-08-31
| | | | | | | | | | | | | | | | Freeing it in the end of the video thread is not a good idea, because we still may need the filter names for the next video thread, in order to apply the filters after chaning the video stream. Signed-off-by: Marton Balint <cus@passwd.hu>
| * ffplay: replace SDL_delay in read thread with SDL_CondWaitMarton Balint2012-08-31
| | | | | | | | | | | | | | | | | | When the audio queue was empty, it was not filled until the 10ms delay expired in the read thread. This patch changes the delay method with a condition wait, which reacts to an empty queue a lot faster, therefore the audio buffer underruns become less common especially after seeking. Signed-off-by: Marton Balint <cus@passwd.hu>
| * ffplay: requeue last picture on forced video refreshMarton Balint2012-08-31
| | | | | | | | | | | | Fixes ticket #1609. Signed-off-by: Marton Balint <cus@passwd.hu>
* | avoid ambigous buffersink namesMichael Niedermayer2012-09-01
|/ | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffplay: get rid of void casts in the option tableMichael Niedermayer2012-08-31
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffplay: fix function parametersMichael Niedermayer2012-08-31
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'Michael Niedermayer2012-08-31
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5': x86: Fix linking with some or all of yasm, mmx, optimizations disabled configure: Add more fine-grained SSE CPU capabilities flags avfilter: x86: Use more precise compile template names x86: cosmetics: Comment some #endifs for better readability g723_1: add comfort noise generation utvideoenc: Switch to dsputils' median prediction utvideoenc: Avoid writing into the input picture avtools: remove the distinction between func_arg and func2_arg. avconv: make the -passlogfile option per-stream. avconv: make the -pass option per-stream. cmdutils: make -codecs print lossy/lossless flags. lavc: add lossy/lossless codec properties. Conflicts: Changelog cmdutils.c configure doc/APIchanges ffmpeg.h ffmpeg_opt.c ffprobe.c libavcodec/codec_desc.c libavcodec/g723_1.c libavcodec/utvideoenc.c libavcodec/version.h libavcodec/x86/mpegaudiodec.c libavcodec/x86/rv40dsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: fix odd YUV width by cropping the videoMarton Balint2012-08-27
| | | | | | | | | | | | | | Should fix issue #1322. Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: Add FATE tests for the Ut Video encoder lavc: add Ut Video encoder mpegvideo_enc: remove stray duplicate line from 7f9aaa4 swscale: x86: fix #endif comments in rgb2rgb template file avconv: mark more options as expert. avconv: split printing "main options" into global and per-file. avconv: refactor help printing. Conflicts: Changelog ffmpeg_opt.c ffserver.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'Michael Niedermayer2012-08-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174': avconv: print info/capabilities options in a separate help group. avtools: add -h demuxer/muxer cmdutils: extend -h to allow printing codec details. Conflicts: cmdutils.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'Michael Niedermayer2012-08-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c5012127fb7e18f0616011257bb4248f6a8b608': cmdutils: change semantics of show_help_options() and document it. avtools: move some newlines to show_help_options(). avconv: deprecate -isync. Conflicts: ffmpeg_opt.c ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf'Michael Niedermayer2012-08-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf': avconv: get rid of ugly casts in the options table. avconv: try to match codecs by codec descriptor name as a last resort. avtools: fix show_foo() signatures. Conflicts: cmdutils.c cmdutils.h cmdutils_common_opts.h ffmpeg_opt.c ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg,ffplay: show filter optionsStefano Sabatini2012-08-18
| | | | | | | | Address trac ticket #1599.
* | ffplay: reque attached pictures on channel changes.Michael Niedermayer2012-08-16
| | | | | | | | | | | | | | Fixes Ticket1473 Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: avoid SDL_atoi()Michael Niedermayer2012-08-12
| | | | | | | | | | | | | | | | It appears this function is not available everywhere Should fix Ticket1525 Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: fix warning that i just mistakenly introducedMichael Niedermayer2012-07-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: fix planar audioMichael Niedermayer2012-07-20
| | | | | | | | | | | | This caused ALAC to fail since the last merge Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) lavfi: reclassify showfiltfmts as a TESTPROG graph2dot: fix printf format specifier swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32. vp8: loopfilter >=sse2 functions need aligned stack on x86-32. amr: remove shift out of the AMR_BIT() macro. dsputilenc: group yasm and inline asm function pointer assignment. mov: use forward declaration of a function instead of a table. Clarify Doxygen comment for FF_API_* #defines. configure: simplify get_version() Create version.h headers for libraries that lack them gitignore: Use full path instead of relative path to specify patterns mpegvideo: remove VLAs Add XTEA encryption support in libavutil Add Blowfish encryption support in libavutil eval: Add the isinf() function and tests for it flacdec: move lpc filter to flacdsp flacdec: split off channel decorrelation as flacdsp avplay: Add an option for not limiting the input buffer size FATE: add a test for WMA cover art. FATE: add a test for apetag cover art ... Conflicts: .gitignore configure ffplay.c libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpegvideo.c libavcodec/ratecontrol.c libavdevice/avdevice.h libavfilter/Makefile libavfilter/filtfmts.c libavfilter/version.h libavformat/mov.c libavformat/version.h libavutil/Makefile libavutil/avutil.h libavutil/version.h libswscale/swscale.h libswscale/x86/swscale_mmx.c tests/fate/libavutil.mak tests/lavfi-regression.sh tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cosmetics: Consistently use C-style comments with multiple inclusion guards anm: fix a few Doxygen comments misc typo and wording fixes attributes: add av_noreturn attributes: drop pointless define guards configure: do not disable av_always_inline with --enable-small flvdec: initial stream switch support avplay: fix write on freed memory for rawvideo snow: remove a VLA used for edge emulation x86: lavfi: fix gradfun/yadif build with mmx/sse disabled snow: remove the runs[] VLA. snow: Check mallocs at init flacdec: remove redundant setting of avctx->sample_fmt Conflicts: ffplay.c libavcodec/h264.c libavcodec/snow.c libavcodec/snow.h libavcodec/snowdec.c libavcodec/snowenc.c libavformat/flvdec.c libavutil/attributes.h tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2012-07-01
|\ \ | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: only configure video filters after we got the first frame Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: only configure video filters after we got the first frameMarton Balint2012-06-30
| | | | | | | | | | | | | | | | | | Otherwise the codec width, height and pixel format values may not be set. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-30
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section. dnxhdenc: add space between function argument type and comment. x86: fmtconvert: add special asm for float_to_int16_interleave_misc_* attributes: Add a definition of av_always_inline for MSVC cmdutils: Pass the actual chosen encoder to filter_codec_opts os_support: Add fallback definitions for stat flags os_support: Rename the poll fallback function to ff_poll network: Check for struct pollfd os_support: Don't compare a negative number against socket descriptors os_support: Include all the necessary headers for the win32 open function x86: vc1: fix and enable optimised loop filter Conflicts: cmdutils.c cmdutils.h ffmpeg.c ffplay.c libavformat/os_support.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: factorize expression in audio_decode_frame()Stefano Sabatini2012-06-30
| | | | | | | | Possibly improve readability.
* | ffplay: group together and vertically align correlated parameters in log ↵Stefano Sabatini2012-06-29
| | | | | | | | | | | | function Possibly improve readability.
* | ffplay: vertially align complex if condition in audio_decode_frame()Stefano Sabatini2012-06-29
| | | | | | | | Possibly improve readability.
* | ffplay: move assignment in else block in audio_decode_frame()Stefano Sabatini2012-06-29
| | | | | | | | | | Avoid confusing and pointless double assignment of variable resampled_data_size.
* | ffplay: split overly long line in audio_decode_frame()Stefano Sabatini2012-06-29
| |
* | ffplay: avoid useless NULL checks in swr_free()Stefano Sabatini2012-06-29
| | | | | | | | | | swr_free() already checks for nullness, no need to add the check in calling code.
* | ffplay: fix wrong reference to function in audio_decode_frame() commentStefano Sabatini2012-06-29
| | | | | | | | | | The comment now references swr_convert(), rather than audio_convert(), which was deprecated and/or dropped.
* | ffplay: simplify code by using avfilter_unref_bufferp()Stefano Sabatini2012-06-28
| |
* | lavfi: deprecate av_buffersrc_buffer() functionStefano Sabatini2012-06-28
| | | | | | | | Favor av_buffersrc_add_ref() instead, which is more powerful.
* | ffplay: add configure_filtergraph() helperStefano Sabatini2012-06-26
| | | | | | | | | | Will help factorization with the pending -af patch, and add some checks missing in the original code.
* | lavfi: remove old video sink APIStefano Sabatini2012-06-26
| | | | | | | | | | It was deprecated since a long time and removed after the 2->3 major bump.
* | ffplay: give more meaningful names to the buffersink instancesStefano Sabatini2012-06-25
| |
* | lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref APIStefano Sabatini2012-06-25
| | | | | | | | | | | | | | | | | | | | | | Deprecate functions: avfilter_fill_frame_from_buffer_ref avfilter_fill_frame_from_audio_buffer_ref avfilter_fill_frame_from_video_buffer_ref and schedule to drop them at the next API major bump. The function avfilter_copy_buf_props() should be used instead.
* | ffplay: add cast to fix warning in configure_video_filters()Stefano Sabatini2012-06-23
| | | | | | | | | | | | Fix warning: ffplay.c:1578:40: warning: passing argument 5 of ‘avfilter_graph_create_filter’ discards ‘const’ qualifier from pointer target type [enabled by default] libavfilter/avfiltergraph.h:84:5: note: expected ‘void *’ but argument is of type ‘const enum PixelFormat *’
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libspeexenc: add supported sample rates and channel layouts. Replace usleep() calls with av_usleep() lavu: add av_usleep() function utvideo: mark interlaced frames as such utvideo: Fix interlaced prediction for RGB utvideo. cosmetics: do not use full path for local headers lavu/file: include unistd.h only when available configure: check for unistd.h log: include unistd.h only when needed lavf: include libavutil/time.h instead of redeclaring av_gettime() Conflicts: configure doc/APIchanges ffmpeg.c ffplay.c libavcodec/utvideo.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: fix -vismv 1Michael Niedermayer2012-06-17
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: rename buffer source instance from "src" to "ffplay_buffer"Stefano Sabatini2012-06-17
| | | | | | | | | | | | The new name is more descriptive. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use key=val syntax for the buffersrc argsStefano Sabatini2012-06-17
| | | | | | | | | | | | | | Fix warning: [src @ ...] Flat options syntax is deprecated, use key=value pairs. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Avoid C99 variable declarations within for statements. rtmp: Read and handle incoming packets while writing data doc: document THREAD_TYPE fate variable rtpdec: Don't require frames to start with a Mode A packet avconv: don't try to free threads that were not initialized. Conflicts: doc/fate.texi ffplay.c libavdevice/dv1394.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: fix return value of get_video_frame if avcodec_decode_video failsMarton Balint2012-06-09
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 03:09:25 +0000