5fd254c4f6
Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'
...
* commit '26a44143efb513a602542fb59aee87b1fc62af51':
avplay: remove a warning
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 12:03:41 +02:00
047716bbd8
ffplay: check av_samples_get_buffer_size() return
...
Fixes CID1005310
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21 18:56:18 +02:00
b8facbeecb
ffplay: only do early frame drop if video queue is not empty
...
Fixes ticket #2446 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-04-20 18:32:09 +02:00
d148339d19
ffplay: use AV_NOPTS_VALUE video frame pts instead of using 0
...
Assuming 0 pts may lead to bad framedrop decisions...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-04-20 18:32:09 +02:00
40693ba3ac
ffplay: simplify aspect ratio calculation
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-04-20 18:32:09 +02:00
9db6aaeb2c
ffplay: use format title metadata to set window caption.
2013-04-17 11:08:49 +02:00
e87c1cdbb5
ffplay: replace opaque/params for buffersinks
...
This fixes a regression caused by droping opaque.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 20:39:07 +02:00
835cc0f2e7
Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'
...
* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da':
lavfi: change the filter registering system to match the other libraries
Conflicts:
cmdutils.c
ffplay.c
libavfilter/avfilter.c
libavfilter/avfilter.h
This removes the ability to put AVFilters in read only memory and having
them shareable.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:08:40 +02:00
231fd4411f
Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'
...
* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4':
lavfi: merge avfiltergraph.h into avfilter.h
Conflicts:
doc/APIchanges
ffmpeg_filter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.h
libavfilter/version.h
tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 23:50:39 +02:00
85b9bf5693
ffplay: simplify video pts calculation
...
Also use frame->pts instead of a standalone variable
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-04-08 22:21:45 +02:00
5dacf7b1ab
ffplay: fix indentation
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-04-08 22:21:45 +02:00
0b24e341ed
ffplay: handle audio buffersink output properly with buffering filters
...
Fixes cases when the audio filter generates less or more frames than the input.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-04-08 22:21:45 +02:00
325846aac0
ffplay: set time_base of audio filter buffer src
...
Fixes ticket #2408 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-04-08 22:21:45 +02:00
7f4b588fdf
ffplay: use seek per time for ogg by default
...
Fixes Ticket2383
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-02 01:36:45 +02:00
1c2ac44947
ffplay: always queue attachment pictures after flushing the video packet queue
...
Requeue them after seeking and also after opening a video stream. Also don't
fill the video queue in case of an attached picture video stream since there
will be no more than one packet from that stream.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-30 16:44:19 +01:00
de81d8da47
ffplay: fix early frame dropped pts serial
...
Fixes early frame drop which was kind of broken since
26c208cf0f
2013-03-30 16:44:19 +01:00
612d9cdbe9
ffplay: use av_guess_frame_rate()
...
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-30 13:30:37 +01:00
c46a8c613e
ffplay: avoid frame data leak on early frame drop
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-23 02:25:33 +01:00
4d16ba2dd8
ffplay: silence warning of mixed enumeration types
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-19 09:39:28 +00:00
5fe542d7e1
ffplay: remove options skiploop, skipidct, skipframe
...
The corresponding codec options (skip_loop, skip_idct, skip_frame) can be
set in a more flexible way.
This technically causes a user interface break, but since the options
were not even documented and we just released a major version that should
not be a serious issue.
2013-03-17 13:05:44 +01:00
f7d1a18c90
ffplay: remove unused variable "codec"
...
Fix warning:
ffplay.c: In function ‘video_thread’:
ffplay.c:1890:21: warning: unused variable ‘codec’ [-Wunused-variable]
2013-03-17 13:05:44 +01:00
e96175ad7b
ffplay: add -af option
...
Based on a patch by Stefano Sabatini <stefasab@gmail.com>:
http://ffmpeg.org/pipermail/ffmpeg-devel/2013-February/138452.html
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-17 03:43:36 +01:00
738487f8db
ffplay: use refcounted frames for audio
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-17 03:31:37 +01:00
9eafdd518c
ffplay: use frame->pts if available for setting the audio clock
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-17 03:31:37 +01:00
1822519d2a
ffplay: restructure audio stream opening code
...
Preparation for -af support.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-17 03:31:37 +01:00
b94df21a51
Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4'
...
* commit '2eaa3663fda750dac66d41fe8541a8744d5563a4':
avplay: enable only when SDL 1.2 is found
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 01:31:46 +01:00
ceac5c54dd
Remove references to the "ff" variant of buffersink.
2013-03-12 23:31:07 +01:00
32fdfdfbda
Merge commit '354468fc12dcf93e7fb4af552e18906771913273'
...
* commit '354468fc12dcf93e7fb4af552e18906771913273':
avplay: switch to new refcounted frames API
avconv: convert to new refcounted AVFrame API
Conflicts:
cmdutils.c
ffmpeg.c
ffmpeg.h
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 14:16:02 +01:00
ec1d2e2fb0
ffplay: use AVFrame accessor functions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 23:22:08 +01:00
ac37d21f49
ffplay: do not cycle through unavailable show modes
...
Fixes ticket #2200 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-27 21:34:13 +01:00
d0c6ed7da0
ffplay: add option to disable subtitling
...
Fixes ticket #2201 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-27 21:34:13 +01:00
daece4c674
ffplay: use NAN to signal invalid external clock
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-27 21:34:12 +01:00
26c208cf0f
ffplay: if audio or video clock is invalid return NAN
...
This helps us not to make bad decision (frame dropping, audio compensation)
right after seeking when we do not know yet the recent audio or video clock.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-27 21:34:12 +01:00
38f649662c
ffplay: allow frame dropping if we redisplay an already displayed frame
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-27 21:34:12 +01:00
36dc476f83
ffplay: return true for pictq_prev_picture if it was successful
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-27 21:34:12 +01:00
3070600d9b
ffplay: only quit from audio_decode_frame before decoding when paused
...
This way the audio clock is updated to a proper value even when the video is
paused.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-27 21:34:12 +01:00
48e43a1999
ffplay: drop remaining frames in current audio avpacket when seeking
...
Fixes ticket #1928 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-27 21:34:12 +01:00
4be7d578a3
ffplay: signal seek event to read thread
...
Improves seek delay.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-27 21:34:12 +01:00
394130efe3
ffplay: reindent and remove pointless cast in audio_decode_frame() code
2013-02-24 23:29:42 +01:00
a3fa27e366
ffplay: set type for channel_layout AudioParams field to int64_t
...
Reflect the type of the corresponding field in lavc/lavfi.
2013-02-24 23:26:43 +01:00
77ab702a84
ffplay: only display frames if there are no pending events
...
Otherwise events could just pile up if displaying a frame takes more time than
the duration of the frame.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-15 13:12:10 +01:00
5534d8f75e
ffplay: remove remains of video_clock
...
We are now using a pts based approach, libavutil/libavcodec should provide the
correct pts-es anyway. This also fixes an issue when seeking to a frame with a
pts set to zero.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-15 00:10:46 +01:00
b853cfe7ea
ffplay: remove refresh thread to achieve more precise frame delay
...
We use a refresh loop which displays the frames and also does the polling for
pending events in a non-blocking way. If we know the required delay until the
next frame, then exactly that amount of sleeping will be done. After each
handled event we check if we have to display a frame which kind of makes
displaying the frame a high priority event.
This improves greatly the smoothness of the video output especially with 50fps
content.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-15 00:10:46 +01:00
2c5e4ae291
Revert "Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'"
...
This reverts commit d80820655330085bd43e
2013-02-10 14:27:57 +01:00
d808206553
Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'
...
* commit 'db0a943266be29ff0596872ebb418dfed75d00de':
avplay: apply the stream sample_aspect_ratio to decoded video frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 12:47:37 +01:00
212bb6490f
ffplay: report video frame changes only in debug mode
...
In particular, remove distracting message:
"Video frame changed from size:0x0 format:none serial:-1 to ..."
2013-02-06 00:20:37 +01:00
58c4b0f990
ffplay: extend feedback in case of video changes
2013-02-06 00:20:30 +01:00
c44281906a
ffplay: remove misleading comment from audio_decode_frame()
2013-02-03 17:01:56 +01:00
02af4e9a97
ffplay: rename audio_decode_frame() variable "pts" to "audio_clock0"
...
The new name better expresses what the variable is.
2013-02-03 17:01:56 +01:00
6e32b377bb
ffplay: remove pts_ptr argument from audio_decode_frame()
...
The argument is no longer used outside the function. Simplify.
2013-02-03 17:01:56 +01:00
Michael Niedermayer
Marton Balint
Clément Bœsch
Paul B Mahol
Stefano Sabatini
Nicolas George