summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge commit '33ac77e850efdfd0e8835950c3d947baffd4df45'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | | | * commit '33ac77e850efdfd0e8835950c3d947baffd4df45': mmaldec: autodetect by default This commit is not merged (it will be reverted in the next one to merge). Merged-by: Clément Bœsch <clement@stupeflix.com>
| * mmaldec: autodetect by defaultwm42016-04-30
| | | | | | | | | | | | It qualifies as a system library. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavc/mmaldec: reduce some diffs with Libav missed in previous skipped mergesClément Bœsch2016-06-21
| |
* | Merge commit '74beead9bd596180bcac6108548fc0a86d8eb4ae'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '74beead9bd596180bcac6108548fc0a86d8eb4ae': mmaldec: limit internal buffering See 14a90c9ef09a4b046500dceab5ca1875e330a376 The introduction of the MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS check is merged. Merged-by: Clément Bœsch <clement@stupeflix.com>
| * mmaldec: limit internal bufferingwm42016-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses a new MMAL feature, which limits the number of extra frames that can be buffered within the decoder. VIDEO_MAX_NUM_CALLBACKS can be defined as positive or negative number. Positive numbers are absolute, and can lead to deadlocks if the user underestimates the number of required buffers. Negative numbers specify the number of extra buffers, e.g. -1 means no extra buffer, (-1-N) means N extra buffers. Set a gratuitous default of -11 (N=10). This is much lower than the firmware default, which appears to be 96. This is backwards compatible, but needs a symbol only present in newer firmware headers. (It's an enum item, so it requires a check in configure.) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720': mmaldec: print the MMAL format FourCC automatically This commit is a noop, see d27a12cb0982921e503e68692bb99b6dfe1a6144 Merged-by: Clément Bœsch <clement@stupeflix.com>
| * mmaldec: print the MMAL format FourCC automaticallywm42016-04-30
| | | | | | | | | | | | | | Slight simplification. The result is the same. Also, change the wording of the message as requested in patch review. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '84bba36846870c6269732351c022eeef094c6c83'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit '84bba36846870c6269732351c022eeef094c6c83': configure: fix mmal build dependencies This commit is a noop, see 0badf4564a90ffa6f104b275277a6015a1d33905 Merged-by: Clément Bœsch <clement@stupeflix.com>
| * configure: fix mmal build dependencieswm42016-04-30
| | | | | | | | | | | | The mmal decoders do not depend on the software decoders. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ce589940c2cac936891e8bba275580d6efc41e8b'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit 'ce589940c2cac936891e8bba275580d6efc41e8b': mmaldec: send only a single EOS packet on flushing This commit is a noop, see dafe4cd29cada351a2785433b24401fc602911c4 Merged-by: Clément Bœsch <clement@stupeflix.com>
| * mmaldec: send only a single EOS packet on flushingwm42016-04-30
| | | | | | | | | | | | | | | | Fixes apparent mmal_port_disable() freezes in ffmmal_stop_decoder() when calling ffmmal_decode() with flush semantics a large number of times in a row. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d': mmaldec: correct package buffering accounting This commit is a noop, see a55fbfa4c4967068a9c37f041110ace9fb633d4e Merged-by: Clément Bœsch <clement@stupeflix.com>
| * mmaldec: correct package buffering accountingwm42016-04-30
| | | | | | | | | | | | | | | | | | | | | | The assert in ffmmal_stop_decoder() could trigger sometimes. The packets_buffered counter was indeed not correctly maintained, and packets were not subtracted from it if they were still in the waiting queue. For some reason, this happened especially with VC-1. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3': mmaldec: add vc1 decoding support This commit is a noop, see b07cbf6724207ba768ebb2ccdee1b6749fd6ca31 Merged-by: Clément Bœsch <clement@stupeflix.com>
| * mmaldec: add vc1 decoding supportwm42016-04-30
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a': mmaldec: Add mpeg2 decoding support This commit is a noop, see 7ebe12fc55591053cbd194ca6638e5c32beaee45 Merged-by: Clément Bœsch <clement@stupeflix.com>
| * mmaldec: Add mpeg2 decoding supportJulian Scheel2016-04-30
| | | | | | | | | | | | | | | | | | | | | | Register mmaldec as mpeg2 decoder. Supporting mpeg2 in mmaldec is just a matter of setting the correct MMAL_ENCODING on the input port. To ease the addition of further supported mmal codecs a macro is introduced to generate the decoder and decoder class structs. Signed-off-by: Julian Scheel <julian@jusst.de> Signed-off-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '2689bb115ca64921789092148deaf213a0d94d2e'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit '2689bb115ca64921789092148deaf213a0d94d2e': mmaldec: Fix avpriv_atomic_get usage This commit is a noop, see da43e9e157a3c64337348b44193ab390bd481911 Merged-by: Clément Bœsch <clement@stupeflix.com>
| * mmaldec: Fix avpriv_atomic_get usageJulian Scheel2016-04-30
| | | | | | | | | | | | | | | | | | There is no avpriv_atomic_get, instead avpriv_atomic_int_get is to be used for integers. This fixes building mmaldec. Signed-off-by: Julian Scheel <julian@jusst.de> Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '366ba2dee1f2b17825b42e2164d3b9879f0271b1'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit '366ba2dee1f2b17825b42e2164d3b9879f0271b1': mmaldec: Use av_assert0() instead of assert() This commit is a noop, see c0152ebb9e0501b9d3d4386531995683a4ac824c Merged-by: Clément Bœsch <clement@stupeflix.com>
| * mmaldec: Use av_assert0() instead of assert()Michael Niedermayer2016-04-30
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'f2422b58756ba97e3cbadc190f1ed950aa201ec7'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit 'f2422b58756ba97e3cbadc190f1ed950aa201ec7': testprogs: Mark some tables as static const Merged-by: Clément Bœsch <clement@stupeflix.com>
| * testprogs: Mark some tables as static constDiego Biurrun2016-04-29
| |
* | Merge commit '5b1409c75563b4a3aca113c34d09e3b5442de47f'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5b1409c75563b4a3aca113c34d09e3b5442de47f': fate: Add test for MSS1 Test was already present, see 849e55e58ecc6815e8bd326ac18dda748db48682. The merge removes the audio decoding present in our version and simplifies the rules. Merged-by: Clément Bœsch <clement@stupeflix.com>
| * fate: Add test for MSS1Diego Biurrun2016-04-27
| |
* | Merge commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869': dds: Add support for monochrome images Merged-by: Clément Bœsch <clement@stupeflix.com>
| * dds: Add support for monochrome imagesVittorio Giovara2016-04-26
| |
* | Merge commit '6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit '6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3': dds: Drop gray-alpha swapping This commit is not merged, see 139cbeb75e0f5e3176b2b09660d2570b1bcc2408. Merged-by: Clément Bœsch <clement@stupeflix.com>
| * dds: Drop gray-alpha swappingVittorio Giovara2016-04-26
| | | | | | | | The original sample was generated with invalid software.
* | Merge commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a': dxva2_h264: Unbreak compilation after 3176217c6 This commit is a noop. The compilation was fixed in the merge commit itself (1534ef87c74cc66a117bf61c467641c2129bc964). The additional local unused sps is not merged. Merged-by: Clément Bœsch <clement@stupeflix.com>
| * dxva2_h264: Unbreak compilation after 3176217c6Martin Storsjö2016-04-25
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '4012fe1ee819edc7689e182189e66c5401fb4b41'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit '4012fe1ee819edc7689e182189e66c5401fb4b41': ape: Unbreak adaptcoeffs computation This commit is a noop, see dd4fb2339f76a958bd7e63e5ac18b8c10852ae1a Merged-by: Clément Bœsch <clement@stupeflix.com>
| * ape: Unbreak adaptcoeffs computationLuca Barbato2016-04-24
| | | | | | | | | | | | And simplify and explain the expression. Fault introduced in f3fdef108eb06b1e71b29152bf6822519e787efe
* | Merge commit '2e5bde956519ae19cedfa482e199518e495bcaf5'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2e5bde956519ae19cedfa482e199518e495bcaf5': h264: eliminate max_contexts This commit is a noop as max_contexts can change and mismatch the nb_slice_ctx (see 507b01f89969601f15555f7416804fb691632cbb). The file in the Ticket is not decodable anymore, so it was not possible to check if that code path was triggerable some way or another, or even test a different fix. Merged-by: Clément Bœsch <clement@stupeflix.com>
| * h264: eliminate max_contextsAnton Khirnov2016-04-24
| | | | | | | | It is always equal to nb_slice_ctx.
* | Merge commit 'e3c9041cfe2e6526802255583d27abf9a921863e'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit 'e3c9041cfe2e6526802255583d27abf9a921863e': h264: allocate some tables per slice contexts, not threads Merged-by: Clément Bœsch <clement@stupeflix.com>
| * h264: allocate some tables per slice contexts, not threadsAnton Khirnov2016-04-24
| | | | | | | | | | This is more correct and avoids wasting space when frame threading is used.
* | Merge commit 'e0652795292223f8bc8e5bac019c1fca7323d23c'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit 'e0652795292223f8bc8e5bac019c1fca7323d23c': h264: remove an artificial restriction on the number of slice threads Tested with multiple runs of fate-h264 THREADS=50 THREAD_TYPE=slice Merged-by: Clément Bœsch <clement@stupeflix.com>
| * h264: remove an artificial restriction on the number of slice threadsAnton Khirnov2016-04-24
| | | | | | | | | | This limit is now unnecessary, we can easily support an arbitrary number of threads.
* | lavc/h264_slice: mark ref2frm as const pointersClément Bœsch2016-06-21
| |
* | avformat/oggparsevorbis: free base64 encoded data immediately after decoding itJames Almer2016-06-20
| | | | | | | | | | | | | | It has no use afterwards and freeing it before calling ff_flac_parse_picture() may help prevent OOM issues on memory constrained scenarios. Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/oggparsevorbis: use the base64 decode size macroJames Almer2016-06-20
| | | | | | | | | | | | | | Allocate the memory needed for the decoded data rather than the encoded data. Signed-off-by: James Almer <jamrial@gmail.com>
* | swresample/x86: add support for exact_rationalMuhammad Faiz2016-06-21
| | | | | | | | | | | | | | phase_shift and phase_mask is removed generally exact_rational=on is faster than exact_rational=off Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | MAINTAINERS: update my entriesClément Bœsch2016-06-20
| |
* | Remove Benjamin Larsson from MAINTAINERSBenjamin Larsson2016-06-20
| | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* | fate: add test for alimiterPetru Rares Sincraian2016-06-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc/h264_ps: add ff_h264_ps_uninit and use itMatthieu Bouron2016-06-20
| |
* | lavf/mov: ignore ctts entries that do not apply to a least one sampleMatthieu Bouron2016-06-20
| | | | | | | | Fixes packet pts of samples which contain ctts entries with count <= 0.
* | Merge commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69'Clément Bœsch2016-06-20
|\| | | | | | | | | | | | | * commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69': h264: remove pointless setting of some variables in loop_filter Merged-by: Clément Bœsch <clement@stupeflix.com>
| * h264: remove pointless setting of some variables in loop_filterAnton Khirnov2016-04-24
| | | | | | | | Those should already be set to the correct values.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 03:32:17 +0000