generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,122 Commits 24 Branches 241 Tags
Commit Graph

472 Commits

Author SHA1 Message Date
Alexander Strange
b38f008ea6 Frame-based multithreading framework using pthreads 
See doc/multithreading.txt for details on use in codecs.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-11 02:53:58 +01:00
Alexander Strange
c0b102ca03 Deprecate avcodec_thread_init() 
As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.

avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the
next MAJOR libavcodec bump.

Rename the functions to ff_thread_init/free, since they are now internal.
Wrappers are provided to maintain API compatibility.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-09 09:17:28 -05:00
Alexander Strange
37b00b47cb Frame-based multithreading framework using pthreads 
See doc/multithreading.txt for details on use in codecs.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-09 09:17:28 -05:00
Nicolas George
76ad67cae7 Implement guessed_pts in avcodec_decode_video2 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-02-07 19:32:07 +01:00
Alexander Strange
fd0ae17aaf Adopt pkt_dts/pkt_pts in lavc clients 
No behavior change; this makes DTS reliable with the next patch.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b474953975fd8ea64d1ed4d09c42b2d8e787c6f)
 2011-02-06 20:31:45 +01:00
Stefano Sabatini
ab543afe47 Make avfilter_graph_free() free the graph. 
Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.

Simplify usage.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4359288c565705d1734f63d277f8918ee5af5e54)
 2011-02-06 20:31:42 +01:00
Alexander Strange
6b47495397 Adopt pkt_dts/pkt_pts in lavc clients 
No behavior change; this makes DTS reliable with the next patch.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-05 16:37:43 -05:00
Stefano Sabatini
4359288c56 Make avfilter_graph_free() free the graph. 
Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.

Simplify usage.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-04 02:55:11 +00:00
Stefano Sabatini
8904a0f1ee ffplay: factorize code from video_thread() into configure_video_filters() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 75ea596de1145878a7603d5a3f269a9aac9ae30e)
 2011-02-04 03:08:09 +01:00
Stefano Sabatini
75ea596de1 ffplay: factorize code from video_thread() into configure_video_filters() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-02 12:09:46 +00:00
Stefano Sabatini
2fa1d7b3be In ffplay:get_video_frame(), use frame->pkt_pts rather than reordered_opaque. 
AVCodecContext.reordered_opaque is deprecated for this specific use.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2855080447a226aba7e88e943fd8a8779d6daa98)
 2011-01-31 18:25:45 +01:00
Stefano Sabatini
97b925ea81 ffplay: in video_thread(), use av_dlog() for timestamp logging. 
Disable logging of rescaled timestamps if DEBUG is not enabled.
Avoid debug log spamming with -loglevel debug.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 13156f40e1f17ec1d0c57e6bf7a2850f673600c0)
 2011-01-31 18:25:45 +01:00
Stefano Sabatini
2855080447 In ffplay:get_video_frame(), use frame->pkt_pts rather than reordered_opaque. 
AVCodecContext.reordered_opaque is deprecated for this specific use.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-30 19:02:19 +00:00
Stefano Sabatini
13156f40e1 ffplay: in video_thread(), use av_dlog() for timestamp logging. 
Disable logging of rescaled timestamps if DEBUG is not enabled.
Avoid debug log spamming with -loglevel debug.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-30 17:52:01 +00:00
Stefano Sabatini
22f73157b7 Remove outdated and confusing comment. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit db2ddd38859b26c0a4e4bf92619625cd7e0e7f42)
 2011-01-23 19:32:07 +01:00
Stefano Sabatini
db2ddd3885 Remove outdated and confusing comment. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-22 13:06:06 +00:00
Stefano Sabatini
d72858f89f Merge two if (got_picture) {} blocks in ffplay.c:get_video_frame(). 2011-01-17 22:31:11 +01:00
Stefano Sabatini
8f83a3b054 Remove outcommented fossil code. 2011-01-17 22:04:06 +01:00
Stefano Sabatini
199c18a784 Fix weird indent in get_video_frame(). 
Originally committed as revision 26390 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-16 17:26:00 +00:00
Stefano Sabatini
24d13ebc15 Reindent after the last commit. 
Originally committed as revision 26372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-15 17:21:12 +00:00
Stefano Sabatini
112c4b8796 In ffplay, do not open display if -nodisp is set. 
Fixes issue 1017.

Originally committed as revision 26371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-15 17:21:09 +00:00
Stefano Sabatini
d881a0e895 Cosmetics: fix weird indent. 
Originally committed as revision 26350 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-15 01:28:00 +00:00
Michael Niedermayer
393cbb963b Add AVFrame.pkt_pts that contains the correctly reordered AVPacket.pts 
Originally committed as revision 26260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-07 23:07:24 +00:00
Nicolas George
be732b7089 Fix ffplay -an/-vn options that were swapped by r26105. 
Originally committed as revision 26115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-28 09:52:31 +00:00
Michael Niedermayer
0ccabeeaef Support filters and decoders that dont support negative linesizes. 
This patch is based on work by stefano.

Originally committed as revision 26108 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 15:10:21 +00:00
Nicolas George
406f0f1bcf Use av_find_best_stream in ffplay. 
Originally committed as revision 26105 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 09:08:36 +00:00
Stefano Sabatini
037be76e15 Add avfilter_graph_create_filter(). 
Originally committed as revision 25862 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-02 20:12:27 +00:00
Stefano Sabatini
5d6e4c160a Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum 
SampleFormat with AVSampleFormat.

Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 11:04:40 +00:00
Stefano Sabatini
1e80a0eaa4 Remove graphparser.h header, move AVFilterInOut and 
avfilter_graph_parse() declaration to libavfilter/avfiltergraph.h.

Simplify, and less confusing for the user.

Originally committed as revision 25705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-07 22:56:29 +00:00
Stefano Sabatini
7313132bcc Rename AVFilterInOut field filter to filter_ctx, more semantically correct. 
Originally committed as revision 25700 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-07 18:40:18 +00:00
Stefano Sabatini
97dd1e4a87 Rename avfilter_graph_destroy() to avfilter_graph_free(). 
The new name is shorter and more consistent with the rest of the API.

This change breaks libavfilter API/ABI.

Originally committed as revision 25674 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-04 20:34:24 +00:00
Stefano Sabatini
e15aeea656 Implement avfilter_graph_alloc(). 
Originally committed as revision 25673 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-04 20:34:19 +00:00
Stefano Sabatini
ba7d6e798e Remove usage of deprecated libavcodec/audioconvert.h functions. 
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-03 20:19:34 +00:00
Stefano Sabatini
ff0652e503 Implement a common get_filtered_video_frame(), shared between ffplay.c 
and ffmpeg.c.

Originally committed as revision 25520 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 13:57:11 +00:00
Stefano Sabatini
2a24df9357 Add avfilter_graph_config(). 
Originally committed as revision 25502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 10:20:53 +00:00
Stefano Sabatini
f7ead94c69 Factorize definition of the output_filter defined in both ffplay.c and 
ffmpeg.c.
Replace it with a more generic definition which can be shared.

Originally committed as revision 25453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-12 18:40:26 +00:00
Stefano Sabatini
387b4ac993 Fix timebase handling at the begin and at the end of the ffplay video 
filterchain.

Set timebase in the ffplay input, and make get_filtered_video_frame()
rescale the output frames PTSes according to their timebase.

Originally committed as revision 25450 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-12 18:40:16 +00:00
Stefano Sabatini
72ae4aa189 Do not pass an unused variable when initing filt_out. Less confusing. 
Originally committed as revision 25448 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-12 13:47:29 +00:00
Michael Chinen
27d97fded3 Fix ffplay to keep calling av_read_frame even if EOF has been reached. 
Patch by Michael Chinen, mchinen gmail

Originally committed as revision 25426 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-09 17:50:17 +00:00
Reimar Döffinger
a5c33faacc Add init and uninit functions to cmdutils, reduces code duplication 
between ffmpeg and ffplay and avoids a valgrind error by freeing
avformat_opts->key.

Originally committed as revision 25309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 08:44:33 +00:00
Michael Niedermayer
0093ebc20a User application side of Codec specific parameters. 
Originally committed as revision 25266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 23:06:51 +00:00
Alexander Strange
7a8bfa5d67 Extract timestamp correction code from ffplay.c to cmdutils.c 
Originally committed as revision 25241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-28 02:05:12 +00:00
Michael Niedermayer
6b6bca6443 Enable AV_LOG_SKIP_REPEATED to maintain previous behavior. 
Originally committed as revision 25175 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 15:39:10 +00:00
Stefano Sabatini
f66eb58ec4 Make ffplay -h show the settable AVOptions. 
Originally committed as revision 25167 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 00:51:43 +00:00
Stefano Sabatini
4afbcf46c9 Reindent. 
Originally committed as revision 25068 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-07 21:23:59 +00:00
Stefano Sabatini
34017fd9b2 Move av_picture_data_copy() to libavcore, and rename it 
av_image_copy().

Originally committed as revision 25067 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-07 21:23:55 +00:00
Dave Yeo
91880e4664 Add _XOPEN_SOURCE definition for usleep(). 
patch by Dave Yeo, daveryeo telus net

Originally committed as revision 24893 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-23 21:12:34 +00:00
Carl Eugen Hoyos
aa78a6d657 Mention lowres if SDL can't provide the needed resolution. 
Originally committed as revision 24802 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 08:13:14 +00:00
Mike Scheutzow
cb036f905f Fix SDL crash on specific hardware. 
Patch by Mike Scheutzow, mjs973 optonline net

Originally committed as revision 24801 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 07:47:44 +00:00
Mike Scheutzow
f7b8c81460 Move do_exit() up for upcoming patch. 
Patch by Mike Scheutzow, mjs973 optonline net

Originally committed as revision 24800 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 07:46:09 +00:00