virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
33,724 Commits 37 Branches 400 Tags 458 MiB
2f51ec2b94
Commit Graph

270 Commits

Author SHA1 Message Date
Anton Khirnov
2f51ec2b94 avconv: split checking for active outputs out of transcode(). 2012-06-04 14:17:52 +02:00
Anton Khirnov
c9cc76290f avconv: extend -r to work on any input stream. 
This is done by automatically inserting a setpts filter.
 2012-05-29 19:19:17 +02:00
Anton Khirnov
cf6c38c62b avconv: don't print filters inserted by avconv in stream mappings. 2012-05-29 19:19:16 +02:00
Anton Khirnov
8daf21d567 avconv: merge configuration code for complex and simple filters 
Some tests change because -s now inserts the scaler to the end instead
of beginning of the filtergraph.
 2012-05-29 19:19:16 +02:00
Anton Khirnov
a977d91e28 avconv: split configuring input filters out of configure_complex_filter 2012-05-29 19:19:16 +02:00
Martin Storsjö
a1a6cdc26e avconv: Display the error returned by avformat_write_header 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 13:35:44 +03:00
Anton Khirnov
0629f6128e avconv: rename transcode_audio/video to decode_audio/video. 
Those functions do only decoding now, encoding is run from
poll_filters().
 2012-05-22 21:29:06 +02:00
Anton Khirnov
39885a4bd7 avconv: reindent 2012-05-18 19:41:58 +02:00
Anton Khirnov
74b961db77 avconv: replace -vsync cfr code with the fps filter. 
Invented timestamps for the h264 tests return to something resembling
sanity.

In the idroq-video-encode test when converting 25 fps -> 30 fps the
fifth frame gets duplicated instead of the sixth.
 2012-05-18 19:38:40 +02:00
Anton Khirnov
0ad26cdf24 avconv: add support for audio in complex filtergraphs. 2012-05-18 19:27:00 +02:00
Anton Khirnov
01e98b1b00 avconv: fix behavior with -ss as an output option. 
Don't return from poll_filters() immediately, there may be other frames
and/or other streams to handle.

Fixes a memleak.
 2012-05-17 19:37:58 +02:00
Anton Khirnov
6eeb9a0433 avconv: automatically insert asyncts when -async is used. 
Deprecate -async.
 2012-05-14 21:36:11 +02:00
Anton Khirnov
369cb092ec avconv: add support for audio filters. 
The FATE changes are all off-by-one due to different rounding being used
(lrintf vs av_rescale_q).
 2012-05-14 21:36:11 +02:00
Anton Khirnov
720c6b78d1 buffersrc: add av_buffersrc_write_frame(). 
It's the same as av_vsrc_buffer_add_frame(), except it doesn't take pts
or pixel_aspect parameters. Those are read from AVFrame.

Deprecate av_vsrc_buffer_add_frame().
 2012-05-14 21:36:11 +02:00
Mans Rullgard
4f1500689d avconv: use lrint() for rounding double timestamps 
Converting the double to float for lrintf() loses precision when
the value is not exactly representable as a single-precision float.
Apart from being inaccurate, this causes discrepancies in some
configurations due to differences in rounding.

Note that the changed timestamp in the vc1-ism test is a bogus,
made-up value.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-10 22:54:27 +01:00
Anton Khirnov
a5117a2444 lavc: pad last audio frame with silence when needed. 2012-05-09 17:46:54 +02:00
Anton Khirnov
ac71230902 lavfi: add video buffer sink, and use it in avtools 
Also add the public interface libavfilter/buffersink.h.

Based on a commit by Stefano Sabatini.
 2012-05-09 08:59:37 +02:00
Anton Khirnov
dce415e7f1 avconv: remove stray useless comment. 2012-05-06 16:20:26 +02:00
Mans Rullgard
3527a73933 avutil: add av_parse_cpu_flags() function 
This moves the cpu flag parsing code from avconv to avutil so
it can be accessed elsewhere.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-04-25 23:19:40 +01:00
Justin Ruggles
bcb82fe1f4 avconv: use libavresample 2012-04-24 23:38:54 -04:00
Anton Khirnov
8c4022aceb avconv: fix a segfault on -c copy with -filter_complex. 2012-04-24 06:30:02 +02:00
Luca Barbato
1381081cdb avconv: fix off by one check in complex_filter 
nb_input_files is already an invalid index.
 2012-04-22 17:23:50 -07:00
Mans Rullgard
d526c5338d ARM: allow runtime masking of CPU features 
This allows masking CPU features with the -cpuflags avconv option
which is useful for testing different optimisations without rebuilding.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-04-22 12:30:45 +01:00
Mans Rullgard
2bcbd98459 Remove lowres video decoding 
This feature is complex, of questionable utility, and slows down
normal decoding.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-04-21 18:56:19 +01:00
Anton Khirnov
2994913d70 avconv: fix a segfault when default encoder for a format doesn't exist. 
Fail earlier and with a more descriptive error message.
 2012-04-21 06:48:28 +02:00
Justin Ruggles
d8b06521a9 avconv: check for an incompatible changing channel layout 
The decoder can change the layout and channel count during decoding,
but currently we only validate that the two are compatible when opening
the codec. This checks for incompatibilities after each decoded frame.
 2012-04-18 21:02:16 -04:00
Justin Ruggles
b1041f8048 avconv: only set the "channels" option when it exists for the specified input format 
This allows the user to specify an input channel layout without avconv aborting because the
"channels" option was not found.
 2012-04-16 23:44:49 -04:00
Anton Khirnov
9e8aae443b avconv: flush decoders immediately after an EOF. 
Prevents extensive buffering when overlaying a single picture.
 2012-04-15 20:37:47 +02:00
Anton Khirnov
89605e4aa0 avconv: send EOF to vsrc_buffer. 2012-04-15 20:37:47 +02:00
Anton Khirnov
3e901cbc75 avconv: reindent. 2012-04-15 20:37:42 +02:00
Anton Khirnov
3b266da3d3 avconv: add support for complex filtergraphs. 2012-04-15 20:32:09 +02:00
Anton Khirnov
560f7774a4 avconv: make filtergraphs global. 
This is the first step towards supporting complex filtergraphs with more
than one input and/or output.
 2012-04-15 20:27:32 +02:00
Anton Khirnov
836ce90566 avconv: move filtered_frame from InputStream to OutputStream. 
It more properly belongs to output, not input.
 2012-04-15 20:24:07 +02:00
Anton Khirnov
6c9eac1998 avconv: don't set output width/height directly from input value. 
Always take it from lavfi. This way we don't need a clearly defined
corresponding input stream.
 2012-04-15 20:23:09 +02:00
Anton Khirnov
e77c86629f avconv: move resample_{width,height,pix_fmt} to InputStream. 
This is a more proper place for them, since they store parameters of the
input, not output, stream.
 2012-04-15 20:23:09 +02:00
Anton Khirnov
9dced85426 avconv: remove a useless variable from OutputStream. 2012-04-15 20:22:36 +02:00
Anton Khirnov
b7327887ea avconv: get output pixel format from lavfi. 
This way we don't require a clearly defined corresponding input stream.

The result for the xwd test changes because rgb24 is now chosen instead
of bgra.
 2012-04-15 20:22:36 +02:00
Anton Khirnov
2e21526790 avconv: change {input,output}_{streams,files} into arrays of pointers. 
Right now, they are arrays of structs, reallocated when new
streams/files are added. This makes storing pointers to those structs
harder than necessary.
 2012-04-15 20:20:03 +02:00
Anton Khirnov
ea9367e921 avconv: don't pass input/output streams to some functions. 
They are globals, no point in pretending they are not.
 2012-04-15 20:20:03 +02:00
Stefano Sabatini
91d3cbe0fd avfiltergraph: make the AVFilterInOut alloc/free API public 
This is required for letting applications to create and destroy
AVFilterInOut structs in a convenient way.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-04-14 09:25:46 +02:00
Justin Ruggles
d3c59d5003 avconv: use default channel layouts when they are unknown 
If either input or output layout is known and the channel counts match,
use the known layout for both. Otherwise choose the default layout based on
av_get_default_channel_layout().

Changed some FATE references due to some WAVE files now having a non-zero
channel mask.
 2012-04-10 11:30:01 -04:00
Justin Ruggles
95a8dac57b avconv: parse channel layout string 
This allows the user to use channel layout names instead of having to use the
channel mask values.
 2012-04-10 11:30:01 -04:00
Justin Ruggles
b073819bc9 avconv: allow '-async -1' to disable timestamp sync for audio encoding 
This will allow a workaround for cases where input timestamps are invalid or
when decoder delay of 1 packet or more confuses avconv into using the wrong
timestamps as a sync reference.
 2012-04-09 13:47:11 -04:00
Justin Ruggles
679a973e97 avconv: use default alignment for audio buffer 2012-04-09 10:20:35 -04:00
Anton Khirnov
b6c4518a87 avconv: remove OutputStream.picref. 
It's only used inside transcode_video() and there's no point in
preserving it between subsequent calls. So use a local variable instead.
 2012-04-09 05:13:00 +02:00
Anton Khirnov
695ec04e6a avconv: only set SAR once on the decoded frame. 
No point in repeating the assignment for each output stream.
 2012-04-09 05:10:38 +02:00
Anton Khirnov
d4936548f4 avconv: remove an unused function parameter. 2012-04-06 20:21:07 +02:00
Anton Khirnov
4648fe6324 avconv: remove now pointless variables. 2012-04-06 20:21:07 +02:00
Anton Khirnov
e06d2dfcde avconv: drop support for building without libavfilter. 
Since the mandatory memcpy in vsrc_buffer has been eliminated, there
shouldn't be any significant reason to build without lavfi anymore.

This will make upcoming support for complex filtergraphs easier to do.
 2012-04-06 20:21:07 +02:00
Ronald S. Bultje
bc1ef85520 lavc/avconv: support changing frame sizes in codecs with frame mt. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-03-24 21:29:16 +01:00