Derek Buitenhuis
ca5ec2bf51
Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'
...
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
build: miscellaneous cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-09 16:25:28 +01:00
Przemysław Sobala
1a3cff4f7e
libavutil/opt: add writing AV_OPT_TYPE_VIDEO_RATE AVOption
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-09 15:01:31 +02:00
Przemysław Sobala
5fce4753ff
avfilter/vf_fps: set fps value boundaries
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-09 15:01:07 +02:00
Derek Buitenhuis
38eeb85ff3
Merge commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330'
...
* commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330':
configure: cosmetics: Drop pointless end-of-line semicolons
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:57:32 +01:00
Derek Buitenhuis
68b8505d4d
Merge commit '00658253e237ab975ae2d384e02b5936781f103d'
...
* commit '00658253e237ab975ae2d384e02b5936781f103d':
fate: Update DDS tests
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:55:28 +01:00
Derek Buitenhuis
d62984d8a0
Merge commit '22e49e6edead9c83696f20127988f659b952ce65'
...
* commit '22e49e6edead9c83696f20127988f659b952ce65':
dds: Simplify postprocessing check
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:50:09 +01:00
Derek Buitenhuis
6ebec1049e
Merge commit '02538636261fdec9c70f4185b23147c636f269b4'
...
* commit '02538636261fdec9c70f4185b23147c636f269b4':
dds: Add support for alpha-only files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:49:26 +01:00
Derek Buitenhuis
6c00703685
Merge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'
...
* commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc':
dds: Add support for rgb555 files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:49:04 +01:00
Derek Buitenhuis
486776d06f
Merge commit '8dde92b95a197eb809d798aacb34dbe52a0689a8'
...
* commit '8dde92b95a197eb809d798aacb34dbe52a0689a8':
fate: Update Screenpresso tests
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:46:58 +01:00
Derek Buitenhuis
483e9d8a2b
Merge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'
...
* commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf':
screenpresso: Correctly handle keyframes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:43:55 +01:00
Derek Buitenhuis
5d31074daf
Merge commit '95db8c757cb003a71b040b567f38be74151deb5c'
...
* commit '95db8c757cb003a71b040b567f38be74151deb5c':
screenpresso: Add extended pixel format support
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:43:35 +01:00
Derek Buitenhuis
e4c8e19064
Merge commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914'
...
* commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914':
fate: Update RSCC tests
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:41:40 +01:00
Derek Buitenhuis
dd2d26dc82
Merge commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b'
...
* commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b':
rscc: Add extended pixel format support
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:33:08 +01:00
Derek Buitenhuis
f0d4f3026d
Merge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae'
...
This commit is a no-op.
* commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae':
nvenc_h264: Fix name of private AVClass
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:27:22 +01:00
Derek Buitenhuis
ee865e9780
Merge commit 'e3453fd44480d903338c663238bf280215dd9a07'
...
* commit 'e3453fd44480d903338c663238bf280215dd9a07':
matroska: Write the field order information
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:25:58 +01:00
Derek Buitenhuis
2d2af18f42
Merge commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d'
...
This commit is a no-op. We cherry picked it earlier.
* commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d':
vaapi_h264: Fix bit offset of slice data.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:07:55 +01:00
Derek Buitenhuis
13b77e09c7
Merge commit '33275a0de05e9bc321f2537a2a67921fab81624f'
...
* commit '33275a0de05e9bc321f2537a2a67921fab81624f':
ac3dec: change logging of skipped E-AC-3 substreams.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:07:01 +01:00
Derek Buitenhuis
15cb52577a
Merge commit 'fef2147b7a689b80d716c3edb9d4a18904865275'
...
* commit 'fef2147b7a689b80d716c3edb9d4a18904865275':
eac3dec: don't call avpriv_request_sample every frame.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:05:22 +01:00
Derek Buitenhuis
9109b5240b
Merge commit '1db8eb154908cde577477b6ab17430a0cd46b7bd'
...
* commit '1db8eb154908cde577477b6ab17430a0cd46b7bd':
avconv: Drop an unused variable
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:04:53 +01:00
Derek Buitenhuis
dc0152548f
Merge commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43'
...
* commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43':
jack: Support OSX
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 23:02:33 +01:00
Derek Buitenhuis
f3972b3b7d
Merge commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1'
...
* commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1':
matroska: Support interlaced content correctly
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 22:58:18 +01:00
Derek Buitenhuis
f93c409c0b
Merge commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954'
...
* commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954':
build: Do not check the vaapi_encode.h header if VAAPI is not enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 22:53:50 +01:00
Derek Buitenhuis
4c3732c881
Merge commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d'
...
* commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d':
Mark tables used only within their files as static
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 22:52:40 +01:00
Derek Buitenhuis
630586af88
Merge commit '061dc20351bf3b8a237216d2b39d3a3b736d1916'
...
* commit '061dc20351bf3b8a237216d2b39d3a3b736d1916':
h264: Add missing ff_ prefix to internally visible h264_init_dequant_tables()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 22:51:09 +01:00
Derek Buitenhuis
3005ee372d
Merge commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628'
...
* commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628':
avconv: fix -frames for video
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 22:50:46 +01:00
Derek Buitenhuis
939345854a
Merge commit '83f230c2445a94fdd94c66504482217fcece5909'
...
* commit '83f230c2445a94fdd94c66504482217fcece5909':
lavc: VAAPI MJPEG encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 22:46:52 +01:00
Derek Buitenhuis
a82d1a8c7a
Merge commit '31fe1f2577f8208f79a4b3ab59465e78dd497555'
...
* commit '31fe1f2577f8208f79a4b3ab59465e78dd497555':
lavc: VAAPI H.265 encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 22:45:39 +01:00
Derek Buitenhuis
b975aeec02
Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'
...
* commit '2c62fcdf5d617791a653d7957d449f75569eede0':
lavc: VAAPI H.264 encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 22:43:52 +01:00
Derek Buitenhuis
508957fd0f
Merge commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e'
...
* commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e':
lavc: VAAPI encode common infrastructure
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 22:41:12 +01:00
Derek Buitenhuis
172d3568b3
Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'
...
* commit '5d273d3efac340ef8de445c955ff44c7abed4e8f':
avconv: VAAPI hwcontext initialisation and hwaccel helper
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 22:39:39 +01:00
Christophe Gisquet
01938585f4
vc2: fate tests
2016-05-08 19:50:39 +01:00
Michael Niedermayer
5df703aa1b
avcodec/simple_idct_template: Fix strict aliasing violation
...
Fixes intrax8 test
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-08 20:40:27 +02:00
Rostislav Pehlivanov
b6c207f535
vc2enc_dwt: use 32 bit coefficients by default
...
The problem is that with particularly complex images and especially at
high bit depths and 5-level transforms the coefficients would overflow,
causing huge artifacts to appear. This was discovered thanks to the fate
tests, which will have to be redone as this fixes a multitude of
problems and increases PSNR.
There is a slight performance drop associated with this change, making
the encoder slower by 1.15 times, however this is necessary in order to
avoid undefined behavior and overflows.
It would be worth to template the transforms to keep the performance for
8 bit images as 32 bit coefficients are unnecessary for that case, but
the primary use of the encoder is to encode video at 10 bits.
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2016-05-08 19:09:42 +01:00
Hendrik Leppkes
64fd62d68a
avcodec/dxva2_h264: fix slice offset in long slice struct after ca2f19b9
...
The GetBitContext now includes the NAL header, which offsets the slice by
one byte, which needs to be accounted for here.
2016-05-08 17:48:19 +02:00
Mark Thompson
617cd45ddc
vaapi_h264: Fix bit offset of slice data.
...
Commit ca2f19b9cc
modified the meaning of
H264SliceContext.gb: it is now initialised at the start of the NAL unit
header, rather than at the start of the slice header. The VAAPI slice
decoder uses the offset after parsing to determine the offset of the
slice data in the bitstream, so with the changed meaning we no longer
need to add the extra byte to account for the NAL unit header because
it is now included directly.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-08 16:46:04 +01:00
Michael Niedermayer
caee88d193
fate: Remove duplicate wmv8_x8intra.wmv test
...
Also temporary enable the test so we get updated fate failure statistics
Note, this does not work on all platforms, it fails on MIPS
and ml archives indicate it failed on x86 openbsd with some compilers as well
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-08 02:10:26 +02:00
Christophe Gisquet
9630b3fc06
x86: lossless audio: SSE4 madd 32bits
...
The unique user so far is wmalossless 24bits. The few samples tested show an
order of 8, so more unrolling or an avx2 version do not make sense.
Timings: 68 -> 49 cycles
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-07 23:28:48 +02:00
Derek Buitenhuis
e811ebcd9c
Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'
...
* commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7':
intrax8: Remove mpegvideo dependency
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07 21:41:27 +01:00
Derek Buitenhuis
f2c7812839
Merge commit '6ebd06a9b2508747a135ee4c880d8f612e08932b'
...
* commit '6ebd06a9b2508747a135ee4c880d8f612e08932b':
intrax8: Drop lots of pointless parentheses
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07 21:40:21 +01:00
Derek Buitenhuis
741960e2f3
Merge commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c'
...
* commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c':
intrax8: Drop MB emulation code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07 21:40:05 +01:00
Derek Buitenhuis
f110c624b1
Merge commit '9fa888c02801fff2e8817c24068f5296bbe60000'
...
* commit '9fa888c02801fff2e8817c24068f5296bbe60000':
intrax8: Keep a reference to the decoder blocks
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07 21:39:44 +01:00
Derek Buitenhuis
c59c792470
Merge commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f'
...
* commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f':
intrax8: Use the generic horizband function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07 21:37:32 +01:00
Derek Buitenhuis
123fef54cc
Merge commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b'
...
* commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b':
intrax8: Pass macroblock coordinates to ff_intrax8_decode_picture
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07 21:36:54 +01:00
Derek Buitenhuis
578fb5a27d
Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3'
...
* commit 'd0540fd02171a6233d2016b199d013299debf7e3':
intrax8: Pass macroblock size to ff_intrax8_common_init
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07 21:35:20 +01:00
Derek Buitenhuis
eee5a7cd7d
Merge commit '9f4d99138df434a73b097c997fb4cafc65f4ff54'
...
* commit '9f4d99138df434a73b097c997fb4cafc65f4ff54':
fate: Add test for WMV2 with jframes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07 21:34:07 +01:00
Hendrik Leppkes
d46e856350
h265_parse: skip zero sized NAL units
...
Avoids extra error checks later on and/or invalid reads.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07 21:14:23 +01:00
Hendrik Leppkes
d6f92103e0
h264: do not return an error when NAL parsing of extradata failed
...
Fixes AnnexB samples with broken extradata, but proper in-band parameter sets
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07 21:14:17 +01:00
Hendrik Leppkes
772ad7142d
Merge commit 'ca2f19b9cc37be509d85f05c8f902860475905f8'
...
* commit 'ca2f19b9cc37be509d85f05c8f902860475905f8':
h264: switch to h2645_parse for NAL parsing
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-05-07 21:13:44 +01:00
Hendrik Leppkes
9cc1ab63ac
h2645_parse: allow partial escaping
...
This ports the fix from 033a533
to the new parser module in prepartion
of using it for the h264 decoder.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07 21:11:21 +01:00
Hendrik Leppkes
c802389393
h2645_parse: initialize the GetBitContext to the proper size
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07 21:11:10 +01:00