virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
44,550 Commits 37 Branches 400 Tags 464 MiB
628ce8b8b6
Commit Graph

1540 Commits

Author SHA1 Message Date
John Stebbins
db9b7321d5 vsrc_color: implement frame rate 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-11-09 08:15:26 +01:00
Michael Niedermayer
1339009c49 vf_showinfo: show timebase & framerate too 
(cherry picked from ffmpeg commit fdb9399681)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-11-09 08:15:23 +01:00
Michael Niedermayer
11f87ca71e vf_frei0r: also set AVFilterLink.frame_rate 
(cherry picked from ffmpeg commit 353cf95f94)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-11-09 08:09:42 +01:00
Michael Niedermayer
7d12cba95c vf_framepack: Check and update frame_rate 
(cherry picked from ffmpeg commit a46a23d30f)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-11-09 08:09:41 +01:00
Michael Niedermayer
65e73bc60f vf_interlace: implement frame rate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from ffmpeg commit 227b4458fb)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-11-09 08:09:41 +01:00
Stefano Sabatini
018bdaed37 setpts: add FRAME_RATE constant 
Useful for dealing with constant frame-rate video.

(cherry picked from ffmpeg commit 722762f7e1)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-11-09 08:09:41 +01:00
Stefano Sabatini
5e91a5c5cf testsrc: set output framerate 
(cherry picked from ffmpeg commit 7cd5fa35fe)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-11-09 08:09:41 +01:00
Michael Niedermayer
9df477e03e yadif: update frame rate 
(cherry picked from ffmpeg commit 3161958455)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-11-09 08:09:41 +01:00
Nicolas George
1062880d69 vf_fps: set frame_rate. 
(cherry picked from ffmpeg commit 0d24931604)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-11-09 08:09:41 +01:00
Nicolas George
61fb67dcb2 buffersrc: accept the frame rate as argument. 
(cherry picked from ffmpeg commit 9ca440679d)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-11-09 08:09:41 +01:00
Nicolas George
48ff6683ba lavfi: add a frame_rate field to AVFilterLink. 
(cherry picked from ffmpeg commit 7b42036b3b)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-11-09 08:09:34 +01:00
John Stebbins
2ec112f71c vf_pad: fix x, y option expression evaluation 
Calculation of x an y based on width and height did not work when
width == 0 or height == 0.  "0" substitutes the input width and
height, but did so too late for x, y expression evaluation.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-11-06 15:03:51 +01:00
Luca Barbato
ce70f28a17 avpacket: Replace av_free_packet with av_packet_unref 
`av_packet_unref` matches the AVFrame ref-counted API and can be used as
a drop in replacement.

Deprecate `av_free_packet`.
 2015-10-26 18:00:55 +01:00
Vittorio Giovara
c9943f00cf vf_framepack: Use av_image_copy() where appropriate 
This correctly adjust chroma subsampling for column interleaved mode,
and allows future high bitdepth support.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-09-29 14:33:01 +02:00
Anton Khirnov
ae25413daf lavfi: do not exclude hwaccel formats from ff_all_formats() 
It should be possible to pass hwaccel frames through lavfi.
 2015-09-28 15:42:38 +02:00
Luca Barbato
285fe5b098 avfilter: Support both syntaxes for the scale filter 2015-09-13 17:34:45 +02:00
Vittorio Giovara
dc54c78c4d buffersrc: Improve initialization log message 
Add timebase and aspect ratio information.
 2015-09-13 17:34:45 +02:00
Vittorio Giovara
2268db2cd0 lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields 
The new fields can be accessed directly and are more intelligible.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-09-07 12:37:47 +02:00
Vittorio Giovara
e88103a7f9 Bump major versions of all libraries 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-08-28 16:04:28 +02:00
Vittorio Giovara
4e649debcf Postpone API-incompatible changes until the next bump 2015-08-28 16:04:28 +02:00
Vittorio Giovara
f6974fe651 lavfi: Drop deprecated AVFilterBuffer* code 
Deprecated in 11/2012.
 2015-08-28 16:01:16 +02:00
Vittorio Giovara
e65e4cbbda lavfi: Drop deprecated *_count suffixed variables 
Deprecated in 06/2012.
 2015-08-28 16:01:13 +02:00
Vittorio Giovara
86e5056575 lavfi: Drop deprecated public AVFilterPad struct 
Deprecated in 06/2012.
 2015-08-28 11:06:37 +02:00
Luca Barbato
b1abd2aaf9 vf_scale: Add an option to pass the scaler params 
Reported-By: zehan@magicpony.technology
 2015-08-26 12:13:23 +02:00
Henrik Gramner
ab43beefab x86inc: Drop SECTION_TEXT macro 
The .text section is already 16-byte aligned by default on all supported
platforms so `SECTION_TEXT` isn't any different from `SECTION .text`.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-08-11 11:12:01 +02:00
Luca Barbato
98c9ade985 drawtext: Move the strftime expansion in a separate function 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-02 15:18:48 +02:00
Luca Barbato
fe026ba960 drawtext: Drop stray guards 
There is a fallback for localtime_r and it is in use already.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-02 15:14:33 +02:00
Anton Khirnov
22ecfcd4c7 af_channelmap: properly set the supported output channel layouts 
The current code expects query_formats() to be called exactly once, it
will leak if it's not called at all (filter initialized, but never
configured or used) or try to read freed memory if it's called more than
once.

Found-by: James Almer <jamrial@gmail.com>
CC: libav-stable@libav.org
 2015-07-23 09:53:55 +02:00
Anton Khirnov
6b15874fc2 af_resample: do not touch the timestamps if we are not resampling 
This filter currently assumes that the input audio is continuous and
does some timestamps manipulation based on this assumption.

This is unnecessary if we are only converting the channel layout or the
sample format, without resampling. In such a case, just leave the
timestamps as they are.
 2015-07-19 09:39:42 +02:00
Vittorio Giovara
0d449c81b3 lavfi: Add library identifier 2015-07-01 00:13:58 +01:00
Luca Barbato
c060d046aa af_resample: Set the number of samples in the last frame 
Otherwise trailing zeroes would appear.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-20 12:18:01 +03:00
James Almer
d68c05380c x86: check for AV_CPU_FLAG_AVXSLOW where useful 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-31 12:07:11 +02:00
Vittorio Giovara
7046bd9bc9 lavfi: Move avcodec header to the only filter needing it 
af_ashowinfo, due to the enum AVAudioServiceType use.
 2015-05-19 18:56:40 +01:00
Anton Khirnov
3735b5c616 Revert "lavfi: always check av_expr_parse_and_eval() return value" 
This reverts commit 63be97ec40.

All those calls were unchecked on purpose, as explained in the comments
in the code.
 2015-05-05 16:27:24 +02:00
Federico Tomassetti
8eb57dc9d5 buffersrc: Use the correct deallocation function 
This correction was suggested to me by Michael Niedermayer

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-22 12:26:53 +02:00
Luca Barbato
9b2c57bef5 drawtext: Add an alpha option 
And document both `draw` and `alpha`.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-21 11:13:30 +02:00
Federico Tomassetti
617814b4a7 buffersrc: Fix resource leak on error 
Bug-Id: CID 1267902
CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-04-19 23:50:46 +01:00
Himangi Saraogi
88d1fb4e3f filtfmts: Avoid null pointer dereference 2015-04-19 23:45:35 +01:00
Vittorio Giovara
1a3eb042c7 Replace av_dlog with normal av_log at trace level 
This applies to every library where performance is not critical.
 2015-04-19 12:41:59 +01:00
Federico Tomassetti
cfe6461392 avfilter: Document avfilter_graph_alloc return value 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-03-21 23:18:15 +01:00
Vittorio Giovara
c3bd1d60af formats: Check memory allocations 2015-03-12 17:46:47 +00:00
Himangi Saraogi
88b160a457 avfilter: Return more meaningful error codes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2015-03-05 19:36:39 +01:00
Vittorio Giovara
9d3b752fce graphparser: Check av_get_token() memory error 
CC: libav-stable@libav.org
Bug-Id: CID 1267891
 2015-02-17 11:27:41 -05:00
Luca Barbato
a6653787a4 libopencv: Check kernel_str life cycle 
The string might or might not be set depending if there
are args and in case of error it must be freed nonetheless.

CC: libav-stable@libav.org
Bug-Id: CID 739878 / CID 739882
 2015-02-03 15:23:21 +00:00
Vittorio Giovara
22b985d59c hqdn3d: check memory allocations and propagate errors 2015-01-29 17:33:38 +00:00
Vittorio Giovara
8805589b80 libopencv: Rework error handling in parse_iplconvkernel() 
Fix 'values' memory leak in case of error.

CC: libav-stable@libav.org
Bug-Id: CID 739879
 2015-01-27 15:26:37 +00:00
Anton Khirnov
728685f37a Add a side data type for audio service type. 
Currently, audio service type is a field in AVCodecContext. However,
side data is more appropriate for this kind of information.
 2015-01-27 09:17:48 +01:00
Vittorio Giovara
4438c25638 vf_interlace: remove the warning tag in the message 
The log level is already a warning.
 2015-01-05 15:35:46 +01:00
Vittorio Giovara
15ea222778 vf_interlace: merge FIELD_LOWER check 2015-01-05 15:35:46 +01:00
Vittorio Giovara
046f75a970 vf_interlace: also assert for height 2015-01-05 15:35:46 +01:00
Vittorio Giovara
696141e898 vf_interlace: use image width rather than linesize 
Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
 2015-01-05 15:35:46 +01:00
Vittorio Giovara
63be97ec40 lavfi: always check av_expr_parse_and_eval() return value 
CC: libav-stable@libav.org
Bug-Id: CID 703624
 2014-12-18 23:27:14 +01:00
Vittorio Giovara
d0b224054f vf_frei0r: do not increment string if it reached the end 
Bug-Id: 778
CC: libav-stable@libav.org
 2014-12-08 13:30:38 +00:00
Михаил Муковников
71f29410e7 lavfi: Increase drawtext font size limits 
Raise the maximum font size to a larger value.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-12-07 13:15:03 +01:00
Kieran Kunhya
96fda42a8f vf_interlace: get rid of useless loads 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-11-27 13:57:50 +01:00
Michael Niedermayer
ca5c3ff909 vf_interlace: x86: improve asm performance 
4775 decicycles -> 3688 decicycles
 2014-11-25 02:00:06 +00:00
Vittorio Giovara
863ee8a855 lavfi: clean memory on error in ADD_FORMAT() 
CC: libav-stable@libav.org
Bug-Id: CID 1250334
 2014-11-21 12:27:07 +00:00
Kieran Kunhya
2e1704059a vf_interlace: Add SIMD for lowpass filter 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-11-15 00:35:31 +01:00
Martin Storsjö
6b9b42cc55 drawtext: Remove the ifdef for localtime_r 
If it isn't available in the system, we've got a fallback to
the normal localtime function, so normal code can assume it is
available as long as time_internal.h is included.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-10-26 00:14:54 +03:00
Vittorio Giovara
ac84c1ce24 avfilter: check filter link validity 
Remove now redundant check.

CC: libav-stable@libav.org
Bug-Id: CID 700371
 2014-10-24 23:42:19 +01:00
Vittorio Giovara
d1afd3e1d6 vf_format: check input validity 
CC: libav-stable@libav.org
 2014-10-20 10:38:38 +01:00
Vittorio Giovara
0d989dbfc4 af_resample: check av_opt_set_dict return value 
CC: libav-stable@libav.org
Bug-Id: CID 1087076
 2014-10-18 16:15:10 +01:00
Vittorio Giovara
6d96c7ea89 vf_showinfo: Forward the av_image_get_linesize error 
CC: libav-stable@libav.org
Bug-Id: CID 1087086
 2014-10-18 16:15:10 +01:00
Luca Barbato
f401792595 vf_drawtext: Do not leak the mmapped textfile 
And validate its size while at it.

CC: libav-stable@libav.org
Bug-Id: CID 1244189
 2014-10-18 16:15:09 +01:00
Timothy B. Terriberry
6cbbf0592f resample: Avoid off-by-1 errors in PTS calcs. 
The rounding used in the PTS calculations in filter_frame() does
not actually match the number of samples output by the resampler.
This leads to off-by-1 errors in the timestamps indicating gaps and
underruns, even when the input timestamps are all contiguous.

Bug-Id: 753

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-10-18 05:01:59 +02:00
Diego Biurrun
593aaee953 setpts: Add missing inttypes.h #include for PRId64 
Also convert a debug av_log() to av_dlog().
 2014-08-21 04:18:24 -07:00
Diego Biurrun
11cd727fbd vsrc_movie: Adjust a silly typo from b977b287f6 2014-08-21 04:18:23 -07:00
Diego Biurrun
67a7695c14 avfilter: Remove unused variable from ff_get_video_buffer() 2014-08-19 09:50:18 -07:00
Diego Biurrun
b977b287f6 vsrc_movie: Avoid a variable indirection in movie_get_frame() 
This avoids an unused variable warning with MSVC since the variable is
only used in a debug mode printf statement.
 2014-08-19 06:22:08 -07:00
Anton Khirnov
1985c2e75c Bump major versions of all libraries. 2014-08-09 16:58:33 +00:00
Anton Khirnov
f4c444e17d Postpone API-incompatible changes until the next bump. 2014-08-09 16:57:10 +00:00
Kieran Kunhya
1ef9e83764 avcodec: Deprecate dtg_active_format field in favor of avframe side-data 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-03 15:43:02 -07:00
Diego Biurrun
072916d903 filtfmts: Replace deprecated uses of AVFilterPad 
Also add missing mem.h header for av_freep().
 2014-08-03 03:23:51 -07:00
Diego Biurrun
c6a1ac2dd9 vf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame 2014-08-03 01:29:43 -07:00
Luca Barbato
f0e9594819 af_channelmap: Set the frame channel layout 
Otherwise the frame would show the first layout matching the
channel count.
 2014-08-02 00:58:21 +02:00
Luca Barbato
87efaa97ce af_join: Set the output frame format 2014-08-02 00:58:21 +02:00
Vittorio Giovara
52269f48e8 Revert "vf_interlace: deprecate lowpass option" 
This reverts commit 35b05c5184.
A warning is introduced in case this option is used.
 2014-08-01 13:02:29 +01:00
Diego Biurrun
a8d803a320 vf_select: Drop a debug av_log with an unchecked double to enum conversion 
CC: libav-stable@libav.org
 2014-07-29 09:37:01 -07:00
Andrew Kelley
d3cfd7aff8 af_compand: make sure request_frame always outputs at least one frame 
This fixes a segmentation fault because request_frame in fifo.c assumes
that the call to ff_request_frame will populate fifo->root.next.
Before, it was possible for request_frame in af_compand to not do this,
resulting in a null pointer access. Now, request_frame in af_compand
always will return at least one frame or an error, as per the API
specifications in avfilter.h for request_frame.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-07-08 07:54:00 +00:00
Vittorio Giovara
5a69ded12a vf_showinfo: print display transformation values 2014-06-14 00:19:14 -04:00
Luca Barbato
ad0fe2f401 af_resample: Use avresample_get_out_samples 2014-05-28 22:50:55 +02:00
Anton Khirnov
7cc4c9f32f lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB 
Thatt hardcodes the number of formats into lavfi and will break when a
shared lavu is updated, adding new formats.
 2014-05-26 22:25:47 +02:00
Anton Khirnov
b03b2d86aa buffersrc: avoid using AV_PIX_FMT_NB 
That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.
 2014-05-26 22:25:41 +02:00
Anton Khirnov
a7d070acb5 vf_fieldorder: avoid using AV_PIX_FMT_NB 
That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.
 2014-05-26 22:25:26 +02:00
Anton Khirnov
862f33c10e vf_scale: use the pixfmt descriptor API 
Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.
 2014-05-26 22:24:46 +02:00
Anton Khirnov
45fc73edfe vf_format: rework format list parsing 
Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.
 2014-05-26 22:22:42 +02:00
Janne Grunau
449511740f build: handle library dependencies in configure 
Instead of setting FFLIBS in each library Makefile configure
exports FFLIBS-$library in config.mak.
 2014-05-13 20:02:01 +02:00
Alessandro Ghedini
1c0210c798 lavfi: add Bauer stereo-to-binaural audio filter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-05-01 08:00:30 +02:00
Vittorio Giovara
d23fc8846d filtfmts: remove unused lavf include 2014-04-19 16:20:57 +02:00
Vittorio Giovara
58400ac133 lavfi: name anonymous structs 2014-04-19 16:20:57 +02:00
Luca Barbato
f1b239ec8b drawtext: Add fontconfig support 
Introduce the `font` option and make it optional to pass a fontfile.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-17 00:41:30 +02:00
Alessandro Ghedini
aaab192df2 af_volume: implement replaygain clipping prevention 
This adds a new "replaygain_noclip" option to the filter, and, if enabled,
limits the gain applied for tracks where clipping would occur.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-13 11:25:06 +02:00
Nicolas George
ad8159e0fe libavfilter: Add asettb filter for setting timebase for audio 
Ported asettb (including the sr option for audio sample rate) from FFmpeg,
and copied/modified the existing settb documentation for asettb.

Signed-off-by: Katerina Barone-Adesi <katerinab+libav@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-10 12:52:19 +02:00
Diego Biurrun
01c5779f56 x86: Drop some unnecessary YASM ifdefs 
Dead code elimination is enough to avoid undefined references in these cases.
 2014-04-04 19:08:05 +02:00
Anton Khirnov
9c21c08fa7 af_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY 2014-04-04 18:54:47 +02:00
Alessandro Ghedini
a49aa440c9 af_volume: implement replaygain pre-amplification 
This adds a new "replaygain_preamp" option to the filter, and simply adds its
value to the replaygain gain value.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-04 18:53:05 +02:00
Katerina Barone-Adesi
b33c64e4c2 vf_settb: rename to settb 
An audio version of settb (asettb) will be added to this file.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-04-02 12:14:10 +02:00
Vittorio Giovara
6ee55c7b11 vf_transpose: K&R formatting cosmetics 2014-03-25 12:24:39 +01:00
Anton Khirnov
b4679ecdbd {v,a}f_showinfo: print frame side data 2014-03-24 06:14:55 +01:00
Anton Khirnov
06c3cd3c01 af_volume: support using replaygain frame side data 2014-03-24 06:07:51 +01:00