1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

75387 Commits

Author SHA1 Message Date
Hendrik Leppkes
04eff96822 Merge commit '777885983533235ccda5145f96317fc8cd0a18ab'
* commit '777885983533235ccda5145f96317fc8cd0a18ab':
  dcadec: set channel layout in a separate function

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-17 11:21:07 +02:00
Hendrik Leppkes
ecaa6cf7b8 Merge commit '971177f751a6e2931232accceab438bce277bde8'
* commit '971177f751a6e2931232accceab438bce277bde8':
  dcadec: scan for extensions in a separate function

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-17 11:08:22 +02:00
Hendrik Leppkes
157969321a Merge commit '22cc57da64bfd73f2206969486b0aa183ee76479'
* commit '22cc57da64bfd73f2206969486b0aa183ee76479':
  rtpdec: Forward the memory failure

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-17 11:01:16 +02:00
Timothy Gu
d36eac698f Revert "avformat/format: silence -Wdiscarded-qualifiers"
This reverts commit 27cbe4588a.

See
https://lists.ffmpeg.org/pipermail/ffmpeg-devel/2015-September/179002.html

Requested-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2015-09-16 19:53:13 -07:00
Claudio Freire
8df9bf8e39 AAC encoder: refactor to resynchronize MIPS port
This patch refactors the AAC coders to reuse code
between the MIPS port and the regular, portable C code.
There were two main functions that had to use
hand-optimized versions of quantization code:
 - search_for_quantizers_twoloop
 - codebook_trellis_rate

Those two were split into their own template header
files so they can be inlined inside both the MIPS port
and the generic code. In each context, they'll link
to their specialized implementations, and thus be
optimized by the compiler.

This approach I believe is better than maintaining
several copies of each function. As past experience has
proven, having to keep those in sync was error prone.
In this way, they will remain in sync by default.

Also, an implementation of the dequantized output
argument for the optimized quantize_and_encode
functions is included in the patch. While the current
implementation of search_for_pred still isn't using
it, future iterations of main prediction probably will.
It should not imply any measurable performance hit while
not being used.
2015-09-16 23:14:26 -03:00
Ronald S. Bultje
344d519040 vp9: add subpel MC SIMD for 10/12bpp. 2015-09-16 21:11:34 -04:00
Ronald S. Bultje
77f359670f vp9: add fullpel (avg) MC SIMD for 10/12bpp. 2015-09-16 21:11:34 -04:00
Ronald S. Bultje
6354ff0383 vp9: add fullpel (put) MC SIMD for 10/12bpp. 2015-09-16 21:11:34 -04:00
Michael Niedermayer
d64f7d4213 avformat/avidec: disable parsing for RV40
Fixes: broken_rv40.avi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-17 02:08:15 +02:00
Michael Niedermayer
fa5358f07d avcodec/rv34: Delay failure return for B frames with a missing reference
Failing earlier causes the context to be insufficiently initialized which
can break decoding future frames with threads

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-17 02:08:15 +02:00
Ganesh Ajjanagadde
80d23d9d32 swscale/swscale: silence unused function warning
gamma_convert is only used with the old code. Thus, it is
placed under a header guard. This patch silences a -Wunused-function
observed on GCC 5.2.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-09-16 16:31:29 -07:00
Ganesh Ajjanagadde
9aaa54135c avformat/mpjpegdec: silence unused variable/function warnings
Silences a -Wunused-variable and -Wunused-function observed under GCC 5.2.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-09-16 16:29:51 -07:00
Ganesh Ajjanagadde
27cbe4588a avformat/format: silence -Wdiscarded-qualifiers
lpd.buf is non-const and discards the const qualifier of zerobuffer.
This fixes -Wdiscarded-qualifiers observed with GCC 5.2.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-09-16 16:24:56 -07:00
Timothy Gu
712235dd8f configure: Print large lists in more columns if the screen size allows
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
2015-09-16 16:22:24 -07:00
Alexandra Hájková
7778859835 dcadec: set channel layout in a separate function
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-09-16 20:21:07 +02:00
Alexandra Hájková
971177f751 dcadec: scan for extensions in a separate function
to make dca_decode_frame more readable

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-09-16 20:21:07 +02:00
Luca Barbato
22cc57da64 rtpdec: Forward the memory failure
And avoid a memory leak.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-09-16 20:20:16 +02:00
Rostislav Pehlivanov
5ba811bdf0 aacenc_tns: fix coefficient compression condition
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2015-09-16 17:48:02 +01:00
Michael Niedermayer
a860adb49c tests/checkasm/vp9dsp: Use snprintf() for safetey
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-16 14:19:37 +02:00
Hendrik Leppkes
78af3ffaa9 Merge commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56'
* commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56':
  rtsp: warning when max_delay reached

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 14:11:24 +02:00
Hendrik Leppkes
85c85d453d Merge commit 'd555bd69e792e42d94bd909b30d9bfef01db4e25'
* commit 'd555bd69e792e42d94bd909b30d9bfef01db4e25':
  rtpdec: inform jitter buffer size

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 14:11:06 +02:00
Hendrik Leppkes
3d481f39a2 Merge commit 'ff7f6ea9db2a77d74f7e68a716f53ba1f3f85017'
* commit 'ff7f6ea9db2a77d74f7e68a716f53ba1f3f85017':
  rtpdec: add a trace when jitter buffer is full

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 14:10:27 +02:00
Hendrik Leppkes
7cecab2f88 Merge commit '3c525b8b4770c1ac5f466a12c5523802bd5d40eb'
* commit '3c525b8b4770c1ac5f466a12c5523802bd5d40eb':
  rtpdec: Increase the max size of the jitter buffer to 500 packets

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 14:07:05 +02:00
Hendrik Leppkes
b2a72e8ab9 Merge commit '570fcaf3326aef9313b10863e2f6e6ae664d9dae'
* commit '570fcaf3326aef9313b10863e2f6e6ae664d9dae':
  jpeg2000: Factor out prec init

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 14:04:46 +02:00
Carl Eugen Hoyos
f17ca46009 lavf/riff: Support decoding Ambisonic wav files.
Reported and tested by Andy Furniss, adf d lists at gmail
2015-09-16 14:03:13 +02:00
Hendrik Leppkes
2fc552b629 Merge commit '95a41311ac3a44773cc4dc407408aca35b1f8e26'
* commit '95a41311ac3a44773cc4dc407408aca35b1f8e26':
  jpeg2000: Factor out band stepsize initialization

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 14:01:58 +02:00
Hendrik Leppkes
054ce2d6ab Merge commit '7fb93eae43cc89bd7c1c275344e1cdbadab7155b'
* commit '7fb93eae43cc89bd7c1c275344e1cdbadab7155b':
  jpeg2000: Factor out band initialization

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 13:58:30 +02:00
Hendrik Leppkes
8f80f3d074 Merge commit '1b709f23fb5f505c834d4c855703225795def01d'
* commit '1b709f23fb5f505c834d4c855703225795def01d':
  jpeg2000: Refactor decode_packets

Not merged, as the ffmpeg code is much more advanced.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 13:57:50 +02:00
Henrik Gramner
6115966ad3 checkasm: v210: Fix array overwrite 2015-09-16 13:50:09 +02:00
Henrik Gramner
985e7d8cc1 checkasm: v210: s/Libav/FFmpeg/ 2015-09-16 13:48:43 +02:00
Hendrik Leppkes
64f72bb61f Merge commit '29b00f880faa404aa1d0d6820310c510c5996479'
* commit '29b00f880faa404aa1d0d6820310c510c5996479':
  jpeg2000: Templatize the frame writer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 12:08:39 +02:00
Paul B Mahol
dc1050a3e8 avfilter/af_ladspa: process all channels for nb_handles > 1
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-16 09:45:59 +00:00
Paul B Mahol
03f34e0d3c doc/filters: ladspa: add two more examples, this time using SWH plugins
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-16 09:45:59 +00:00
Timo Rothenpieler
dad38bff81 avcodec/vaapi_internal: Add missing include
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
2015-09-16 11:41:07 +02:00
Michael Niedermayer
fee2b97d56 avcodec/libxvid: add missing include
Fix build

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-16 11:38:20 +02:00
Hendrik Leppkes
5a754f92d1 Merge commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e'
* commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e':
  jpeg2000: Split codeblock decoding from the main tile decoding

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:31:40 +02:00
Hendrik Leppkes
5de28d341f Merge commit '6536da7371b4847a2824ed46b98829f127f24dad'
* commit '6536da7371b4847a2824ed46b98829f127f24dad':
  doc: Add travis badge

Not merged as ffmpeg does not have travis officially setup.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:31:11 +02:00
Hendrik Leppkes
52ce8b7b31 Merge commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b'
* commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b':
  mpegvideo: Drop mpegvideo.h where not needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:27:20 +02:00
Hendrik Leppkes
7b865c222e Merge commit '5d14cf199990cd378904a2618b5c72c4b02290f6'
* commit '5d14cf199990cd378904a2618b5c72c4b02290f6':
  mpegvideo: Make sure mpegutils.h is included where needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:23:40 +02:00
Hendrik Leppkes
b3ff8ef6ec Merge commit '525f58977c93e189fda49a5c4928feaf4d89fac6'
* commit '525f58977c93e189fda49a5c4928feaf4d89fac6':
  mpegvideo: Move macros to more appropriate headers

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:23:20 +02:00
Hendrik Leppkes
643a156002 Merge commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d'
* commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d':
  avfilter: Support both syntaxes for the scale filter

Not merged, ffmpeg has much more flexible option handling

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:20:42 +02:00
Hendrik Leppkes
c2972a2800 Merge commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b'
* commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b':
  lavr: Remove unreachable code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:19:36 +02:00
Hendrik Leppkes
1eb2c0de9e Merge commit 'dc54c78c4d56cdf5549f35ccff2fd66e7ffa0af2'
* commit 'dc54c78c4d56cdf5549f35ccff2fd66e7ffa0af2':
  buffersrc: Improve initialization log message

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:19:17 +02:00
Hendrik Leppkes
03d47f2ff1 Merge commit '2c6014c629346ebfeb25fc715581a8df9175f71f'
* commit '2c6014c629346ebfeb25fc715581a8df9175f71f':
  fate: Change global error option to private error_rate option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:18:28 +02:00
Hendrik Leppkes
25a7c2aed6 Merge commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e'
* commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e':
  fate: Move mv0 option from global to mpv private

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:14:37 +02:00
Hendrik Leppkes
a600e7145f Merge commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac'
* commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac':
  lavc: Keep idct integer option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:12:32 +02:00
Hendrik Leppkes
352eb4b599 Merge commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e'
* commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e':
  avconv_filter: Use full named options

Not merged, as ffmpeg option syntax is quite different.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:12:07 +02:00
Hendrik Leppkes
182550e42c Merge commit '10de408738d28ab17aa5c1fdccd809b0637c12d5'
* commit '10de408738d28ab17aa5c1fdccd809b0637c12d5':
  lavf: Update to the new crypto API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:06:55 +02:00
Eloi BAIL
1ec611a102 rtsp: warning when max_delay reached
packets are queued due to packet reordering until the queue reach its
maximal size or max delay is reached.
This commit adds a warning trace when max delay is reached.

Signed-off-by: Eloi BAIL <eloi.bail@savoirfairelinux.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-09-16 09:58:12 +03:00
Eloi BAIL
d555bd69e7 rtpdec: inform jitter buffer size
This commit print as AV_LOG_VERBOSE the jitter buffer
size. It might be the default value or the value set by application.

Signed-off-by: Eloi BAIL <eloi.bail@savoirfairelinux.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-09-16 09:55:51 +03:00