ffmpeg.git
4 years agoavfilter/avf_showcqt: avoid using fminf()
Michael Niedermayer [Fri, 6 Jun 2014 14:31:31 +0000 (16:31 +0200)]
avfilter/avf_showcqt: avoid using fminf()

The loop with fminf() changes from 18093856 to 17403218 dezicycles (gcc 4.6.3, sandybridge i7)

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/libm: Replace macro based fminf() by function
Michael Niedermayer [Fri, 6 Jun 2014 14:29:02 +0000 (16:29 +0200)]
avutil/libm: Replace macro based fminf() by function

This avoids issues when the FFMIN parameter evaluation has side effects

Reviewed-by: Clément Bœsch <u@pkh.me>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoadpcm: Write the proper predictor in trellis mode in IMA QT
Martin Storsjö [Fri, 6 Jun 2014 09:03:09 +0000 (12:03 +0300)]
adpcm: Write the proper predictor in trellis mode in IMA QT

The actual predictor value, set by the trellis code, never
was written back into the variable that was written into
the block header. This was accidentally removed in b304244b.

This significantly improves the audio quality of the trellis
case, which was plain broken since b304244b.

Encoding IMA QT with trellis still actually gives a slightly
worse quality than without trellis, since the trellis encoder
doesn't use the exact same way of rounding as in
adpcm_ima_qt_compress_sample and adpcm_ima_qt_expand_nibble.

Fixes part of Ticket3701

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: enable adpcm-ima_qt-trellis
Michael Niedermayer [Fri, 6 Jun 2014 13:25:51 +0000 (15:25 +0200)]
fate: enable adpcm-ima_qt-trellis

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoadpcm: Fix trellis encoding of IMA QT
Martin Storsjö [Thu, 5 Jun 2014 08:56:10 +0000 (11:56 +0300)]
adpcm: Fix trellis encoding of IMA QT

This was broken in 095be4fb - samples+ch (for the previous
non-planar case) equals &samples_p[ch][0]. The confusion
probably stemmed from the IMA WAV case where it originally
was &samples[avctx->channels + ch], which was correctly
changed into &samples_p[ch][1].

Fixes part of Ticket3701

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/libm: use FFMIN instead of fmin()
Michael Niedermayer [Fri, 6 Jun 2014 14:02:53 +0000 (16:02 +0200)]
avutil/libm: use FFMIN instead of fmin()

MSVC apparently doesnt support fmin() either

Suggested/Found-by: ubitux, Daemon404, nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: fix "warning: variable altitude set but not used" warning
Michael Niedermayer [Fri, 6 Jun 2014 13:05:11 +0000 (15:05 +0200)]
avformat/mov: fix "warning: variable altitude set but not used" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/libm: fix fminf typo
Michael Niedermayer [Fri, 6 Jun 2014 13:45:09 +0000 (15:45 +0200)]
avutil/libm: fix fminf typo

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobuild: add fminf() emulation
Michael Niedermayer [Fri, 6 Jun 2014 12:54:57 +0000 (14:54 +0200)]
build: add fminf() emulation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 6 Jun 2014 12:01:17 +0000 (14:01 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Allow >2G for skip_initial_bytes.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agowma lossless: reuse scalarproduct_and_madd_int16
Christophe Gisquet [Sat, 24 Nov 2012 14:55:49 +0000 (15:55 +0100)]
wma lossless: reuse scalarproduct_and_madd_int16

This is done by padding the coefficient buffer with 0s, because the order
may be only a multiple of 4, and the DSP function requires batches of 8.

However, no sample with such a case was found, so request one if it uses
that kind of order.

Approximate relative speedup depending on instruction set:
plain C: -6%
mmxext:  51%
sse2:    54%

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2f7065190ad48744014a02288799d03adfa613e0'
Michael Niedermayer [Fri, 6 Jun 2014 11:33:14 +0000 (13:33 +0200)]
Merge commit '2f7065190ad48744014a02288799d03adfa613e0'

* commit '2f7065190ad48744014a02288799d03adfa613e0':
  libfdk-aac: Relicense the library wrappers to the ISC license

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c'
Michael Niedermayer [Fri, 6 Jun 2014 11:24:30 +0000 (13:24 +0200)]
Merge commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c'

* commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c':
  mov: Export geotag metadata fields

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibfdk-aac: Relicense the library wrappers to the ISC license
Martin Storsjö [Fri, 6 Jun 2014 07:48:27 +0000 (10:48 +0300)]
libfdk-aac: Relicense the library wrappers to the ISC license

This reduces the number of different licenses used within libav,
and is preferrable since it has less ambiguous wordings than
the BSD license with respect to the duties of the user of the code.

Fraunhofer have now indicated that they're allowed to contribute
code under this license as well.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomov: Export geotag metadata fields
Martin Storsjö [Tue, 3 Jun 2014 11:48:19 +0000 (14:48 +0300)]
mov: Export geotag metadata fields

The '?xyz' form is used by android devices (and according to apple
mailing list archives, also by older iOS devices). The 'loci' field
(defined in 3GPP 26.244) is used by recent iOS devices.

Even though the loci field can contain an altitude, it was plain
0 in my sample. Just export longitude and latitude, in a string
format matching the one used by the '?xyz' metadata field.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoAllow >2G for skip_initial_bytes.
Carl Eugen Hoyos [Thu, 5 Jun 2014 22:05:31 +0000 (00:05 +0200)]
Allow >2G for skip_initial_bytes.

4 years agox86/dsputil: move some mmx init code inside dsputil_init_mmx()
James Almer [Fri, 6 Jun 2014 01:01:46 +0000 (22:01 -0300)]
x86/dsputil: move some mmx init code inside dsputil_init_mmx()

This reduces differences with the fork

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegdec: Improve intel jpeg flip heuristic
Michael Niedermayer [Thu, 5 Jun 2014 23:32:22 +0000 (01:32 +0200)]
avcodec/mjpegdec: Improve intel jpeg flip heuristic

Fixes Ticket3698

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/aic: fix quantization table permutation
Michael Niedermayer [Thu, 5 Jun 2014 21:21:15 +0000 (23:21 +0200)]
avcodec/aic: fix quantization table permutation

Fixes Ticket3700

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegaudiodec: Reset dither and mdct state
Michael Niedermayer [Thu, 5 Jun 2014 19:23:31 +0000 (21:23 +0200)]
avcodec/mpegaudiodec: Reset dither and mdct state

This makes the mp3 decoder produce the same result when repeatly flushing and decoding

Suggested-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoapedsp: move to llauddsp
Christophe Gisquet [Fri, 30 May 2014 14:28:49 +0000 (16:28 +0200)]
apedsp: move to llauddsp

APE is not the sole codec using scalarproduct_and_madd_int16.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd816e125fe1fa5c909b706d47904a4d6c1799996'
Michael Niedermayer [Thu, 5 Jun 2014 16:55:44 +0000 (18:55 +0200)]
Merge commit 'd816e125fe1fa5c909b706d47904a4d6c1799996'

* commit 'd816e125fe1fa5c909b706d47904a4d6c1799996':
  dict: const correctness for av_dict_get() and av_dict_copy()

Conflicts:
libavutil/dict.c
libavutil/dict.h

See: e12a73246d8ce7d0fc4036522688934e26de4bb1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: prevent pts < dts to be passed through to the muxer on stream copy
Michael Niedermayer [Thu, 5 Jun 2014 16:37:32 +0000 (18:37 +0200)]
ffmpeg: prevent pts < dts to be passed through to the muxer on stream copy

Fixes Ticket3658

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodict: const correctness for av_dict_get() and av_dict_copy()
Diego Biurrun [Wed, 4 Jun 2014 11:58:33 +0000 (04:58 -0700)]
dict: const correctness for av_dict_get() and av_dict_copy()

4 years agoavfilter: new multimedia filter avf_showcqt.c
Muhammad Faiz [Thu, 5 Jun 2014 04:42:38 +0000 (11:42 +0700)]
avfilter: new multimedia filter avf_showcqt.c

this filter is the same as showspectrum but with constant Q transform,
so frequency is spaced logarithmically

4 years agotests: add adpcm trellis tests
Timothy Gu [Thu, 5 Jun 2014 02:21:29 +0000 (19:21 -0700)]
tests: add adpcm trellis tests

adpcm_ima_qt does not produce reproducible results, so it is temporarily
disabled (see #3701).

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests: Add ac3_fixed decoder test
Timothy Gu [Thu, 5 Jun 2014 02:21:28 +0000 (19:21 -0700)]
tests: Add ac3_fixed decoder test

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/swr: move the results out of the functions
Timothy Gu [Thu, 5 Jun 2014 02:21:27 +0000 (19:21 -0700)]
tests/swr: move the results out of the functions

This prevents all results from being declared whenever the function is called.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/ppc/intreadwrite: try to fix intreadwrite for ppc64le
Michael Niedermayer [Thu, 5 Jun 2014 01:21:32 +0000 (03:21 +0200)]
avutil/ppc/intreadwrite: try to fix intreadwrite for ppc64le

Untested due to lack of hardware

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohuffyuvdec: remove superfluous check in BGR code
Christophe Gisquet [Wed, 4 Jun 2014 20:48:59 +0000 (20:48 +0000)]
huffyuvdec: remove superfluous check in BGR code

Before: 154861 decicycles
After:  152912 decicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohuffyuvdec: remove superfluous check
Christophe Gisquet [Wed, 4 Jun 2014 20:48:58 +0000 (20:48 +0000)]
huffyuvdec: remove superfluous check

An invalid entry already has the property of having a negative number
of bits, so remove the check on the reserved value, and rearrange the
code as a consequence.

346800 decicycles in 422, 262079 runs, 65 skips
168197 decicycles in gray, 262077 runs, 67 skips
Overall time: 7.878s

319076 decicycles in 422, 262096 runs, 48 skips
159875 decicycles in gray, 262057 runs, 87 skips
Overall time: 7.394s

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohuffyuvdec: trick for plane decoding, 8bits
Christophe Gisquet [Wed, 4 Jun 2014 20:48:57 +0000 (20:48 +0000)]
huffyuvdec: trick for plane decoding, 8bits

10496 -> 9105 cycles.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohuffyuvdec: clean up macro
Christophe Gisquet [Wed, 4 Jun 2014 20:48:56 +0000 (20:48 +0000)]
huffyuvdec: clean up macro

It's no longer used inside another specific macro, so rename it.
Also remove duplicated definition and realign code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dcadec: Check dca_dmixtable index
Michael Niedermayer [Wed, 4 Jun 2014 20:13:39 +0000 (22:13 +0200)]
avcodec/dcadec: Check dca_dmixtable index

Found-by: Niels Möller <nisse@lysator.liu.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dcadec: remove fishy FFMAX()
Michael Niedermayer [Wed, 4 Jun 2014 19:44:49 +0000 (21:44 +0200)]
avcodec/dcadec: remove fishy FFMAX()

These where intended to maintain the previous behavior before dca_dmix_code()
but it is unclear (to me) which way is correct and no sample seem to trigger
the case, also they are incomplete for the purprose of error checking

Found-by: Niels Möller <nisse@lysator.liu.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 4 Jun 2014 18:21:01 +0000 (20:21 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix rc_max_rate documentation.
  Fix some fate filter tests with --target-path.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix rc_max_rate documentation.
Carl Eugen Hoyos [Wed, 4 Jun 2014 18:13:55 +0000 (20:13 +0200)]
Fix rc_max_rate documentation.

The mpegvideo decoder sets rc_max_rate since 25b7aa98.

4 years agoFix some fate filter tests with --target-path.
Carl Eugen Hoyos [Wed, 4 Jun 2014 18:13:40 +0000 (20:13 +0200)]
Fix some fate filter tests with --target-path.

4 years agoMerge commit '39ec5e1cf8444f827c42effb76e5694e091bbff3'
Michael Niedermayer [Wed, 4 Jun 2014 18:07:59 +0000 (20:07 +0200)]
Merge commit '39ec5e1cf8444f827c42effb76e5694e091bbff3'

* commit '39ec5e1cf8444f827c42effb76e5694e091bbff3':
  avconv: Report the codec and the encoder separately

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/bufferqueue: Increase buffer queue size
Tobias Rapp [Tue, 3 Jun 2014 06:43:24 +0000 (08:43 +0200)]
avfilter/bufferqueue: Increase buffer queue size

Avoid buffer overruns when processing some MOV files with the amerge
filter. Files produced by Adobe Premiere Pro CC have up to one second of audio
not interleaved. With common settings (<= 48kHz) that makes up to 47 frames so
a queue length of 64 makes sense.

Fixes ticket #3510.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dvbsubdec: add some basic av_log debuging support
Michael Niedermayer [Wed, 4 Jun 2014 16:09:18 +0000 (18:09 +0200)]
avcodec/dvbsubdec: add some basic av_log debuging support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohuffyuvdec: implement trick for BGR
Christophe Gisquet [Tue, 3 Jun 2014 19:51:52 +0000 (19:51 +0000)]
huffyuvdec: implement trick for BGR

Before:
179436 decicycles in rgb, 32735 runs, 33 skips
Stripped object size: 23188

After:
154861 decicycles in rgb, 32738 runs, 30 skips
Stripped object size: 22736

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohuffyuvdec: implement trick
Christophe Gisquet [Tue, 3 Jun 2014 14:38:36 +0000 (16:38 +0200)]
huffyuvdec: implement trick

When the joint table does not contain a valid entry, the decoding restarts
from scratch. By implementing the trick of jumping to the 2nd level of the
individual table (and inlining the whole), a speed improvement of 5-10%
is possible.

On a 1000-frames YUV4:2:0 video, before:
362851 decicycles in 422, 262094 runs, 50 skips
182488 decicycles in gray, 262087 runs, 57 skips
Object size: 23584
Overall time: 8.377

After:
346800 decicycles in 422, 262079 runs, 65 skips
168197 decicycles in gray, 262077 runs, 67 skips
Object size: 23188
Overall time: 7.878

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavconv: Report the codec and the encoder separately
Luca Barbato [Sat, 31 May 2014 13:49:30 +0000 (15:49 +0200)]
avconv: Report the codec and the encoder separately

Bug-Id: 694

4 years agoMerge commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7'
Michael Niedermayer [Wed, 4 Jun 2014 10:54:15 +0000 (12:54 +0200)]
Merge commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7'

* commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7':
  oggenc: Support flushing the muxer

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412'
Michael Niedermayer [Wed, 4 Jun 2014 10:45:29 +0000 (12:45 +0200)]
Merge commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412'

* commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412':
  build: check if AS supports the '.func' directive

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agooggenc: Support flushing the muxer
Martin Storsjö [Thu, 29 May 2014 14:39:28 +0000 (17:39 +0300)]
oggenc: Support flushing the muxer

This allows the caller to write all buffered data to disk, allowing
the caller to know at what byte position in the file a certain
packet starts (any packet written after the flush will be located
after that byte position).

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavcodec/x86/dsputilenc_mmx: fix build without yasm
Michael Niedermayer [Wed, 4 Jun 2014 03:39:03 +0000 (05:39 +0200)]
avcodec/x86/dsputilenc_mmx: fix build without yasm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/avidec: allow rounding errors between scale/rate and timebase
Michael Niedermayer [Wed, 4 Jun 2014 03:04:13 +0000 (05:04 +0200)]
avformat/avidec: allow rounding errors between scale/rate and timebase

Fixes Ticket3670

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: in the absence of recovery points, be more tolerant on accepting plain...
Michael Niedermayer [Wed, 4 Jun 2014 02:25:14 +0000 (04:25 +0200)]
avcodec/h264: in the absence of recovery points, be more tolerant on accepting plain I frames

Fixes: Ticket3652
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/lagarithrac: lag_get_rac: use normal division
Michael Niedermayer [Mon, 26 May 2014 23:36:23 +0000 (01:36 +0200)]
avcodec/lagarithrac: lag_get_rac: use normal division

maybe 0.3% faster and simpler code

4 years agoavcodec/lagarithrac: increase LUT from 256 to 1024 bytes
Michael Niedermayer [Mon, 26 May 2014 23:33:59 +0000 (01:33 +0200)]
avcodec/lagarithrac: increase LUT from 256 to 1024 bytes

about 2 cycles (~1%) faster lag_get_rac()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/lagarithrac.h/lag_get_rac: drop apparently unneeded operations
Michael Niedermayer [Mon, 26 May 2014 23:33:12 +0000 (01:33 +0200)]
avcodec/lagarithrac.h/lag_get_rac: drop apparently unneeded operations

4 years agox86/motion_est: sad_{x, y}2_mmxext functions are bitexact
James Almer [Tue, 3 Jun 2014 21:45:38 +0000 (18:45 -0300)]
x86/motion_est: sad_{x, y}2_mmxext functions are bitexact

Only the xy2 functions aren't.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomotion-test: force C functions for the reference C context
James Almer [Tue, 3 Jun 2014 21:45:37 +0000 (18:45 -0300)]
motion-test: force C functions for the reference C context

It was instead using the highest available asm functions, which completely
kills the point of being a reference C context.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 3 Jun 2014 22:40:05 +0000 (00:40 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix fate-aac-ln-encode with --target-path (second try).

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix fate-aac-ln-encode with --target-path (second try).
Carl Eugen Hoyos [Tue, 3 Jun 2014 22:00:32 +0000 (00:00 +0200)]
Fix fate-aac-ln-encode with --target-path (second try).

4 years agox86: dsputilenc: convert hf_noise*_mmx to yasm
Timothy Gu [Fri, 30 May 2014 03:56:04 +0000 (20:56 -0700)]
x86: dsputilenc: convert hf_noise*_mmx to yasm

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Several bugfixes by: Christophe Gisquet <christophe.gisquet@gmail.com>
See: [FFmpeg-devel] [WIP] [PATCH 4/4] x86: dsputilenc: convert hf_noise*_mmx to yasm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libopenjpegenc: Add frame-threading capability
Dave Rice [Tue, 3 Jun 2014 18:47:17 +0000 (14:47 -0400)]
avcodec/libopenjpegenc: Add frame-threading capability

This gives a >50% speed up when encoding with libopenjpeg.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofix various typos
Lou Logan [Tue, 3 Jun 2014 02:46:04 +0000 (18:46 -0800)]
fix various typos

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: try to use the more fitting of the 2 encoder contexts
Michael Niedermayer [Tue, 3 Jun 2014 17:45:12 +0000 (19:45 +0200)]
ffmpeg: try to use the more fitting of the 2 encoder contexts

This fixes the interactively enabled encoder debug by pressing 'D'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/muxers: Document problems of omitting nut syncpoints as well as alternatives
Michael Niedermayer [Thu, 29 May 2014 01:59:25 +0000 (03:59 +0200)]
doc/muxers: Document problems of omitting nut syncpoints as well as alternatives

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '896a5bff64264f4d01ed98eacc97a67260c1e17e'
Michael Niedermayer [Tue, 3 Jun 2014 16:19:21 +0000 (18:19 +0200)]
Merge commit '896a5bff64264f4d01ed98eacc97a67260c1e17e'

* commit '896a5bff64264f4d01ed98eacc97a67260c1e17e':
  arm: check if AS supports .dn

Conflicts:
configure
libavcodec/arm/vc1dsp_init_neon.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '68a06b3a639ee21c78532ee4c50c3366bf890ff7'
Michael Niedermayer [Tue, 3 Jun 2014 16:08:46 +0000 (18:08 +0200)]
Merge commit '68a06b3a639ee21c78532ee4c50c3366bf890ff7'

* commit '68a06b3a639ee21c78532ee4c50c3366bf890ff7':
  aarch64: use '#' for whole line asm comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'
Michael Niedermayer [Tue, 3 Jun 2014 16:03:15 +0000 (18:03 +0200)]
Merge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'

* commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617':
  aarch64: remove optional :pg_hi21: for adrp instruction

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e'
Michael Niedermayer [Tue, 3 Jun 2014 15:30:24 +0000 (17:30 +0200)]
Merge commit 'fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e'

* commit 'fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e':
  aarch64: add darwin style PAGE/PAGEOFF relocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vp3: free tables before allocating new ones
Michael Niedermayer [Tue, 3 Jun 2014 15:09:17 +0000 (17:09 +0200)]
avcodec/vp3: free tables before allocating new ones

Fixes memleak on seeking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vp3: factorize out free_tables()
Michael Niedermayer [Tue, 3 Jun 2014 15:08:32 +0000 (17:08 +0200)]
avcodec/vp3: factorize out free_tables()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: use av_log_ask_for_sample() instead of duplicating avpriv_request_sample()
Michael Niedermayer [Tue, 3 Jun 2014 14:05:37 +0000 (16:05 +0200)]
ffmpeg: use av_log_ask_for_sample() instead of duplicating avpriv_request_sample()

4 years agoLoose mplayer in MPlayer/incoming/
Michael Niedermayer [Tue, 3 Jun 2014 14:03:44 +0000 (16:03 +0200)]
Loose mplayer in MPlayer/incoming/

Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoAdd direct link to ML in missing_feature_sample()
Michael Niedermayer [Tue, 3 Jun 2014 13:35:09 +0000 (15:35 +0200)]
Add direct link to ML in missing_feature_sample()

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: request sample if the decoder & demuxer has_b_frames mismatch
Michael Niedermayer [Tue, 3 Jun 2014 13:09:42 +0000 (15:09 +0200)]
ffmpeg: request sample if the decoder & demuxer has_b_frames mismatch

We cannot use avpriv_request_sample() as this is private to the libs
or rather it would be a bad usage example

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: remove "has_b_frames" backpassing
Michael Niedermayer [Tue, 3 Jun 2014 12:24:37 +0000 (14:24 +0200)]
ffmpeg: remove "has_b_frames" backpassing

It seems working without this now for the files i tested it with, if this causes
a regression, dont hesitate to put the line back or open a ticket or fix (if possible)
the parser

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/asfdec: Use a parser for mpeg4-asp to find has_b_frames
Michael Niedermayer [Tue, 3 Jun 2014 12:44:46 +0000 (14:44 +0200)]
avformat/asfdec: Use a parser for mpeg4-asp to find has_b_frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobuild: check if AS supports the '.func' directive
Janne Grunau [Fri, 30 May 2014 07:58:43 +0000 (09:58 +0200)]
build: check if AS supports the '.func' directive

Not supported by Clang's integrated assembler. Since it just adds
debug information it can safely omitted.

4 years agoarm: check if AS supports .dn
Janne Grunau [Thu, 29 May 2014 12:21:05 +0000 (14:21 +0200)]
arm: check if AS supports .dn

Move the GNU as check before the arch specific asm checks since the .dn
check requires gas compatible assembler.

Disable the VC-1 motion compensation NEON asm which is the only part
using that directive. The integrated assembler in the upcoming clang 3.5
does not support .dn/.qn without plans to change that. Too much effort
to implement it while it is rarely used.

http://llvm.org/bugs/show_bug.cgi?id=18199.

4 years agoaarch64: use '#' for whole line asm comments
Janne Grunau [Fri, 30 May 2014 14:57:44 +0000 (16:57 +0200)]
aarch64: use '#' for whole line asm comments

Both gnu as and clang treat lines starting with '#' as comments if they
aren't consumed by the C-style preprocessor.
Using '//' does not work with clang since comments are removed before
macro expansion.

4 years agoaarch64: remove optional :pg_hi21: for adrp instruction
Janne Grunau [Tue, 3 Jun 2014 09:24:15 +0000 (11:24 +0200)]
aarch64: remove optional :pg_hi21: for adrp instruction

Clang's integrated assembler does not support it.

4 years agoaarch64: add darwin style PAGE/PAGEOFF relocations
Janne Grunau [Sun, 1 Jun 2014 13:50:42 +0000 (15:50 +0200)]
aarch64: add darwin style PAGE/PAGEOFF relocations

4 years agoFix fate-opus and fate-aac-ln-encode with --target-path.
Carl Eugen Hoyos [Tue, 3 Jun 2014 08:28:38 +0000 (10:28 +0200)]
Fix fate-opus and fate-aac-ln-encode with --target-path.

4 years agoavcodec/utils/ff_init_buffer_info: Favor color information from AVFrame if available
Michael Niedermayer [Tue, 3 Jun 2014 02:50:07 +0000 (04:50 +0200)]
avcodec/utils/ff_init_buffer_info: Favor color information from AVFrame if available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoDo not limit blocksize when reading PCM from aiff.
Carl Eugen Hoyos [Mon, 2 Jun 2014 22:54:46 +0000 (00:54 +0200)]
Do not limit blocksize when reading PCM from aiff.

Fixes ticket #3695.

4 years agodoc/bsf: document noise bitstream filter
Lou Logan [Mon, 2 Jun 2014 23:17:24 +0000 (15:17 -0800)]
doc/bsf: document noise bitstream filter

Partially addresses ticket #3198.

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
4 years agoavformat/utils/avformat_find_stream_info: Move max_analyze_duration setup out of...
Michael Niedermayer [Mon, 2 Jun 2014 19:21:11 +0000 (21:21 +0200)]
avformat/utils/avformat_find_stream_info: Move max_analyze_duration setup out of the packet loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobfin: add README
Michael Niedermayer [Mon, 2 Jun 2014 18:18:44 +0000 (20:18 +0200)]
bfin: add README

Based on sh4/README
Suggested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73'
Michael Niedermayer [Mon, 2 Jun 2014 17:38:01 +0000 (19:38 +0200)]
Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73'

* commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73':
  Remove all Blackfin architecture optimizations

Conflicts:
libavcodec/bfin/dsputil.S
libavcodec/bfin/dsputil_init.c
libavcodec/bfin/fdct_bfin.S
libavcodec/bfin/hpel_pixels_no_rnd.S
libavcodec/bfin/hpeldsp_init.c
libavcodec/bfin/idct_bfin.S
libavcodec/bfin/mathops.h
libavcodec/bfin/pixels.S
libavcodec/bfin/pixels.h
libavcodec/bfin/vp3dsp.S
libavcodec/bfin/vp3dsp_init.c
libavutil/bfin/asm.h
libavutil/bfin/attributes.h
libswscale/bfin/internal_bfin.S
libswscale/bfin/swscale_bfin.c
libswscale/bfin/yuv2rgb_bfin.c
libswscale/swscale_internal.h
libswscale/version.h

If someone wants to maintain blackfin support in FFmpeg, please contact
ffmpeg-devel@ffmpeg.org

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b88cc5cca111132b42c2ee99662bfefe7652e3da'
Michael Niedermayer [Mon, 2 Jun 2014 17:28:54 +0000 (19:28 +0200)]
Merge commit 'b88cc5cca111132b42c2ee99662bfefe7652e3da'

* commit 'b88cc5cca111132b42c2ee99662bfefe7652e3da':
  bink: Rename BinkDSPContext member so as not to clash with BlockDSPContext

Conflicts:
libavcodec/bink.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/mathematics/av_add_stable: Avoid av_cmp_q() call
Michael Niedermayer [Mon, 2 Jun 2014 17:03:55 +0000 (19:03 +0200)]
avutil/mathematics/av_add_stable: Avoid av_cmp_q() call

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoav_add_stable: Add fast special case where step can be represented exactly
Michael Niedermayer [Mon, 2 Jun 2014 17:00:18 +0000 (19:00 +0200)]
av_add_stable: Add fast special case where step can be represented exactly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/mathematics/av_add_stable: check for the common case of inc=1
Michael Niedermayer [Mon, 2 Jun 2014 16:02:08 +0000 (18:02 +0200)]
avutil/mathematics/av_add_stable: check for the common case of inc=1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/mathematics/av_add_stable: avoid unneeded variable
Michael Niedermayer [Mon, 2 Jun 2014 16:00:34 +0000 (18:00 +0200)]
avutil/mathematics/av_add_stable: avoid unneeded variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRemove all Blackfin architecture optimizations
Diego Biurrun [Fri, 30 May 2014 10:44:12 +0000 (03:44 -0700)]
Remove all Blackfin architecture optimizations

Blackfin is a painful platform to work with, no test machines are available
and the range of multimedia applications is dubious. Thus it only represents
a maintenance burden.

4 years agoavformat/utils: Call ff_rfps_add_frame() only for video
Michael Niedermayer [Mon, 2 Jun 2014 15:09:53 +0000 (17:09 +0200)]
avformat/utils: Call ff_rfps_add_frame() only for video

This avoids some unneeded computations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswr: move compensation_distance handling to swri_resample caller.
Ronald S. Bultje [Tue, 27 May 2014 12:39:12 +0000 (08:39 -0400)]
swr: move compensation_distance handling to swri_resample caller.

I think there's an off-by-one in terms of the switchpoint where we
switch from dst_incr to ideal_dst_incr, I don't think that's a massive
issue, but just be aware of that. It's probably trivial to prevent but
I don't care.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
I could not reproduce any off by 1 error, results are bit exact (michael)

4 years agoavformat/mux: Dont leave stale side data pointers in ff_interleave_add_packet()
Michael Niedermayer [Mon, 2 Jun 2014 12:48:22 +0000 (14:48 +0200)]
avformat/mux: Dont leave stale side data pointers in ff_interleave_add_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mux: fix memleak of side data in flac fate tests
Michael Niedermayer [Mon, 2 Jun 2014 12:32:50 +0000 (14:32 +0200)]
avformat/mux: fix memleak of side data in flac fate tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: fate-hevc-conformance-INITQP_B_Sony_1 belongs to the 10bit kind
Michael Niedermayer [Mon, 2 Jun 2014 11:11:42 +0000 (13:11 +0200)]
fate: fate-hevc-conformance-INITQP_B_Sony_1 belongs to the 10bit kind

Fixes the test on big endian

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobink: Rename BinkDSPContext member so as not to clash with BlockDSPContext
Diego Biurrun [Thu, 13 Feb 2014 15:32:41 +0000 (16:32 +0100)]
bink: Rename BinkDSPContext member so as not to clash with BlockDSPContext

4 years agoReport "unknown codec" instead of "unspecifed size" if the codec is unknown.
Carl Eugen Hoyos [Sun, 1 Jun 2014 17:40:56 +0000 (19:40 +0200)]
Report "unknown codec" instead of "unspecifed size" if the codec is unknown.

4 years agotests: Replace fieldmatch test with pixfmt
Timothy Gu [Sun, 1 Jun 2014 04:02:38 +0000 (21:02 -0700)]
tests: Replace fieldmatch test with pixfmt

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>