1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

339 Commits

Author SHA1 Message Date
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
S.N. Hemanth Meenakshisundaram
c1db7bff66 Resize data and linesize in AVFilterBufferRef to 8.
This is required to make AVFilterBufferRef able to contain also audio
data, required by audio filtering integration.

Patch by S.N. Hemanth Meenakshisundaram smeen?ks@ucsd.ed?.

Originally committed as revision 24773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 15:25:42 +00:00
Stefano Sabatini
84c0386960 Change avfilter_open() signature, from:
AVFilterContext *avfilter_open(AVFilter *filter, const char *inst_name);
to:
int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);

This way it is possible to propagate an error code telling the reason
of the failure.

Originally committed as revision 24765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 11:44:51 +00:00
S.N. Hemanth Meenakshisundaram
cc80caff52 Separate video specific BufferRef properties into VideoProps.
Define a new struct AVFilterBufferRefVideoProps and add a type field
to AVFilterBufferRef.

Video specific properties in AVFilterBufferRefVideoProps are now
referred to by *video pointer in AVFilterBufferRef.

Patch by S.N. Hemanth Meenakshisundaram smeenaks->ucsd.edu.

Originally committed as revision 24763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 11:06:04 +00:00
S.N. Hemanth Meenakshisundaram
5d4890d73d Rename fields:
AVFilterLink.srcpic    ->  AVFilterLink.src_buf
AVFilterLink.cur_pic   ->  AVFilterLink.cur_buf
AVFilterLink.outpic    ->  AVFilterLink.out_buf

The new names are more generic and more consistent, since the struct
they contain, which was named AVFilterPicRef, has been renamed to
AVFilterBufferRef.

Patch by S.N. Hemanth Meenakshisundaram %smeenaks%ucsd%edu%.

Originally committed as revision 24732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:34 +00:00
S.N. Hemanth Meenakshisundaram
7fce481a69 Rename functions and fields:
avfilter_(un)ref_pic       -> avfilter_(un)ref_buffer
avfilter_copy_picref_props -> avfilter_copy_buffer_ref_props
AVFilterBufferRef.pic      -> AVFilterBufferRef.buffer

They have been renamed to allow sharing with audio.

Patch by S.N. Hemanth Meenakshisundaram $smeenaks$ucsd$edu$.

Originally committed as revision 24731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:27 +00:00
S.N. Hemanth Meenakshisundaram
ecc8dada37 Rename AVFilterPicRef to AVFilterBufferRef.
The struct is going to be used for storing audio buffer references as
well, and the new name is more generic.

Patch by S.N. Hemanth Meenakshisundaram @smeenaks@ucsd@edu@.

Originally committed as revision 24730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:19 +00:00
S.N. Hemanth Meenakshisundaram
d54e0948e0 Move format from AVFilterBuffer to AVFilterPicRef.
Patch by S.N. Hemanth Meenakshisundaram |smeenaks|ucsd|edu|.

Originally committed as revision 24728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 00:02:26 +00:00
Stefano Sabatini
126b638ea0 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.

This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.

Originally committed as revision 24518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:12:28 +00:00
Reimar Döffinger
e1d7c8831c Add avsubtitle_free function.
Originally committed as revision 24185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 07:35:00 +00:00
Jai Menon
00f72577ad FFplay : Fix segfault when playing monoaural streams.
Originally committed as revision 24090 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 18:14:58 +00:00
Alexei Svitkine
066ce8c93d Implement -onkeydown and -onmousedown options for ffplay.
Patch by Alexei Svitkine cout << name << "." << surname << "@" << "gmail.com".

See thread:
Subject: [FFmpeg-devel] new command-line option for ffplay
Date: Wed, 23 Jun 2010 09:13:50 -0400

Originally committed as revision 24037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-04 12:43:12 +00:00
Jai Menon
cfb7e6e6d5 FFplay : Copy all AVFrame fields from the reference picture to the
requested buffer.

Originally committed as revision 24032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-03 21:20:32 +00:00
Stefano Sabatini
2b4abbd6f5 Move colorspace.h from libavcodec to libavutil.
Avoid a compile-time dependency of the pad filter on libavcodec.

Originally committed as revision 23940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 18:49:44 +00:00
Måns Rullgård
7dbbf6a14a ffplay: remove VLA
Originally committed as revision 23892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-29 22:41:20 +00:00
Michael Niedermayer
867ab7fb0a Fix pts reordering code.
This fixes a regression introduced when libavfilter support was added to ffplay.

Originally committed as revision 23343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-27 00:31:45 +00:00
Jai Menon
12bd3c1f99 FFplay : Implement custom reget_buffer for the input filter.
Originally committed as revision 23287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 14:19:44 +00:00
Jai Menon
e53ca636d9 Cosmetics : re-indent after last commit.
Originally committed as revision 23265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 19:14:59 +00:00
Jai Menon
3635c07bd1 FFplay : Avoid manipulating NULL data pointers so that future checks
remain valid. This fixes segfaults for those cases where data copy to
this invalid pointer is attempted.

Originally committed as revision 23264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 19:13:17 +00:00
François Revol
65929418f5 Avoid mixed declaration and code, fix C89 compatibility.
Patch by François Revol revol free fr.

Originally committed as revision 23143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-15 17:34:45 +00:00
Baptiste Coudurier
09ed11e58c rename -vfilters cli option to -vf in ffplay as well
Originally committed as revision 23104 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-12 23:18:12 +00:00
Stefano Sabatini
3f073fa22c Fix auto-scaling.
Use the numeric value assigned to sws_flags for the sws_flags set in
the graph, rather than the string "bilinear", which is not even
parsable by the scale filter.

Originally committed as revision 23060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-08 21:39:57 +00:00
Cyril Russo
9b157b0ccd Fix compilation error of ffmpeg and ffplay with --disable-avdevice.
Patch by Cyril Russo, stage D nexvision A laposte net

Originally committed as revision 22940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-22 08:55:23 +00:00
Jai Menon
79f8b328cd ffplay : Add 's' to the list of supported commands.
Originally committed as revision 22823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-09 17:52:34 +00:00
Robert Krüger
d834d63b0e Add -t option to ffplay.
Patch by Robert Krüger, krueger signal7 de

Originally committed as revision 22764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 20:56:23 +00:00
Bobby Bingham
cf097cbc0b Cosmetics: indentation
Originally committed as revision 22756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 06:41:27 +00:00
Bobby Bingham
c41c5b02d3 Don't create unnecessary refereces to pictures
Originally committed as revision 22755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 06:41:25 +00:00
Bobby Bingham
dd0c789be7 Hook decoder up to libavfilter's direct rendering for ffplay
Originally committed as revision 22754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 06:41:21 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Robert Krüger
1922c0a773 Add a loop option to ffplay.
Patch by Robert Krüger, krueger signal7 de

Originally committed as revision 22646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 17:39:51 +00:00
Diego Biurrun
4903b5ca35 Move variable declaration, fixes the warning:
ffplay.c:1703: warning: unused variable `pos'

Originally committed as revision 22611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-20 21:39:50 +00:00
Robert Krüger
076db5ed57 Add a -window_title option, which sets the FFplay window title.
Patch by Robert Krüger "krueger ET signal7 DOT de".

Originally committed as revision 22588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-17 23:39:18 +00:00
Stefano Sabatini
bb4095133f Make ffplay pass the packet.pos information to the filterchain, get it
again from the filterchain and pass it back to output_picture2().

Originally committed as revision 22507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 11:27:07 +00:00
Michael Niedermayer
382f3a5b6f Print skip_frames variable.
Originally committed as revision 22482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 15:12:05 +00:00