ffmpeg.git
5 years agoMerge commit 'a9f3f5fadb57bae3f3ff0be69e56b2c6014f2513'
Michael Niedermayer [Mon, 21 Jul 2014 11:02:33 +0000 (13:02 +0200)]
Merge commit 'a9f3f5fadb57bae3f3ff0be69e56b2c6014f2513'

* commit 'a9f3f5fadb57bae3f3ff0be69e56b2c6014f2513':
  Revert "tiff: support reading gray+alpha at 8 bits"

Not merged, the pix fmt its not unknown

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "tiff: support reading gray+alpha at 8 bits"
Janne Grunau [Mon, 21 Jul 2014 06:35:32 +0000 (08:35 +0200)]
Revert "tiff: support reading gray+alpha at 8 bits"

This reverts commit b31d76e45fc3c6529dd7109e721676f3ec376d00 as it
uses an unkown pixel format.

5 years agoavfilter/biquads: avoid clipping when using floating type
Muhammad Faiz [Thu, 17 Jul 2014 03:49:04 +0000 (10:49 +0700)]
avfilter/biquads: avoid clipping when using floating type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/sapenc: Use av_mallocz_array()
Michael Niedermayer [Mon, 21 Jul 2014 01:19:12 +0000 (03:19 +0200)]
avformat/sapenc: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_owdenoise: use av_malloc_array()
Michael Niedermayer [Mon, 21 Jul 2014 01:18:56 +0000 (03:18 +0200)]
avfilter/vf_owdenoise: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '819bb3e81c72939ae1c1a4e5fc3dfdf3e98df074'
Michael Niedermayer [Mon, 21 Jul 2014 00:22:17 +0000 (02:22 +0200)]
Merge commit '819bb3e81c72939ae1c1a4e5fc3dfdf3e98df074'

* commit '819bb3e81c72939ae1c1a4e5fc3dfdf3e98df074':
  fate: add h264-direct-bff test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c39059bea3adebcd888571d1181db215eee54495'
Michael Niedermayer [Mon, 21 Jul 2014 00:14:25 +0000 (02:14 +0200)]
Merge commit 'c39059bea3adebcd888571d1181db215eee54495'

* commit 'c39059bea3adebcd888571d1181db215eee54495':
  h264: Fix direct temporal mvs for bottom-field-first poc order

Conflicts:
libavcodec/h264_direct.c

See: ebd1c505d22ad96e044880755ed9f4cf7cab4f78
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b31d76e45fc3c6529dd7109e721676f3ec376d00'
Michael Niedermayer [Mon, 21 Jul 2014 00:01:22 +0000 (02:01 +0200)]
Merge commit 'b31d76e45fc3c6529dd7109e721676f3ec376d00'

* commit 'b31d76e45fc3c6529dd7109e721676f3ec376d00':
  tiff: support reading gray+alpha at 8 bits

See: f746f3790168bf898b629942868bda703e7f1045
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'
Michael Niedermayer [Sun, 20 Jul 2014 23:56:01 +0000 (01:56 +0200)]
Merge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'

* commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755':
  idct: Move arm-specific declarations to a header in the arm directory

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: add h264-direct-bff test
Vittorio Giovara [Fri, 18 Jul 2014 13:54:46 +0000 (09:54 -0400)]
fate: add h264-direct-bff test

5 years agoh264: Fix direct temporal mvs for bottom-field-first poc order
Ronald S. Bultje [Thu, 17 Jul 2014 23:49:54 +0000 (01:49 +0200)]
h264: Fix direct temporal mvs for bottom-field-first poc order

Such files can be created using the --bff x264 option.

Sample-Id: h264_direct_temporal_mvs_bff.mkv
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agotiff: support reading gray+alpha at 8 bits
Carl Eugen Hoyos [Sun, 20 Jul 2014 06:34:19 +0000 (02:34 -0400)]
tiff: support reading gray+alpha at 8 bits

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agodoc: fix two spelling errors
Andreas Cadhalpun [Sun, 20 Jul 2014 21:34:57 +0000 (23:34 +0200)]
doc: fix two spelling errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoidct: Move arm-specific declarations to a header in the arm directory
Diego Biurrun [Tue, 18 Feb 2014 12:46:32 +0000 (13:46 +0100)]
idct: Move arm-specific declarations to a header in the arm directory

5 years agodoc/issue_tracker: Correct sub-domain for mailing list
Michael Niedermayer [Sun, 20 Jul 2014 18:57:53 +0000 (20:57 +0200)]
doc/issue_tracker: Correct sub-domain for mailing list

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9f99a5f1d078721a30a76aec27c58805b7b87e58'
Michael Niedermayer [Sun, 20 Jul 2014 18:32:17 +0000 (20:32 +0200)]
Merge commit '9f99a5f1d078721a30a76aec27c58805b7b87e58'

* commit '9f99a5f1d078721a30a76aec27c58805b7b87e58':
  mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: Add db0 for the website
db0company [Sun, 20 Jul 2014 14:38:49 +0000 (16:38 +0200)]
MAINTAINERS: Add db0 for the website

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegencconetxt: Move rv10-specific orig_width/orig_height where they belong
Nidhi Makhijani [Sun, 20 Jul 2014 09:21:38 +0000 (14:51 +0530)]
mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agomatroskaenc: Don't set language to empty string, use "und"
Jan Gerber [Sun, 20 Jul 2014 08:36:51 +0000 (10:36 +0200)]
matroskaenc: Don't set language to empty string, use "und"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate/hevc: update fate rext tests
Mickaël Raulet [Fri, 18 Jul 2014 21:40:52 +0000 (23:40 +0200)]
fate/hevc: update fate rext tests

cherry picked from commit e6ee89e6fab60a3faa1f933b7774e819846f70c4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: fix offset for sao temporary frame
Mickaël Raulet [Sat, 19 Jul 2014 23:50:19 +0000 (01:50 +0200)]
hevc: fix offset for sao temporary frame

fixes fate on alpha

cherry picked from commit 0a8ce1cbdaff7cd026bcf95ee3787bc7b4c063ee

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: restore default.css
Clément Bœsch [Sun, 20 Jul 2014 00:01:34 +0000 (02:01 +0200)]
doc: restore default.css

This partially reverts 9ce64ba111221a37bdd78204b67330a6120f6c50.

FATE still needs it until its design is updated to the new website
version.

5 years agodoc: update the documentation generator to match the new website
db0 [Sun, 13 Jul 2014 20:48:23 +0000 (22:48 +0200)]
doc: update the documentation generator to match the new website

Signed-off-by: db0 <db0company@gmail.com>
Signed-off-by: Clément Bœsch <u@pkh.me>
5 years agoswscale/utils: fix rgb -> fullrange yuv
Michael Niedermayer [Sat, 19 Jul 2014 21:08:29 +0000 (23:08 +0200)]
swscale/utils: fix rgb -> fullrange yuv

Fixes part of Ticket3785

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/utils: remove unused define
Michael Niedermayer [Sat, 19 Jul 2014 20:45:43 +0000 (22:45 +0200)]
swscale/utils: remove unused define

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dvenc: Implement 32khz & 44.1khz for 25/50fps
Michael Niedermayer [Wed, 16 Jul 2014 22:54:34 +0000 (00:54 +0200)]
avformat/dvenc: Implement 32khz & 44.1khz for 25/50fps

30000/1001 fps isnt implemented as i dont know which are the correct interleaving parameters,
pointers to the appropriate spec and page are welcome

Fixes Ticket2597

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/seek: use av_malloc_array()
Michael Niedermayer [Sat, 19 Jul 2014 17:44:56 +0000 (19:44 +0200)]
avformat/seek: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/avfilter: use av_malloc(z)_array()
Michael Niedermayer [Sat, 19 Jul 2014 17:42:46 +0000 (19:42 +0200)]
avfilter/avfilter: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc_ps: Check abs_delta_rps
Michael Niedermayer [Sat, 19 Jul 2014 15:29:46 +0000 (17:29 +0200)]
avcodec/hevc_ps: Check abs_delta_rps

Fixes integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: check nb_cpb
Michael Niedermayer [Sat, 19 Jul 2014 14:43:13 +0000 (16:43 +0200)]
avcodec/hevc: check nb_cpb

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: use intreadwrite
Christophe Gisquet [Sat, 12 Jul 2014 14:51:09 +0000 (16:51 +0200)]
hevc: use intreadwrite

When dealing with MVs, both components may be processed at a time.

On Win64, 560 to 539 cycles for derive_spatial_merge_candidates.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavutil: document side effects of macros
Christophe Gisquet [Thu, 10 Jul 2014 18:49:06 +0000 (20:49 +0200)]
libavutil: document side effects of macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: report more precise progress
Christophe Gisquet [Sat, 19 Jul 2014 08:30:06 +0000 (10:30 +0200)]
hevc: report more precise progress

There's a lag of one CTB line for SAO behind deblocking filter, except for
last line. However, once SAO has been completed on a line, all its pixels,
i.e. up to y+ctb_size are filtered and ready to be used as reference.

Without SAO, when deblocking filter finishes a CTB line, only the bottom
bottom 4 pixels may be filtered when next CTB is process by the deblocing.

The await_progess for hevc then checks whether the bottom pixels of a PU
requires access beyond that point, so the reporting should effectively
report up to the the above limits.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9'
Michael Niedermayer [Sat, 19 Jul 2014 12:10:20 +0000 (14:10 +0200)]
Merge commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9'

* commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9':
  fdct: Move ppc-specific declarations to a header in the ppc directory

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0'
Michael Niedermayer [Sat, 19 Jul 2014 11:56:08 +0000 (13:56 +0200)]
Merge commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0'

* commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0':
  simple_idct: Move x86-specific declarations to a header in the x86 directory

Conflicts:
libavcodec/x86/simple_idct.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314'
Michael Niedermayer [Sat, 19 Jul 2014 11:45:30 +0000 (13:45 +0200)]
Merge commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314'

* commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314':
  fdct: Move x86-specific declarations to a header in the x86 directory

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'
Michael Niedermayer [Sat, 19 Jul 2014 11:39:12 +0000 (13:39 +0200)]
Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'

* commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e':
  oss_audio: Split muxer and demuxer

Conflicts:
libavdevice/Makefile
libavdevice/oss_audio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/x86/hscale_fast_bilinear_simd: add inline asm guards
Michael Niedermayer [Sat, 19 Jul 2014 11:12:52 +0000 (13:12 +0200)]
swscale/x86/hscale_fast_bilinear_simd: add inline asm guards

Should fix MSVC build

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofdct: Move ppc-specific declarations to a header in the ppc directory
Diego Biurrun [Tue, 18 Feb 2014 13:09:35 +0000 (14:09 +0100)]
fdct: Move ppc-specific declarations to a header in the ppc directory

5 years agosimple_idct: Move x86-specific declarations to a header in the x86 directory
Diego Biurrun [Tue, 18 Feb 2014 12:20:01 +0000 (13:20 +0100)]
simple_idct: Move x86-specific declarations to a header in the x86 directory

5 years agofdct: Move x86-specific declarations to a header in the x86 directory
Diego Biurrun [Tue, 18 Feb 2014 12:16:11 +0000 (13:16 +0100)]
fdct: Move x86-specific declarations to a header in the x86 directory

5 years agosws: move inline asm hscale to MMX_OBJS
Michael Niedermayer [Sat, 19 Jul 2014 03:47:48 +0000 (05:47 +0200)]
sws: move inline asm hscale to MMX_OBJS

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosws/x86: split mmxext fast bilinear scaler out
Michael Niedermayer [Sat, 19 Jul 2014 03:09:57 +0000 (05:09 +0200)]
sws/x86: split mmxext fast bilinear scaler out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosws: Move fast bilinear C code into seperate file
Michael Niedermayer [Sat, 19 Jul 2014 02:57:47 +0000 (04:57 +0200)]
sws: Move fast bilinear C code into seperate file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/swscale_internal: add needed version.h
Michael Niedermayer [Sat, 19 Jul 2014 03:17:09 +0000 (05:17 +0200)]
swscale/swscale_internal: add needed version.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e0a2e60c0a6cbcceef08e94af5081d2aa8e6a52f'
Michael Niedermayer [Sat, 19 Jul 2014 02:15:38 +0000 (04:15 +0200)]
Merge commit 'e0a2e60c0a6cbcceef08e94af5081d2aa8e6a52f'

* commit 'e0a2e60c0a6cbcceef08e94af5081d2aa8e6a52f':
  dct-test: Reuse enum idct_permutation_type instead of duplicating it

Conflicts:
libavcodec/dct-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agooss_audio: use a macro to simplify ioctl() error checking
Timothy Gu [Fri, 18 Jul 2014 21:56:16 +0000 (14:56 -0700)]
oss_audio: use a macro to simplify ioctl() error checking

Also add a note about SNDCTL_DSP_GETFMTS which may fail even if OSS is
available.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: fix transquant_bypass
Mickaël Raulet [Fri, 18 Jul 2014 22:04:38 +0000 (00:04 +0200)]
hevc: fix transquant_bypass

cherry picked from commit 4a16cb2c70728a55d2fd723aff01b13ea259c4df
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agooss_audio: Split muxer and demuxer
Nidhi Makhijani [Fri, 18 Jul 2014 10:43:15 +0000 (16:13 +0530)]
oss_audio: Split muxer and demuxer

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agohevc/rext: put a warning log message instead of an error log message
Mickaël Raulet [Fri, 18 Jul 2014 21:39:50 +0000 (23:39 +0200)]
hevc/rext: put a warning log message instead of an error log message

cherry picked from commit 243cb99cff727d6a14c32cdff2748f6c255dbaf4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoParse dri when receiving jpg via rtp.
Carl Eugen Hoyos [Fri, 18 Jul 2014 18:31:24 +0000 (20:31 +0200)]
Parse dri when receiving jpg via rtp.

Based on a patch by contact at iridiummobile ru.
Fixes ticket #3780.

5 years agoWrite valid free atom when -moov_size is specified.
Carl Eugen Hoyos [Fri, 18 Jul 2014 18:30:14 +0000 (20:30 +0200)]
Write valid free atom when -moov_size is specified.

Fixes ticket #3769.

5 years agoavcodec/hevc: fix pict_type
Michael Niedermayer [Fri, 18 Jul 2014 20:59:03 +0000 (22:59 +0200)]
avcodec/hevc: fix pict_type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc/sao: optimze sao implementation
Mickaël Raulet [Wed, 16 Jul 2014 21:15:32 +0000 (23:15 +0200)]
hevc/sao: optimze sao implementation

- adding one extra pixel all around the frame
- do not copy when SAO is not applied

5% improvement

cherry picked from commit 10fc29fc19a12c4d8168fbe1a954b76386db12d0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '913fa85a2c1fcd71802f7decdef5f355e0d9c757'
Michael Niedermayer [Fri, 18 Jul 2014 20:40:00 +0000 (22:40 +0200)]
Merge commit '913fa85a2c1fcd71802f7decdef5f355e0d9c757'

* commit '913fa85a2c1fcd71802f7decdef5f355e0d9c757':
  dct-test: Skip indirection for MMX IDCT permutation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9e0b29911f1f167381a7dbdfca68bf417b8c767b'
Michael Niedermayer [Fri, 18 Jul 2014 20:33:14 +0000 (22:33 +0200)]
Merge commit '9e0b29911f1f167381a7dbdfca68bf417b8c767b'

* commit '9e0b29911f1f167381a7dbdfca68bf417b8c767b':
  x86: dnxhdenc: Eliminate some unnecessary ifdefs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'
Michael Niedermayer [Fri, 18 Jul 2014 20:27:16 +0000 (22:27 +0200)]
Merge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'

* commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5':
  libgsm: Split decoder and encoder

Conflicts:
libavcodec/libgsmenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'
Michael Niedermayer [Fri, 18 Jul 2014 20:16:04 +0000 (22:16 +0200)]
Merge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'

* commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273':
  idctdsp: prettyprinting cosmetics

Conflicts:
libavcodec/idctdsp.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/idctdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodct-test: Reuse enum idct_permutation_type instead of duplicating it
Diego Biurrun [Tue, 18 Feb 2014 11:11:41 +0000 (12:11 +0100)]
dct-test: Reuse enum idct_permutation_type instead of duplicating it

5 years agoMerge commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae'
Michael Niedermayer [Fri, 18 Jul 2014 19:55:55 +0000 (21:55 +0200)]
Merge commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae'

* commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae':
  idct: Convert IDCT permutation #defines to an enum

Conflicts:
libavcodec/idctdsp.c
libavcodec/x86/cavsdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'
Michael Niedermayer [Fri, 18 Jul 2014 19:48:31 +0000 (21:48 +0200)]
Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'

* commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46':
  avdevice: Give names to anonymously typedeffed structs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '24af1aa0f70362a66cda04c9d7cd012e019f5572'
Michael Niedermayer [Fri, 18 Jul 2014 19:43:14 +0000 (21:43 +0200)]
Merge commit '24af1aa0f70362a66cda04c9d7cd012e019f5572'

* commit '24af1aa0f70362a66cda04c9d7cd012e019f5572':
  fft: Convert FFT/MDCT permutation type #defines to enums

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '746ad4e0df7faf93329804e412ec53c1d929a75b'
Michael Niedermayer [Fri, 18 Jul 2014 19:36:46 +0000 (21:36 +0200)]
Merge commit '746ad4e0df7faf93329804e412ec53c1d929a75b'

* commit '746ad4e0df7faf93329804e412ec53c1d929a75b':
  dct-test: Improve CPU flags struct member name

Conflicts:
libavcodec/dct-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cb44b21da1f59923be577f08c267ec270529be97'
Michael Niedermayer [Fri, 18 Jul 2014 19:29:38 +0000 (21:29 +0200)]
Merge commit 'cb44b21da1f59923be577f08c267ec270529be97'

* commit 'cb44b21da1f59923be577f08c267ec270529be97':
  dct-test: Move cpu_flags variable out of global scope

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: Add test for wav Peak Envelope Chunk encoder (levl chunk).
Peter B [Thu, 17 Jul 2014 16:51:38 +0000 (18:51 +0200)]
fate: Add test for wav Peak Envelope Chunk encoder (levl chunk).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix make checkheaders for libavcodec/proresdsp.h.
Carl Eugen Hoyos [Fri, 18 Jul 2014 17:05:07 +0000 (19:05 +0200)]
Fix make checkheaders for libavcodec/proresdsp.h.

5 years agodct-test: Skip indirection for MMX IDCT permutation
Diego Biurrun [Tue, 18 Feb 2014 11:02:34 +0000 (12:02 +0100)]
dct-test: Skip indirection for MMX IDCT permutation

5 years agox86: dnxhdenc: Eliminate some unnecessary ifdefs
Diego Biurrun [Sun, 13 Jul 2014 11:03:35 +0000 (04:03 -0700)]
x86: dnxhdenc: Eliminate some unnecessary ifdefs

5 years agolibgsm: Split decoder and encoder
Nidhi Makhijani [Tue, 8 Jul 2014 03:33:35 +0000 (09:03 +0530)]
libgsm: Split decoder and encoder

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoidctdsp: prettyprinting cosmetics
Diego Biurrun [Fri, 18 Jul 2014 14:37:35 +0000 (07:37 -0700)]
idctdsp: prettyprinting cosmetics

5 years agoidct: Convert IDCT permutation #defines to an enum
Diego Biurrun [Tue, 18 Feb 2014 10:30:55 +0000 (11:30 +0100)]
idct: Convert IDCT permutation #defines to an enum

Also rename the enum values to be consistent with other DCT permutations.

5 years agoavdevice: Give names to anonymously typedeffed structs
Diego Biurrun [Thu, 17 Jul 2014 15:51:27 +0000 (08:51 -0700)]
avdevice: Give names to anonymously typedeffed structs

Anonymous structs can cause trouble in header files, so try to
avoid them altogether as a matter of good style.

5 years agofft: Convert FFT/MDCT permutation type #defines to enums
Diego Biurrun [Tue, 18 Feb 2014 10:52:42 +0000 (11:52 +0100)]
fft: Convert FFT/MDCT permutation type #defines to enums

5 years agodct-test: Improve CPU flags struct member name
Diego Biurrun [Tue, 18 Feb 2014 10:58:57 +0000 (11:58 +0100)]
dct-test: Improve CPU flags struct member name

5 years agodct-test: Move cpu_flags variable out of global scope
Diego Biurrun [Tue, 18 Feb 2014 10:57:48 +0000 (11:57 +0100)]
dct-test: Move cpu_flags variable out of global scope

5 years agolavfi/drawtext: add alias "expr_int_format" to expansion function "eif"
Andrey Utkin [Thu, 17 Jul 2014 22:00:40 +0000 (01:00 +0300)]
lavfi/drawtext: add alias "expr_int_format" to expansion function "eif"

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosmacker: remove dead code
Timothy Gu [Fri, 18 Jul 2014 02:25:42 +0000 (19:25 -0700)]
smacker: remove dead code

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7e18a727d2c2a19f22fcf68875d1b05fd2eafcef'
Michael Niedermayer [Fri, 18 Jul 2014 11:17:26 +0000 (13:17 +0200)]
Merge commit '7e18a727d2c2a19f22fcf68875d1b05fd2eafcef'

* commit '7e18a727d2c2a19f22fcf68875d1b05fd2eafcef':
  arm: cosmetics: Consistently use lowercase for shift operators

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf'
Michael Niedermayer [Fri, 18 Jul 2014 10:43:59 +0000 (12:43 +0200)]
Merge commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf'

* commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf':
  arm: cosmetics: Fix a misaligned asm operand

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoarm: cosmetics: Consistently use lowercase for shift operators
Martin Storsjö [Thu, 17 Jul 2014 22:39:49 +0000 (01:39 +0300)]
arm: cosmetics: Consistently use lowercase for shift operators

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: cosmetics: Fix a misaligned asm operand
Martin Storsjö [Sat, 12 Jul 2014 19:41:51 +0000 (22:41 +0300)]
arm: cosmetics: Fix a misaligned asm operand

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoalpha/me_cmp: move code out of dsputil
James Almer [Fri, 18 Jul 2014 02:45:35 +0000 (23:45 -0300)]
alpha/me_cmp: move code out of dsputil

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoalpha/idctdsp: move disabled cruft out of dsputil
James Almer [Fri, 18 Jul 2014 02:45:34 +0000 (23:45 -0300)]
alpha/idctdsp: move disabled cruft out of dsputil

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/a64multienc use av_freep()
Michael Niedermayer [Fri, 18 Jul 2014 02:57:00 +0000 (04:57 +0200)]
avcodec/a64multienc use av_freep()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoa64multienc: remove dead assignment
Timothy Gu [Fri, 18 Jul 2014 02:25:43 +0000 (19:25 -0700)]
a64multienc: remove dead assignment

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agokerndeint: remove dead assignments
Timothy Gu [Fri, 18 Jul 2014 02:25:41 +0000 (19:25 -0700)]
kerndeint: remove dead assignments

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5a272190a04666f0fe41be767396b30712638c21'
Michael Niedermayer [Fri, 18 Jul 2014 01:44:06 +0000 (03:44 +0200)]
Merge commit '5a272190a04666f0fe41be767396b30712638c21'

* commit '5a272190a04666f0fe41be767396b30712638c21':
  armv6: Accelerate butterflies_float

See: 57641410d1a386937bec3fddd6c75119550916ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5edad2c4a1f46bcc56be755af86ab355c2f1b37f'
Michael Niedermayer [Fri, 18 Jul 2014 01:14:02 +0000 (03:14 +0200)]
Merge commit '5edad2c4a1f46bcc56be755af86ab355c2f1b37f'

* commit '5edad2c4a1f46bcc56be755af86ab355c2f1b37f':
  armv6: Accelerate vector_fmul_window

See: 649c666137f43542b45941f42034ab3f44a31d38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '87552d54d3337c3241e8a9e1a05df16eaa821496'
Michael Niedermayer [Fri, 18 Jul 2014 00:42:55 +0000 (02:42 +0200)]
Merge commit '87552d54d3337c3241e8a9e1a05df16eaa821496'

* commit '87552d54d3337c3241e8a9e1a05df16eaa821496':
  armv6: Accelerate ff_fft_calc for general case (nbits != 4)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5c22e8e4ad0852d61d5c4ba8d67d33fd72339497'
Michael Niedermayer [Fri, 18 Jul 2014 00:33:00 +0000 (02:33 +0200)]
Merge commit '5c22e8e4ad0852d61d5c4ba8d67d33fd72339497'

* commit '5c22e8e4ad0852d61d5c4ba8d67d33fd72339497':
  armv6: Accelerate ff_imdct_half for general case (mdct_bits != 6)

See: 42c1cc35b7623ce76c7b55c6bc100f135e17cd4f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvenc: clear all dsp contexts
Michael Niedermayer [Thu, 17 Jul 2014 22:48:34 +0000 (00:48 +0200)]
avcodec/dvenc: clear all dsp contexts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoarmv6: Accelerate butterflies_float
Ben Avison [Thu, 10 Jul 2014 23:12:34 +0000 (00:12 +0100)]
armv6: Accelerate butterflies_float

I benchmarked the result by measuring the number of gperftools samples that
hit anywhere in the AAC decoder (starting from aac_decode_frame()) or
specifically in butterflies_float_c() / ff_butterflies_float_vfp() for the
same sample AAC stream:

                   Before          After
                   Mean   StdDev   Mean   StdDev  Confidence  Change
Audio decode       1542.8 43.7     1470.5 41.5    100.0%      +4.9%
butterflies_float  130.0  11.9     70.2   12.1    100.0%      +85.2%

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarmv6: Accelerate vector_fmul_window
Ben Avison [Thu, 10 Jul 2014 23:12:33 +0000 (00:12 +0100)]
armv6: Accelerate vector_fmul_window

I benchmarked the result by measuring the number of gperftools samples that
hit anywhere in the AAC decoder (starting from aac_decode_frame()) or
specifically in vector_fmul_window_c() / ff_vector_fmul_window_vfp() for the
same sample AAC stream:

                    Before          After
                    Mean   StdDev   Mean   StdDev  Confidence  Change
Audio decode        1598.2 47.4     1529.2 25.4    100.0%      +4.5%
vector_fmul_window  244.0  22.1     188.9  22.3    100.0%      +29.2%

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarmv6: Accelerate ff_fft_calc for general case (nbits != 4)
Ben Avison [Wed, 16 Jul 2014 15:02:01 +0000 (16:02 +0100)]
armv6: Accelerate ff_fft_calc for general case (nbits != 4)

The previous implementation targeted DTS Coherent Acoustics, which only
requires nbits == 4 (fft16()). This case was (and still is) linked directly
rather than being indirected through ff_fft_calc_vfp(), but now the full
range from radix-4 up to radix-65536 is available. This benefits other codecs
such as AAC and AC3.

The implementaion is based upon the C version, with each routine larger than
radix-16 calling a hierarchy of smaller FFT functions, then performing a
post-processing pass. This pass benefits a lot from loop unrolling to
counter the long pipelines in the VFP. A relaxed calling standard also
reduces the overhead of the call hierarchy, and avoiding the excessive
inlining performed by GCC probably helps with I-cache utilisation too.

I benchmarked the result by measuring the number of gperftools samples that
hit anywhere in the AAC decoder (starting from aac_decode_frame()) or
specifically in the FFT routines (fft4() to fft512() and pass()) for the
same sample AAC stream:

              Before          After
              Mean   StdDev   Mean   StdDev  Confidence  Change
Audio decode  2245.5 53.1     1599.6 43.8    100.0%      +40.4%
FFT routines  940.6  22.0     348.1  20.8    100.0%      +170.2%

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarmv6: Accelerate ff_imdct_half for general case (mdct_bits != 6)
Ben Avison [Thu, 10 Jul 2014 23:12:31 +0000 (00:12 +0100)]
armv6: Accelerate ff_imdct_half for general case (mdct_bits != 6)

The previous implementation targeted DTS Coherent Acoustics, which only
requires mdct_bits == 6. This relatively small size lent itself to
unrolling the loops a small number of times, and encoding offsets
calculated at assembly time within the load/store instructions of each
iteration.

In the more general case (codecs such as AAC and AC3) much larger arrays
are used - mdct_bits == [8, 9, 11]. The old method does not scale for
these cases, so more integer registers are used with non-unrolled versions
of the loops (and with some stack spillage). The postrotation filter loop
is still unrolled by a factor of 2 to permit the double-buffering of some
VFP registers to facilitate overlap of neighbouring iterations.

I benchmarked the result by measuring the number of gperftools samples
that hit anywhere in the AAC decoder (starting from aac_decode_frame())
or specifically in ff_imdct_half_c / ff_imdct_half_vfp, for the same
example AAC stream:

                  Before          After
                  Mean   StdDev   Mean   StdDev  Confidence  Change
aac_decode_frame  2368.1 35.8     2117.2 35.3    100.0%      +11.8%
ff_imdct_half_*   457.5  22.4     251.2  16.2    100.0%      +82.1%

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/me_cmp: restore author attribution and copyrights
Michael Niedermayer [Thu, 17 Jul 2014 21:57:38 +0000 (23:57 +0200)]
avcodec/me_cmp: restore author attribution and copyrights

These where removed by libav in

See: git show -C 2d60444331fca1910510038dd3817bea885c2367
diff --git a/libavcodec/dsputil.c b/libavcodec/me_cmp.c
similarity index 98%
rename from libavcodec/dsputil.c
rename to libavcodec/me_cmp.c
index ba71a99..9fcc937 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/me_cmp.c
@@ -1,8 +1,4 @@
 /*
- * DSP utils
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2d60444331fca1910510038dd3817bea885c2367'
Michael Niedermayer [Thu, 17 Jul 2014 21:27:40 +0000 (23:27 +0200)]
Merge commit '2d60444331fca1910510038dd3817bea885c2367'

* commit '2d60444331fca1910510038dd3817bea885c2367':
  dsputil: Split motion estimation compare bits off into their own context

Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile
libavcodec/dvenc.c
libavcodec/error_resilience.c
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/me_cmp.c
libavcodec/me_cmp.h
libavcodec/motion_est.c
libavcodec/motion_est_template.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a578b0407dc983aecd72028e1127062689b67089'
Michael Niedermayer [Thu, 17 Jul 2014 20:19:47 +0000 (22:19 +0200)]
Merge commit 'a578b0407dc983aecd72028e1127062689b67089'

* commit 'a578b0407dc983aecd72028e1127062689b67089':
  configure: Assume runtime cpu detection on arm on --target-os=android as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93'
Michael Niedermayer [Thu, 17 Jul 2014 19:55:37 +0000 (21:55 +0200)]
Merge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93'

* commit 'c23ce454b3e33634a188d6facfd2b7182af5af93':
  x86: dsputil: Coalesce all init files

Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/motion_est.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/x11grab: reindent after last commit.
Nicolas George [Thu, 17 Jul 2014 16:28:58 +0000 (18:28 +0200)]
lavd/x11grab: reindent after last commit.