virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
56,728 Commits 37 Branches 400 Tags 462 MiB
61274193e3
Commit Graph

807 Commits

Author SHA1 Message Date
Michael Niedermayer
5c6a58746b ffplay: make next_nb_channels[] static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-24 19:53:11 +02:00
Marton Balint
18be3fac1d ffplay: check for filter EOF return codes 
Fixes ticket #2800.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-08-09 00:16:13 +02:00
Marton Balint
e84ca8d38a ffplay: ensure the decoder is flushed before exiting or looping 
Also make sure that we only exit or restart the video if it is not paused and
if the picture queue is empty.

There is still room for improvement (filters may also buffer some frames), but
the patch fixes the most common use cases and ticket #2783 as well.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-08-09 00:16:13 +02:00
Marton Balint
608989f6bf ffplay: fix memleak of non-bitmap subtitles 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-08-09 00:16:13 +02:00
Marton Balint
9f120e034f ffplay: free subtitle pictures on exit 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-08-09 00:16:13 +02:00
Michael Niedermayer
46ad2d9e44 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  miscellaneous typo fixes

Conflicts:
	configure
	libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 11:12:11 +02:00
Stefano Sabatini
f9f7f4c9bb ffplay: improve error message in case of failure, mention filtergraph configuration 2013-07-21 19:20:46 +02:00
Marton Balint
b198e33ad8 ffplay: fix build with disabled avfilter 
Got broken in b383498e.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-07-21 12:00:22 +02:00
Marton Balint
73b2043d72 ffplay: use start_time as next audio pts on flush when seeking is not supported 
Theoretically using start_time should also work if seeking is available and we
could determine that the next packet after a flush packet is the first packet
of a stream, but I could not think of an easy and clean way to do that, that is
why I sticked to the no seeking available condition for now.

Fixes ticket #2647.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-07-20 02:32:43 +02:00
Marton Balint
b383498ea8 ffplay: estimate audio frame pts from the previous frame pts values 
Previously we estimated the audio packet pts instead of the frame pts,
therefore it only worked within a single packet (containing multiple frames).

The new method works accross seperate audio packets as well and also handles
better the case if a decoder buffers several packets before outputting a
decoded frame.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-07-20 02:32:43 +02:00
Marton Balint
782e06e292 ffplay: simplify audio decoding 
Also use negative stream_index for signaling obsolete audio packets. Using the
size alone is not enough, because size is 0 for null packets as well.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-07-20 02:32:43 +02:00
Michael Niedermayer
786b0968dd ffplay: remove explicit idct option 
this allows named idct options to be used

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-13 15:01:05 +02:00
Marton Balint
f07cb53ab9 ffplay: assume 0 stream start time if start time is unset in duration check 
Fixes ticket #2103 and #2743.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-07-09 20:19:54 +02:00
Marton Balint
3886572a83 ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-07-09 20:19:54 +02:00
Stefano Sabatini
838bd73139 lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next bump 
Add function avfilter_graph_parse_ptr() and favor it in place of
avfilter_graph_parse(), which will be restored with the old/Libav
signature at the next bump.

If HAVE_INCOMPATIBLE_LIBAV_API is enabled it will use the
Libav-compatible signature for avfilter_graph_parse().

At the next major bump the current implementation of
avfilter_graph_parse() should be dropped in favor of the Libav/old
implementation.

Should address trac ticket #2672.
 2013-07-03 13:21:42 +02:00
Marton Balint
02fc61a5a6 ffplay: always send zero packets to flush audio decoders 
Zero packets are needed not for codecs with CODEC_CAP_DELAY but for
multithreaded decoders as well.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-07-01 00:24:03 +02:00
Marton Balint
447d2e31d1 ffplay: use frame->pkt_pts instead of pkt->pts in audio pts calculation 
Fixes ticket #2717.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-07-01 00:24:03 +02:00
Marton Balint
9fac752afa ffplay: simplify and fix flushing out old subtitles on seeking 
Fixes the additional issue reported in ticket #2666.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-26 22:30:16 +02:00
Marton Balint
96b33ddbd0 ffplay: remove remains of the old audio and video clock VideoState variables 
The unified clock state holds this information now.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-17 01:18:07 +02:00
Marton Balint
05f0d53170 ffplay: fix missed conversion of video_current_pts to vidclk.pts in subtitles 
Fixes regression with subtitles introduced in f2175a6.
Fixes ticket #2666.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-17 01:18:07 +02:00
Marton Balint
f73d6d2af7 ffplay: cast vp->height to int64 in buffer size check 
Fixes Coverity CID 1026769 and 1026756.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-17 01:18:07 +02:00
Carl Eugen Hoyos
3b491c5a50 Use av_log() instead of fprintf() in ffplay. 
Fixes ticket #2630.

Reviewed-by: Marton Balint
 2013-06-04 19:47:56 +02:00
Marton Balint
30d724bdfd ffplay: detect when the created overlay buffers are not valid for the wanted overlay height 
Fixes cases when the picture height was bigger than the maximum supported
overlay height...

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:46 +02:00
Marton Balint
87917a3283 ffplay: do not allow wider window than 16383 
SDL surface pitch is 16bit, to avoid possible overflows, we limit the window
width to 16383. Fixes ticket #2428.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:46 +02:00
Marton Balint
3b6f1526c6 ffplay: use 0 frame delay if redisplaying an already displayed frame 
With the previous patches this finally fixes ticket #1707.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:46 +02:00
Marton Balint
97e42551e4 ffplay: use more sane frame timer resetting logic 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:46 +02:00
Marton Balint
35b2f30fd1 ffplay: only update pts if not redisplaying a frame 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:46 +02:00
Marton Balint
e341cb1102 ffplay: fix compute_target_delay to better handle frames with long durations 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:45 +02:00
Marton Balint
5b492720ad ffplay: if playing only audio or video only, show the master clock diff in status line 
Showing A-V diff has no use if there is no audio and video stream, but showing
the audio or video clock difference to the master clock can be useful.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:45 +02:00
Marton Balint
f2175a628b ffplay: factorize clock functions 
There should be no change in functionality.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:45 +02:00
Marton Balint
b764b53aae ffplay: decrease video picture queue size to 3 
It was raised to 4 because of a theoretical issue, if we ensure that we do not
return from the display function without popping one picture from the queue,
then its OK to use the old size.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:45 +02:00
Michael Niedermayer
840ee5e1a1 ffplay: dont forget passing lowres to private options 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 00:09:34 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Marton Balint
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
Marton Balint
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
Marton Balint
40693ba3ac ffplay: simplify aspect ratio calculation 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-04-20 18:32:09 +02:00
Clément Bœsch
9db6aaeb2c ffplay: use format title metadata to set window caption. 2013-04-17 11:08:49 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Marton Balint
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
Marton Balint
5dacf7b1ab ffplay: fix indentation 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-04-08 22:21:45 +02:00
Marton Balint
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
Marton Balint
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
Michael Niedermayer
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
Marton Balint
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
Marton Balint
de81d8da47 ffplay: fix early frame dropped pts serial 
Fixes early frame drop which was kind of broken since
26c208cf0f.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-03-30 16:44:19 +01:00
Michael Niedermayer
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
Marton Balint
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