Marton Balint
d8f8e911bd
ffplay: dont wait 100ms if data is not yet ready
...
Also signal the wait if audio buffer is empty. This fixes jerky audio with
realtime sources.
Signed-off-by: Marton Balint <cus@passwd.hu>
12 years ago
Nicolas George
2939e258f9
ffplay: use PTS from the AVSubtitle structure.
12 years ago
Marton Balint
cdea19e75a
ffplay: increase sample array buffer
...
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>
12 years ago
Marton Balint
81f26d6990
ffplay: ensure that pictq_prev_picture never fills the picture queue
...
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>
12 years ago
Marton Balint
99b01e458c
ffplay: simplify picture allocation
...
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>
12 years ago
Marton Balint
255c7bb183
ffplay: make initial window size calculation based on aspect ratio
...
Fixes ticket #291 .
Signed-off-by: Marton Balint <cus@passwd.hu>
12 years ago
Marton Balint
bd14d845e9
ffplay: factor display rectangle calculation to its own function
...
Signed-off-by: Marton Balint <cus@passwd.hu>
12 years ago
Michael Niedermayer
3061664a57
avoid ambigous buffersink names
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Marton Balint
55594447d6
ffplay: only free vfilters on exit
...
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>
12 years ago
Marton Balint
0e5042be28
ffplay: replace SDL_delay in read thread with SDL_CondWait
...
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>
12 years ago
Marton Balint
4a45e722e3
ffplay: requeue last picture on forced video refresh
...
Fixes ticket #1609 .
Signed-off-by: Marton Balint <cus@passwd.hu>
12 years ago
Michael Niedermayer
a9a1bc56ab
ffplay: get rid of void casts in the option table
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
b1034505db
ffplay: fix function parameters
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Marton Balint
a366beaf6a
ffplay: fix odd YUV width by cropping the video
...
Should fix issue #1322 .
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Stefano Sabatini
5296d7b971
ffmpeg,ffplay: show filter options
...
Address trac ticket #1599 .
13 years ago
Michael Niedermayer
c151e0ca15
ffplay: reque attached pictures on channel changes.
...
Fixes Ticket1473
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
ab0ea7cb41
ffplay: avoid SDL_atoi()
...
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>
13 years ago
Michael Niedermayer
e2c96fbf3e
ffplay: fix warning that i just mistakenly introduced
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
cdafec69ce
ffplay: fix planar audio
...
This caused ALAC to fail since the last merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Marton Balint
58f22f7012
ffplay: only configure video filters after we got the first frame
...
Otherwise the codec width, height and pixel format values may not be set.
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Stefano Sabatini
b12e61ac7f
ffplay: factorize expression in audio_decode_frame()
...
Possibly improve readability.
13 years ago
Stefano Sabatini
94a00ec8af
ffplay: group together and vertically align correlated parameters in log function
...
Possibly improve readability.
13 years ago
Stefano Sabatini
8179660222
ffplay: vertially align complex if condition in audio_decode_frame()
...
Possibly improve readability.
13 years ago
Stefano Sabatini
347ecfdc63
ffplay: move assignment in else block in audio_decode_frame()
...
Avoid confusing and pointless double assignment of variable
resampled_data_size.
13 years ago
Stefano Sabatini
0d3ffde64f
ffplay: split overly long line in audio_decode_frame()
13 years ago
Stefano Sabatini
4fd07b9366
ffplay: avoid useless NULL checks in swr_free()
...
swr_free() already checks for nullness, no need to add the check in
calling code.
13 years ago
Stefano Sabatini
4674718203
ffplay: fix wrong reference to function in audio_decode_frame() comment
...
The comment now references swr_convert(), rather than audio_convert(),
which was deprecated and/or dropped.
13 years ago
Stefano Sabatini
7877b50d18
ffplay: simplify code by using avfilter_unref_bufferp()
13 years ago
Stefano Sabatini
b0fdd3489a
lavfi: deprecate av_buffersrc_buffer() function
...
Favor av_buffersrc_add_ref() instead, which is more powerful.
13 years ago
Stefano Sabatini
79a7451d06
ffplay: add configure_filtergraph() helper
...
Will help factorization with the pending -af patch, and add some checks
missing in the original code.
13 years ago
Stefano Sabatini
8dd0e87d7b
lavfi: remove old video sink API
...
It was deprecated since a long time and removed after the 2->3 major
bump.
13 years ago
Stefano Sabatini
fec512a52c
ffplay: give more meaningful names to the buffersink instances
13 years ago
Stefano Sabatini
43583fb85c
lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref API
...
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.
13 years ago
Stefano Sabatini
39e019e8c1
ffplay: add cast to fix warning in configure_video_filters()
...
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 *’
13 years ago
Michael Niedermayer
db83570875
ffplay: fix -vismv 1
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Stefano Sabatini
8f45c3141c
ffplay: rename buffer source instance from "src" to "ffplay_buffer"
...
The new name is more descriptive.
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Stefano Sabatini
251f398798
ffplay: use key=val syntax for the buffersrc args
...
Fix warning:
[src @ ...] Flat options syntax is deprecated, use key=value pairs.
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Marton Balint
143a5390bf
ffplay: fix return value of get_video_frame if avcodec_decode_video fails
...
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Michael Niedermayer
cb819338d1
ffplay: reset AVFrame to defaults before decoding each new frame.
...
This fixes: ffplay -f lavfi -i cellauto
This was a regression since factorizing the filter code with ffmpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Michael Niedermayer
349b65eee2
ffplay: check return code of avcodec_decode_video2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Marton Balint
5fdcfdf237
ffplay: fix build if avfilter is disabled
...
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Marton Balint
a78bc6f78c
ffplay: fix frame_delay calculation in new avfilter code
...
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Marton Balint
e85df18d74
ffplay: add support for changing pixel format
...
With the filtering code refactored, it was much easier to finally fix this.
Fixes ticket 123 and 238.
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Marton Balint
cd947e9a2b
ffplay: add missing filt_in assignment after video filter reconfigure
...
Fixes segfaults on changing resolution.
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Marton Balint
0a501c756f
ffplay: fix frame aspect ratio after qatar merge
...
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Michael Niedermayer
c9651d4bee
ffplay: fix use after free
...
reproduceable with:
ffmpeg -i tests/lena.pnm -pix_fmt pal8 -vcodec rawvideo -s 512x512 out.avi
valgrind ffplay_g out.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Marton Balint
1372c826de
ffplay: use dummy video driver if display is disabled
...
Fixes ticket 1402.
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Marton Balint
22505c188c
ffplay: calculate audio diff threshold based on the actual settings
...
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Marton Balint
0dad529201
ffplay: try more channel count combinations for SDL_OpenAudio
...
This should fix ticket 1384.
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago
Marton Balint
7821264c26
ffplay: simplify audio_open, rename parameters to more explanatory names
...
Signed-off-by: Marton Balint <cus@passwd.hu>
13 years ago