virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
54,324 Commits 37 Branches 400 Tags 460 MiB
a6e46ed51a
Commit Graph

790 Commits

Author SHA1 Message Date
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
Paul B Mahol
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
Stefano Sabatini
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
Stefano Sabatini
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
Marton Balint
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
Marton Balint
738487f8db ffplay: use refcounted frames for audio 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-03-17 03:31:37 +01:00
Marton Balint
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
Marton Balint
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
Michael Niedermayer
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
Nicolas George
ceac5c54dd Remove references to the "ff" variant of buffersink. 2013-03-12 23:31:07 +01:00
Michael Niedermayer
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
Michael Niedermayer
ec1d2e2fb0 ffplay: use AVFrame accessor functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 23:22:08 +01:00
Marton Balint
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
Marton Balint
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
Marton Balint
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
Marton Balint
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
Marton Balint
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
Marton Balint
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