Commit Graph

32655 Commits

Author SHA1 Message Date
Michael Niedermayer
93869d4e44 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libx264: introduce slice-max-size option
  Fixed size given to init_get_bits().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-16 21:43:56 +02:00
Michael Niedermayer
5c5306df96 lavf/utils: rewrite real fps calculation code.
The new code is free of biasing to the first timestamps
Fixes fraps.fps.test.zip

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-16 21:29:58 +02:00
Stefano Sabatini
e3fc0e8280 lavdev/lavfi: reindent after the last commit 2011-09-16 21:22:11 +02:00
Stefano Sabatini
4893c204c8 lavdev/lavfi: add audio support 2011-09-16 21:22:05 +02:00
Mina Nagy Zaki
3ee0bedcc0 lavfi: refactor query_formats and auto-insert audio conversion filters
Behaviour has been changed to fail negotiation if fields have been
left empty.

Patch was originally based on a patch by Hemanth.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-09-16 20:44:27 +02:00
Stefano Sabatini
37cc443c83 lavfi: add audio convert filter
Add aconvert filter to perform sample format, channel layout, and
packing format conversion.

The aconvert code depends on audio conversion code in libavcodec, so
this requires a dependency on libavcodec.

Based on previous work by S.N. Hemanth Meenakshisundaram and Mina Nagy
Zaki, performed for the GSoC 2010 and 2011.
2011-09-16 20:44:27 +02:00
Stefano Sabatini
553c5e9f23 lavfi: add and use an inlink variable in avfilter_config_links()
Simplify expressions, improve readability.
2011-09-16 20:44:27 +02:00
Stefano Sabatini
71c644ceda lavfi: set link audio time_base if not set in avfilter_config_links()
The set value depends on the input link, or on the sample_rate value.
Avoids the need to explicitely set the time_base value.
2011-09-16 20:44:26 +02:00
Daniel Kristjansson
4460b81f9e mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container
Support Main Profile at High 1440 Level in MXF container,
using essence coding label from SMPTE RDD 9, table 6.
2011-09-16 18:16:30 +02:00
Luca Barbato
3a78fb57de libx264: introduce slice-max-size option
Yet another option useful for low latency streaming.
2011-09-16 07:56:17 -07:00
Clément Bœsch
8af64e1a67 ffprobe: fix crash with -h. 2011-09-16 14:31:42 +02:00
Clément Bœsch
9eb1c94713 doc: fix x264_opts/x264opts typo. 2011-09-16 11:50:06 +02:00
Ramiro Polla
6613db9736 dshow: remove filters from graph before releasing them
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-09-16 11:16:05 +02:00
Ramiro Polla
a1644f6287 dshow: reset list for each filter removed
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-09-16 11:16:05 +02:00
Ramiro Polla
215e197942 dshow: invert condition to avoid leaking objects
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-09-16 11:16:05 +02:00
Ramiro Polla
dd41036a4c dshow: cleanup internal references on capture interface
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-09-16 11:16:05 +02:00
Ramiro Polla
0b951d103d dshow: release pin on disconnect
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-09-16 11:16:05 +02:00
Ramiro Polla
c7807eeb78 doc: add documentation for dshow indev
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-09-16 11:16:00 +02:00
Ramiro Polla
01b997b958 dshow: indent
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-09-16 11:09:47 +02:00
Ramiro Polla
0883a7fa3b dshow: add option to list audio/video options
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-09-16 11:09:13 +02:00
Ramiro Polla
c4b2027d10 dshow: add audio/video options
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-09-16 11:06:56 +02:00
Ramiro Polla
d0da310317 dshow: initialize variable to prevent releasing random data
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-09-16 11:02:26 +02:00
Ramiro Polla
ee4ed80485 dshow: factorise cycling through pins
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-09-16 11:02:13 +02:00
Michael Niedermayer
41215fdeb3 libavfilter/formats.c: fix compile of test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-16 06:07:07 +02:00
Michael Niedermayer
cfe4e8c220 bintext: make decoder names unique
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-16 05:53:32 +02:00
Michael Niedermayer
3ac4f444e2 bintext: set buffer hints
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-16 05:53:32 +02:00
Michael Niedermayer
b9dbaa409f bintext: fix possible x variable overflow.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-16 05:53:32 +02:00
Michael Niedermayer
fa2dbcd46a bintext: remove unneeded get_buffer()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-16 05:53:31 +02:00
Peter Ross
07a70caba7 Binary text decoder
Decoder and demuxer for various binary text formats.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-16 05:53:14 +02:00
Stefano Sabatini
ea8de109af lavfi: add avfilter_all_channel_layouts public symbol
This list is mainly useful to be directly used as a parameter by the
audio sink buffer, when there is no need to force a specific channel
layout.

The list of formats is generated programmatically, and avoids channel
layouts not supported by libavfilter (with more than 8 channels).

We preferred to avoid compile-time generation in order to avoid some
unnecessary complexity (build hacks, generating code maintainance
etc.).

A more compact way to express this list through the use of macros
should be possible when libavfilter will support more than 8 channels,
as there will be no need to filter out channel layouts with more than
8 channels.

See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi: add ff_all_channel_layouts internal symbol
Date: Sat, 20 Aug 2011 15:33:16 +0200
2011-09-16 00:46:41 +02:00
Stefano Sabatini
9899037dc6 lavfi: rename avfilter_all_* function names to avfilter_make_all_*
A function name should tell what the function does rather than what
the function returns. This also avoids possible conflicts
(e.g. between a function and a public list of all supported formats),
and clarifies the code.

Breaks audio API/ABI, add a backward compatibility layer for video
API/ABI.
2011-09-16 00:42:47 +02:00
Stefano Sabatini
98b906e1af APIchanges: remove prores decoder addition entry
It is not an API change.
2011-09-16 00:42:09 +02:00
Michael Niedermayer
62101030c4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  swscale: fix byte overreads in SSE-optimized hscale().
  matroskadec: fix typo.
  matroskadec: bail on parsing of incorrect seek index segments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-15 23:10:26 +02:00
Michael Niedermayer
e78d1a594a mpegts: make sure the "standard" code doesnt override the probing with NONE/DATA.
Fixes video stream detection in vid_0x80.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-15 23:01:04 +02:00
Laurent Aimar
b59efc9434 Fixed size given to init_get_bits().
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
2011-09-15 13:23:04 -07:00
Ingo Brückl
5d305c9398 Correct determination of file size and frames in VBRI headers
The fields "Number of Bytes" and "Number of Frames" are mixed up. "Bytes"
come first, "Frames" behind.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-15 20:16:55 +02:00
Elvis Presley
b3887bd5fa configure: require gplv2 for prores
Signed-off-by: Elvis Presley <elvis@e.p>
2011-09-15 17:07:00 +02:00
Elvis Presley
db54ff6d53 configure: add GPLv2 support (needed for ProRes)
Signed-off-by: Elvis Presley <elvis@e.p>
2011-09-15 17:06:21 +02:00
Ronald S. Bultje
ea540401d6 swscale: fix byte overreads in SSE-optimized hscale().
SSE-optimized hScale() scales up to 4 pixels at once, so we need to
allocate up to 3 padding pixels to prevent overreads. This fixes
valgrind errors in various swscale-tests on fate.
2011-09-15 07:30:46 -07:00
Elvis Presley
3dd47ae537 Revert "get_bits: remove x86 inline asm in A32 bitstream reader"
This reverts commit 23ce6e7212.
2011-09-15 15:59:04 +02:00
Elvis Presley
5554de13b2 ProRes Decoder
Signed-off-by: Elvis Presley <elvis@e.p>
2011-09-15 15:58:56 +02:00
Dustin Brody
d7d2f0e63c matroskadec: fix typo.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-15 09:34:38 +02:00
Dustin Brody
4a9628f276 matroskadec: bail on parsing of incorrect seek index segments
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-15 09:34:16 +02:00
Michael Niedermayer
d55b06b8e7 mjpeg: interlaced buggy avid fix
Fix Ticket362

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-15 04:20:11 +02:00
Michael Niedermayer
e009432b50 mjpegdec: fix len for AVI1 reader
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-15 04:18:32 +02:00
Michael Niedermayer
b34c7a5656 Revert "MJPEG: emulate EOI also on two consecutive SOI."
This causes Ticket463, fix will be in the next commits

This reverts commit 5e2ea138b7.
2011-09-15 04:17:26 +02:00
Michael Niedermayer
3ee83f4605 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavf utils: Remove write-only variable
  lavf utils: Rename shadowing variable
  smacker: fix a few off by 1 errors
  Check for invalid VLC value in smacker decoder.
  Check and propagate errors when VLC trees cannot be built in smacker decoder.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-14 21:57:47 +02:00
Michael Niedermayer
205c13685f h264: allow disabling bitstream overread protection by using the fast flag.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-14 20:48:00 +02:00
Joakim Plate
cdced09ef6 Don't override duration from file header with bitrate duration
This is most noticable on matroska files which has duration
as part of it's header.
2011-09-14 20:08:43 +02:00
Joakim Plate
5d70536804 [yop] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00