ffmpeg.git
6 years agox86/hevc_deblock: remove some unnecessary instructions
James Almer [Tue, 29 Jul 2014 07:30:11 +0000 (04:30 -0300)]
x86/hevc_deblock: remove some unnecessary instructions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc_filter: run vertical and horizontal together
Christophe Gisquet [Sat, 26 Jul 2014 19:40:53 +0000 (21:40 +0200)]
hevc_filter: run vertical and horizontal together

This should help cache locality. On win64:
Before: 1397x cycles, 16216 bytes
After:  1369x cycles, 16040 bytes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc_deblock: use psignw instead of pmullw where possible
James Almer [Tue, 29 Jul 2014 00:11:49 +0000 (21:11 -0300)]
x86/hevc_deblock: use psignw instead of pmullw where possible

It's slightly faster

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc'
Michael Niedermayer [Mon, 28 Jul 2014 23:32:48 +0000 (01:32 +0200)]
Merge commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc'

* commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc':
  caf: Use correct printf conversion specifiers for POSIX int types

Conflicts:
libavformat/cafdec.c

See: 1f36ebf63a8d6ffccf4bf286849d77f76aad8b8f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '019a28cd630286ecb2b06ee62025a17c821b493e'
Michael Niedermayer [Mon, 28 Jul 2014 23:22:05 +0000 (01:22 +0200)]
Merge commit '019a28cd630286ecb2b06ee62025a17c821b493e'

* commit '019a28cd630286ecb2b06ee62025a17c821b493e':
  sanm: Use correct printf conversion specifiers for POSIX int types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '59ca29a560ba0cfe97457de8cedf77db434f0de4'
Michael Niedermayer [Mon, 28 Jul 2014 22:40:00 +0000 (00:40 +0200)]
Merge commit '59ca29a560ba0cfe97457de8cedf77db434f0de4'

* commit '59ca29a560ba0cfe97457de8cedf77db434f0de4':
  dump: Use correct printf conversion specifiers for POSIX int types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d'
Michael Niedermayer [Mon, 28 Jul 2014 22:34:53 +0000 (00:34 +0200)]
Merge commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d'

* commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d':
  x86: build: Restore ordering of OBJS lines

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0'
Michael Niedermayer [Mon, 28 Jul 2014 22:27:45 +0000 (00:27 +0200)]
Merge commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0'

* commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0':
  configure: Use require_pkg_config for Speex

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8'
Michael Niedermayer [Mon, 28 Jul 2014 22:17:58 +0000 (00:17 +0200)]
Merge commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8'

* commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8':
  mxf: Extract origin information from material and source track

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c9d982aa11a6267611c3770792f0e04b48438348'
Michael Niedermayer [Mon, 28 Jul 2014 22:11:46 +0000 (00:11 +0200)]
Merge commit 'c9d982aa11a6267611c3770792f0e04b48438348'

* commit 'c9d982aa11a6267611c3770792f0e04b48438348':
  mxf: Detect Vanc/Vbi SMPTE-436M mxf track

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc'
Michael Niedermayer [Mon, 28 Jul 2014 22:01:25 +0000 (00:01 +0200)]
Merge commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc'

* commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc':
  video4linux2: Avoid a floating point exception

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix standalone compilation of the adts muxer.
Carl Eugen Hoyos [Mon, 28 Jul 2014 21:25:54 +0000 (23:25 +0200)]
Fix standalone compilation of the adts muxer.

6 years agocaf: Use correct printf conversion specifiers for POSIX int types
Diego Biurrun [Mon, 28 Jul 2014 16:21:57 +0000 (09:21 -0700)]
caf: Use correct printf conversion specifiers for POSIX int types

6 years agosanm: Use correct printf conversion specifiers for POSIX int types
Diego Biurrun [Sat, 26 Jul 2014 12:12:48 +0000 (05:12 -0700)]
sanm: Use correct printf conversion specifiers for POSIX int types

6 years agodump: Use correct printf conversion specifiers for POSIX int types
Diego Biurrun [Sat, 26 Jul 2014 12:11:18 +0000 (05:11 -0700)]
dump: Use correct printf conversion specifiers for POSIX int types

6 years agox86: build: Restore ordering of OBJS lines
Diego Biurrun [Sat, 26 Jul 2014 22:04:44 +0000 (15:04 -0700)]
x86: build: Restore ordering of OBJS lines

6 years agoconfigure: Use require_pkg_config for Speex
Luca Barbato [Thu, 24 Jul 2014 21:50:38 +0000 (23:50 +0200)]
configure: Use require_pkg_config for Speex

Distributors and integrators nowadays have less problems by leveraging
pkg-config files than having to set custom CFLAGS and LDFLAGS.

6 years agomxf: Extract origin information from material and source track
Marc-Antoine Arnaud [Tue, 22 Jul 2014 16:08:04 +0000 (18:08 +0200)]
mxf: Extract origin information from material and source track

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agomxf: Detect Vanc/Vbi SMPTE-436M mxf track
Marc-Antoine Arnaud [Tue, 22 Jul 2014 14:08:52 +0000 (16:08 +0200)]
mxf: Detect Vanc/Vbi SMPTE-436M mxf track

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agovideo4linux2: Avoid a floating point exception
Bernhard Übelacker [Sun, 27 Jul 2014 15:38:59 +0000 (08:38 -0700)]
video4linux2: Avoid a floating point exception

This avoids a segfault in avconv_opt.c:opt_target when trying to
determine the norm.

6 years agox86/hevc_deblock: load less data in hevc_h_loop_filter_luma_8
James Almer [Mon, 28 Jul 2014 19:17:35 +0000 (16:17 -0300)]
x86/hevc_deblock: load less data in hevc_h_loop_filter_luma_8

Reading 8 bytes is enough.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc_idct: add a colon to labels
James Almer [Mon, 28 Jul 2014 19:17:34 +0000 (16:17 -0300)]
x86/hevc_idct: add a colon to labels

This fixes a warning spam when using NASM

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavdevice/pulse_audio_enc: use getter function for AVFrame.channels
Michael Niedermayer [Mon, 28 Jul 2014 18:06:11 +0000 (20:06 +0200)]
avdevice/pulse_audio_enc: use getter function for AVFrame.channels

This is required by the API/ABI for things outside libavutil

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/fate.sh: If cat *.rep fails try it with a for loop.
Michael Niedermayer [Mon, 28 Jul 2014 16:27:17 +0000 (18:27 +0200)]
tests/fate.sh: If cat *.rep fails try it with a for loop.

Fixes fate on haiku, where cat dies due to too many arguments
xargs could be used too but we do not use xargs currently so it
would be an additional dependency.

Also the plain cat is left in place as it is faster than the loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoversion.sh: Print versions based on the last git tag for release branches
Michael Niedermayer [Mon, 28 Jul 2014 00:40:35 +0000 (02:40 +0200)]
version.sh: Print versions based on the last git tag for release branches

release branches are detected by checking if "git" is not in RELEASE
This changes "N-64706-g2f71aeb" to "n2.3-8-g2f71aeb"
for git master theres no change

This should improve the readability of lists of versions which come from
more than 1 release branch or master + release. fate.ffmpeg.org is
one possible example

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ee606fd0317df202b59946cf9b738c0a01056316)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: fix "discards const qualifier from pointer target type" warning
Michael Niedermayer [Mon, 28 Jul 2014 12:34:47 +0000 (14:34 +0200)]
avcodec/hevc: fix "discards const qualifier from pointer target type" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: add some const to cbf arrays
Michael Niedermayer [Mon, 28 Jul 2014 12:28:56 +0000 (14:28 +0200)]
avcodec/hevc: add some const to cbf arrays

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: clean up non relevant TODO
Mickaël Raulet [Sun, 27 Jul 2014 22:48:06 +0000 (00:48 +0200)]
hevc: clean up non relevant TODO

cherry picked from commit a2ef95f043d89d05482af19460c9e9afdadec685

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: rename variable in boundary strength to b more explicit
Anton Khirnov [Sun, 27 Jul 2014 23:06:32 +0000 (01:06 +0200)]
hevc: rename variable in boundary strength to b more explicit

Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
cherry picked from commit 348bebedc0012aae201419669fca1eb61ec93ca6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e76f2d11970484266e67a12961f2339a5c2fccf9'
Michael Niedermayer [Mon, 28 Jul 2014 12:02:03 +0000 (14:02 +0200)]
Merge commit 'e76f2d11970484266e67a12961f2339a5c2fccf9'

* commit 'e76f2d11970484266e67a12961f2339a5c2fccf9':
  hevc: eliminate the last element from TransformTree

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4aa80808bcc2a30fcd7ce5b38594319df3a85b36'
Michael Niedermayer [Mon, 28 Jul 2014 11:35:51 +0000 (13:35 +0200)]
Merge commit '4aa80808bcc2a30fcd7ce5b38594319df3a85b36'

* commit '4aa80808bcc2a30fcd7ce5b38594319df3a85b36':
  hevc: eliminate unnecessary cbf_c{b,r} arrays

Conflicts:
libavcodec/hevc.c

See: 77ef9fd1e938010600620c1d32cabd15e7d5b853
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0daa2554636ba1d31f3162ffb86991e84eb938a8'
Michael Niedermayer [Mon, 28 Jul 2014 11:09:00 +0000 (13:09 +0200)]
Merge commit '0daa2554636ba1d31f3162ffb86991e84eb938a8'

* commit '0daa2554636ba1d31f3162ffb86991e84eb938a8':
  hevc: do not store the transform inter_split flag in the context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '53a11135f2fb2123408b295f9aaae3d6f861aea5'
Michael Niedermayer [Mon, 28 Jul 2014 11:03:59 +0000 (13:03 +0200)]
Merge commit '53a11135f2fb2123408b295f9aaae3d6f861aea5'

* commit '53a11135f2fb2123408b295f9aaae3d6f861aea5':
  hevc: simplify splitting the transform tree blocks

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be'
Michael Niedermayer [Mon, 28 Jul 2014 10:53:17 +0000 (12:53 +0200)]
Merge commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be'

* commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be':
  hevc: eliminate an unnecessary array

Conflicts:
libavcodec/hevc.c

See: 255086a7e06417d98417cea192053b8a8531eb24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4b169321b84502302f2badb056ebee4fdaea94fa'
Michael Niedermayer [Mon, 28 Jul 2014 10:45:19 +0000 (12:45 +0200)]
Merge commit '4b169321b84502302f2badb056ebee4fdaea94fa'

* commit '4b169321b84502302f2badb056ebee4fdaea94fa':
  codec_desc: fix some typos in long codec names

See: 60b59d657e4d2c710391b8238533c2f3a51086f7
See: c3ca70204bd816bcef59c3d278b3d8607e2525ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c5fca0174db9ed45be821177f49bd9633152704d'
Michael Niedermayer [Mon, 28 Jul 2014 10:36:28 +0000 (12:36 +0200)]
Merge commit 'c5fca0174db9ed45be821177f49bd9633152704d'

* commit 'c5fca0174db9ed45be821177f49bd9633152704d':
  lavc: add a property for marking codecs that support frame reordering

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: eliminate the last element from TransformTree
Anton Khirnov [Sun, 27 Jul 2014 10:59:40 +0000 (10:59 +0000)]
hevc: eliminate the last element from TransformTree

Replace it by passing an additional parameter to transform_unit()

6 years agohevc: eliminate unnecessary cbf_c{b,r} arrays
Anton Khirnov [Sun, 27 Jul 2014 10:49:27 +0000 (10:49 +0000)]
hevc: eliminate unnecessary cbf_c{b,r} arrays

They are replaced by passing additional parameters to the transform
functions.

6 years agohevc: do not store the transform inter_split flag in the context
Anton Khirnov [Sun, 27 Jul 2014 09:49:37 +0000 (09:49 +0000)]
hevc: do not store the transform inter_split flag in the context

It does not need to be preserved.

6 years agohevc: simplify splitting the transform tree blocks
Anton Khirnov [Sun, 27 Jul 2014 09:19:16 +0000 (09:19 +0000)]
hevc: simplify splitting the transform tree blocks

6 years agohevc: eliminate an unnecessary array
Anton Khirnov [Sun, 27 Jul 2014 08:17:29 +0000 (08:17 +0000)]
hevc: eliminate an unnecessary array

We do not need to store the value of the split flag.

6 years agocodec_desc: fix some typos in long codec names
Anton Khirnov [Sun, 20 Jul 2014 11:34:30 +0000 (11:34 +0000)]
codec_desc: fix some typos in long codec names

The rv20 typo spotted by Hendrik Leppkes <h.leppkes@gmail.com>

6 years agolavc: add a property for marking codecs that support frame reordering
Anton Khirnov [Sun, 20 Jul 2014 11:26:13 +0000 (11:26 +0000)]
lavc: add a property for marking codecs that support frame reordering

6 years agoMAINTAINERS: update list of releases i maintain
Michael Niedermayer [Mon, 28 Jul 2014 04:16:34 +0000 (06:16 +0200)]
MAINTAINERS: update list of releases i maintain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_spp: support setting dct avoptions from the filter graph string
Michael Niedermayer [Mon, 28 Jul 2014 03:16:03 +0000 (05:16 +0200)]
avfilter/vf_spp: support setting dct avoptions from the filter graph string

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_scale: fix log message category
Michael Niedermayer [Mon, 28 Jul 2014 03:15:16 +0000 (05:15 +0200)]
avfilter/vf_scale: fix log message category

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/avdct: Add avcodec_dct_get_class()
Michael Niedermayer [Mon, 28 Jul 2014 03:14:39 +0000 (05:14 +0200)]
avcodec/avdct: Add avcodec_dct_get_class()

This should have been in the initial commit of AVDCT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRELEASE: update, we are after 2.3 not 2.2
Michael Niedermayer [Mon, 28 Jul 2014 01:11:04 +0000 (03:11 +0200)]
RELEASE: update, we are after 2.3 not 2.2

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: eliminate unnecessary cbf_c{b,r} arrays
Anton Khirnov [Sun, 27 Jul 2014 19:56:05 +0000 (21:56 +0200)]
hevc: eliminate unnecessary cbf_c{b,r} arrays

- They are be replaced by passing additional parameters to the transform
functions.
- Adaptation to 4:2:2

Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
cherry picked from commit f518bb22531c648f1c37f978b0c7ad2e71e04c25
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: fix skip_flag
Mickaël Raulet [Sun, 27 Jul 2014 20:52:14 +0000 (22:52 +0200)]
hevc: fix skip_flag

cherry picked from commit 509ae456551005b9bf9b4d9730b6247c97fdd990

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: remove non necessary parameters to ff_hevc_set_qpy
Mickaël Raulet [Sun, 27 Jul 2014 20:56:06 +0000 (22:56 +0200)]
hevc: remove non necessary parameters to ff_hevc_set_qpy

cherry picked from commit 6f58c111ad9920d983bb18eacf901193bac5d937

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/decoders: mention native Opus decoder
Lou Logan [Sun, 27 Jul 2014 20:46:55 +0000 (12:46 -0800)]
doc/decoders: mention native Opus decoder

Signed-off-by: Lou Logan <lou@lrcd.com>
6 years agoFix standalone compilation of the webm_dash_manifest demuxer.
Carl Eugen Hoyos [Sun, 27 Jul 2014 21:27:14 +0000 (23:27 +0200)]
Fix standalone compilation of the webm_dash_manifest demuxer.

6 years agoFix standalone compilation of the legacy mpegvideo decoder.
Carl Eugen Hoyos [Sun, 27 Jul 2014 21:22:10 +0000 (23:22 +0200)]
Fix standalone compilation of the legacy mpegvideo decoder.

Second try.

6 years agoFix standalone compilation of the legacy mpegvideo decoder.
Carl Eugen Hoyos [Sun, 27 Jul 2014 21:13:10 +0000 (23:13 +0200)]
Fix standalone compilation of the legacy mpegvideo decoder.

6 years agofate/hevc: update fate with 9 bitstreams
Mickaël Raulet [Sat, 26 Jul 2014 08:45:54 +0000 (10:45 +0200)]
fate/hevc: update fate with 9 bitstreams
- all of them testing HEVC version 1

cherry picked from commit adcdabb4dd062694fb8de6df0faecaad1c36ba33

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5'
Michael Niedermayer [Sun, 27 Jul 2014 19:47:42 +0000 (21:47 +0200)]
Merge commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5'

* commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5':
  fate: support testing of release branches

Conflicts:
tests/fate.sh

The communication protocol is left at version 0 as our fate server
hasnt been updated to support this yet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fix memalign hack auto detection
Michael Niedermayer [Sun, 27 Jul 2014 19:02:41 +0000 (21:02 +0200)]
configure: fix memalign hack auto detection

Should fix fate on haiku

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: fix "-flags" option
Michael Niedermayer [Sun, 27 Jul 2014 17:58:47 +0000 (19:58 +0200)]
doc/examples/muxing: fix "-flags" option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: hevc_mc: load less data in epel filters
Christophe Gisquet [Fri, 25 Jul 2014 13:08:49 +0000 (15:08 +0200)]
x86: hevc_mc: load less data in epel filters

Before:
5679 decicycles in epel_bi, 2059976 runs, 37176 skips
3468 decicycles in epel_uni, 1040886 runs, 7690 skips

After:
5323 decicycles in epel_bi, 2059493 runs, 37659 skips
3262 decicycles in epel_uni, 1040871 runs, 7705 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: hevc_mc: replace one lea by add
Christophe Gisquet [Fri, 25 Jul 2014 17:07:27 +0000 (19:07 +0200)]
x86: hevc_mc: replace one lea by add

Should have been in 036f11bdb565.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_spp: use AVDCT
Michael Niedermayer [Sat, 26 Jul 2014 13:24:42 +0000 (15:24 +0200)]
avfilter/vf_spp: use AVDCT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: add avdct
Michael Niedermayer [Sat, 26 Jul 2014 13:22:27 +0000 (15:22 +0200)]
avcodec: add avdct

This provides a public sustainable API/ABI for DCT functions.
Only externally used dct functions are included.
The structure is extensible without ABI issues compared to the
existing dct contexts.

See Mailing list and IRC log of 2014-07-26/27

Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: support testing of release branches
Janne Grunau [Sat, 26 Jul 2014 21:29:46 +0000 (23:29 +0200)]
fate: support testing of release branches

Adding 'branch=release/10' to the fate config file will check the
release/10 branch instead of master. If no branch is specified it will
use 'master' so that existing config are still valid.

The server side changes are already deployed, see
https://fate.libav.org/v10/ for an example. The server supports only the
release/* branches.

The server enforces that a single slot tests always the same branch.
Please append "-v$RELEASE" to the slot of release branch configs or make
the slot otherwise unique.

A different fate samples dir is needed for each release branch. make
fate-rsync has the correct URL in each branch.

6 years agoavcodec/ppc/idctdsp: Only select non bitexact IDCTs by default when bitexact is not set
Michael Niedermayer [Sun, 27 Jul 2014 12:16:07 +0000 (14:16 +0200)]
avcodec/ppc/idctdsp: Only select non bitexact IDCTs by default when bitexact is not set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/arm/idctdsp_init_arm*: Only select non bitexact IDCTs by default when bitexac...
Michael Niedermayer [Sun, 27 Jul 2014 12:16:07 +0000 (14:16 +0200)]
avcodec/arm/idctdsp_init_arm*: Only select non bitexact IDCTs by default when bitexact is not set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c'
Michael Niedermayer [Sun, 27 Jul 2014 10:23:53 +0000 (12:23 +0200)]
Merge commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c'

* commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c':
  eamad: use the bytestream2 API instead of AV_RL

Conflicts:
libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: Exchange tmp_frame and frame
Michael Niedermayer [Sun, 27 Jul 2014 02:10:06 +0000 (04:10 +0200)]
doc/examples/muxing: Exchange tmp_frame and frame

Reduces difference to 56f98e340fca894a76d1ddbe33118b8d8c4db34a

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoeamad: use the bytestream2 API instead of AV_RL
Anton Khirnov [Sun, 20 Jul 2014 12:06:47 +0000 (12:06 +0000)]
eamad: use the bytestream2 API instead of AV_RL

This is safer and possibly fixes invalid reads on truncated data.

CC:libav-stable@libav.org

6 years agoavcodec/h264_mp4toannexb_bsf: fix issue when sps/pps are already in the bistream
Chris \"Koying\" Browet [Sat, 26 Jul 2014 07:15:57 +0000 (09:15 +0200)]
avcodec/h264_mp4toannexb_bsf: fix issue when sps/pps are already in the bistream

6 years agofate/hevc: adding CONFWIN_A conformance test
Mickaël Raulet [Sat, 26 Jul 2014 09:47:15 +0000 (11:47 +0200)]
fate/hevc: adding CONFWIN_A conformance test

cherry picked from commit 3b69a2dc469160ee87367191e630e8398e832227

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate/hevc: add flags unaligned
Mickaël Raulet [Sat, 26 Jul 2014 09:47:15 +0000 (11:47 +0200)]
fate/hevc: add flags unaligned

cherry picked from commit 3b69a2dc469160ee87367191e630e8398e832227

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate/hevc: add BUMPING bitstream test
Mickaël Raulet [Fri, 25 Jul 2014 14:57:40 +0000 (16:57 +0200)]
fate/hevc: add BUMPING bitstream test

cherry picked from commit d4d61a071f087db2a4bc2b49559d40dd350a841e

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'
Michael Niedermayer [Sun, 27 Jul 2014 00:16:04 +0000 (02:16 +0200)]
Merge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'

* commit '7215fcf84032118ecd9fb54fb14154d69fea638d':
  avformat: Mark AVOutputFormat argument in avformat_query_codec as const

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'
Michael Niedermayer [Sun, 27 Jul 2014 00:09:41 +0000 (02:09 +0200)]
Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'

* commit 'ec4f04da1a3462dac429b9d15dee5f027309da15':
  avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const

Conflicts:
libavformat/format.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '53abe32409f13687c864b3cda077a1aa906a2459'
Michael Niedermayer [Sat, 26 Jul 2014 23:57:34 +0000 (01:57 +0200)]
Merge commit '53abe32409f13687c864b3cda077a1aa906a2459'

* commit '53abe32409f13687c864b3cda077a1aa906a2459':
  avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: mark correct frame as writeable
Michael Niedermayer [Sat, 26 Jul 2014 23:35:10 +0000 (01:35 +0200)]
doc/examples/muxing: mark correct frame as writeable

Bug found from comparing 56f98e340fca894a76d1ddbe33118b8d8c4db34a to HEAD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: Always use swr, simplifies code slightly
Michael Niedermayer [Sat, 26 Jul 2014 23:32:19 +0000 (01:32 +0200)]
doc/examples/muxing: Always use swr, simplifies code slightly

Idea-from: 56f98e340fca894a76d1ddbe33118b8d8c4db34a
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: add alloc_audio_frame() and use it to simplify code.
Anton Khirnov [Sat, 26 Jul 2014 23:12:25 +0000 (01:12 +0200)]
doc/examples/muxing: add alloc_audio_frame() and use it to simplify code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: Move samples_count to OutputStream
Michael Niedermayer [Sat, 26 Jul 2014 23:05:05 +0000 (01:05 +0200)]
doc/examples/muxing: Move samples_count to OutputStream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: free swr context at the end
Michael Niedermayer [Sat, 26 Jul 2014 22:50:58 +0000 (00:50 +0200)]
doc/examples/muxing: free swr context at the end

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc_idct: add 12bit idct_dc
James Almer [Sat, 26 Jul 2014 18:08:51 +0000 (15:08 -0300)]
x86/hevc_idct: add 12bit idct_dc

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/hevcdsp_init: make license header consistent
Michael Niedermayer [Sat, 26 Jul 2014 22:28:44 +0000 (00:28 +0200)]
avcodec/x86/hevcdsp_init: make license header consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d'
Michael Niedermayer [Sat, 26 Jul 2014 22:19:25 +0000 (00:19 +0200)]
Merge commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d'

* commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d':
  hevc: SSE2 and SSSE3 loop filters

Conflicts:
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h
libavcodec/x86/Makefile
libavcodec/x86/hevc_deblock.asm
libavcodec/x86/hevcdsp_init.c

See: de7b89fd43f850d77cf24ad6ae50185dfe391e91 and several others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '73bb8f61d48dbf7237df2e9cacd037f12b84b00a'
Michael Niedermayer [Sat, 26 Jul 2014 21:51:43 +0000 (23:51 +0200)]
Merge commit '73bb8f61d48dbf7237df2e9cacd037f12b84b00a'

* commit '73bb8f61d48dbf7237df2e9cacd037f12b84b00a':
  hevcdsp: remove an unneeded variable in the loop filter

Conflicts:
libavcodec/hevc_filter.c

See: d7e162d46b4a0fc03ca5161cdcac840152f048cb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: Mark AVOutputFormat argument in avformat_query_codec as const
Diego Biurrun [Sat, 26 Jul 2014 09:50:59 +0000 (02:50 -0700)]
avformat: Mark AVOutputFormat argument in avformat_query_codec as const

6 years agoavformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const
Diego Biurrun [Sat, 26 Jul 2014 09:47:41 +0000 (02:47 -0700)]
avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const

6 years agoavcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const
Diego Biurrun [Sat, 26 Jul 2014 09:46:40 +0000 (02:46 -0700)]
avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const

6 years agoMerge commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a'
Michael Niedermayer [Sat, 26 Jul 2014 21:28:36 +0000 (23:28 +0200)]
Merge commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a'

* commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a':
  output example: convert audio to the format supported by the encoder

Conflicts:
doc/examples/muxing.c

Not merged as our example code already does that for what is needed
and we generate matching data for the rest. generating fixed data
and converting all parameters could be done of course.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: Support setting flags, for example for setting bitexact
Michael Niedermayer [Sat, 26 Jul 2014 20:46:34 +0000 (22:46 +0200)]
doc/examples/muxing: Support setting flags, for example for setting bitexact

This would allow the example to be used in regression tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: select a supported sample rate for the encoder, favor 44100
Michael Niedermayer [Sat, 26 Jul 2014 20:19:10 +0000 (22:19 +0200)]
doc/examples/muxing: select a supported sample rate for the encoder, favor 44100

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: pick a supported channel layout if stereo isnt supported by...
Michael Niedermayer [Sat, 26 Jul 2014 20:00:07 +0000 (22:00 +0200)]
doc/examples/muxing: pick a supported channel layout if stereo isnt supported by the encoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: move swr context to OutputStream
Michael Niedermayer [Sat, 26 Jul 2014 19:42:46 +0000 (21:42 +0200)]
doc/examples/muxing: move swr context to OutputStream

Idea from: 56f98e340fca894a76d1ddbe33118b8d8c4db34a
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '884f7c975f0af25febe86660e87bf3b2165a0309'
Michael Niedermayer [Sat, 26 Jul 2014 19:04:31 +0000 (21:04 +0200)]
Merge commit '884f7c975f0af25febe86660e87bf3b2165a0309'

* commit '884f7c975f0af25febe86660e87bf3b2165a0309':
  output example: set the stream timebase

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc_idct: replace old and unused idct functions
James Almer [Sat, 26 Jul 2014 07:47:14 +0000 (04:47 -0300)]
x86/hevc_idct: replace old and unused idct functions

Only 8-bit and 10-bit idct_dc() functions are included (adding others should be trivial).

Benchmarks on an Intel Core i5-4200U:

idct8x8_dc
       SSE2   MMXEXT  C
cycles 22     26      57

idct16x16_dc
       AVX2   SSE2    C
cycles 27     32      249

idct32x32_dc
       AVX2   SSE2    C
cycles 62     126     1375

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: SSE2 and SSSE3 loop filters
Pierre Edouard Lepere [Wed, 18 Jun 2014 03:57:16 +0000 (05:57 +0200)]
hevc: SSE2 and SSSE3 loop filters

Additional contributions by James Almer <jamrial@gmail.com>,
Carl Eugen Hoyos <cehoyos@ag.or.at>, Fiona Glaser <fiona@x264.com> and
Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agohevcdsp: remove an unneeded variable in the loop filter
Anton Khirnov [Sat, 12 Jul 2014 08:36:03 +0000 (08:36 +0000)]
hevcdsp: remove an unneeded variable in the loop filter

beta0 and beta1 will always be the same

6 years agooutput example: convert audio to the format supported by the encoder
Anton Khirnov [Thu, 24 Jul 2014 17:47:26 +0000 (17:47 +0000)]
output example: convert audio to the format supported by the encoder

6 years agooutput example: set the stream timebase
Anton Khirnov [Wed, 23 Jul 2014 11:09:16 +0000 (11:09 +0000)]
output example: set the stream timebase

This is required by the new API.

6 years agohevc: add support for bumping process
Mickaël Raulet [Sat, 26 Jul 2014 12:27:56 +0000 (14:27 +0200)]
hevc: add support for bumping process

cherry picked from commit 8aa2fb7df3cffc67a3fd03a3a7eb49dbed4094c7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>