ffmpeg.git
4 years agoffmpeg: copy color properties in case of -c:v copy.
Ronald S. Bultje [Tue, 3 May 2016 19:20:48 +0000 (15:20 -0400)]
ffmpeg: copy color properties in case of -c:v copy.

I have no idea why the first hunk uses ost->enc_ctx, because as far as
I understand, that is never used in case of -c:v copy, but this code
block is only entered if encoding_needed=0, which means stream_copy=1.
My point being: review from someone that knows this really well would
be appreciated.

4 years agovf_colorspace: use enums for bpp/subsampling array indices.
Ronald S. Bultje [Fri, 6 May 2016 13:00:14 +0000 (09:00 -0400)]
vf_colorspace: use enums for bpp/subsampling array indices.

Also add some documentation for each function to colorspacedsp.h.

4 years agovf_colorspace: add const to yuv_stride[] argument in DSP functions.
Ronald S. Bultje [Fri, 6 May 2016 12:59:43 +0000 (08:59 -0400)]
vf_colorspace: add const to yuv_stride[] argument in DSP functions.

4 years agovf_colorspace: add floyd-steinberg dithering option to full conversion.
Ronald S. Bultje [Tue, 3 May 2016 17:53:17 +0000 (13:53 -0400)]
vf_colorspace: add floyd-steinberg dithering option to full conversion.

4 years agoavfilter/f_metadata: update print output header line format
Tobias Rapp [Mon, 9 May 2016 09:35:38 +0000 (11:35 +0200)]
avfilter/f_metadata: update print output header line format

Update print mode output header line format to be more consistent with
other log output of FFmpeg. The printf-modifiers have been inspired by
the showinfo filter.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/f_metadata: add pts_time to print output
Tobias Rapp [Mon, 9 May 2016 09:35:37 +0000 (11:35 +0200)]
avfilter/f_metadata: add pts_time to print output

This allows e.g. to correlate signalstats metadata to time position
without having to find out the filter chain timebase first.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'
Derek Buitenhuis [Mon, 9 May 2016 14:52:05 +0000 (15:52 +0100)]
Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'

* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
  build: miscellaneous cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agolibavutil/opt: add writing AV_OPT_TYPE_VIDEO_RATE AVOption
Przemysław Sobala [Mon, 9 May 2016 09:27:09 +0000 (11:27 +0200)]
libavutil/opt: add writing AV_OPT_TYPE_VIDEO_RATE AVOption

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/vf_fps: set fps value boundaries
Przemysław Sobala [Mon, 9 May 2016 09:17:23 +0000 (11:17 +0200)]
avfilter/vf_fps: set fps value boundaries

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330'
Derek Buitenhuis [Sun, 8 May 2016 22:57:32 +0000 (23:57 +0100)]
Merge commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330'

* commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330':
  configure: cosmetics: Drop pointless end-of-line semicolons

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '00658253e237ab975ae2d384e02b5936781f103d'
Derek Buitenhuis [Sun, 8 May 2016 22:50:29 +0000 (23:50 +0100)]
Merge commit '00658253e237ab975ae2d384e02b5936781f103d'

* commit '00658253e237ab975ae2d384e02b5936781f103d':
  fate: Update DDS tests

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '22e49e6edead9c83696f20127988f659b952ce65'
Derek Buitenhuis [Sun, 8 May 2016 22:50:09 +0000 (23:50 +0100)]
Merge commit '22e49e6edead9c83696f20127988f659b952ce65'

* commit '22e49e6edead9c83696f20127988f659b952ce65':
  dds: Simplify postprocessing check

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '02538636261fdec9c70f4185b23147c636f269b4'
Derek Buitenhuis [Sun, 8 May 2016 22:49:20 +0000 (23:49 +0100)]
Merge commit '02538636261fdec9c70f4185b23147c636f269b4'

* commit '02538636261fdec9c70f4185b23147c636f269b4':
  dds: Add support for alpha-only files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'
Derek Buitenhuis [Sun, 8 May 2016 22:48:55 +0000 (23:48 +0100)]
Merge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'

* commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc':
  dds: Add support for rgb555 files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '8dde92b95a197eb809d798aacb34dbe52a0689a8'
Derek Buitenhuis [Sun, 8 May 2016 22:44:19 +0000 (23:44 +0100)]
Merge commit '8dde92b95a197eb809d798aacb34dbe52a0689a8'

* commit '8dde92b95a197eb809d798aacb34dbe52a0689a8':
  fate: Update Screenpresso tests

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'
Derek Buitenhuis [Sun, 8 May 2016 22:43:51 +0000 (23:43 +0100)]
Merge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'

* commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf':
  screenpresso: Correctly handle keyframes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '95db8c757cb003a71b040b567f38be74151deb5c'
Derek Buitenhuis [Sun, 8 May 2016 22:43:26 +0000 (23:43 +0100)]
Merge commit '95db8c757cb003a71b040b567f38be74151deb5c'

* commit '95db8c757cb003a71b040b567f38be74151deb5c':
  screenpresso: Add extended pixel format support

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914'
Derek Buitenhuis [Sun, 8 May 2016 22:33:38 +0000 (23:33 +0100)]
Merge commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914'

* commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914':
  fate: Update RSCC tests

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b'
Derek Buitenhuis [Sun, 8 May 2016 22:31:01 +0000 (23:31 +0100)]
Merge commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b'

* commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b':
  rscc: Add extended pixel format support

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae'
Derek Buitenhuis [Sun, 8 May 2016 22:27:18 +0000 (23:27 +0100)]
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>
4 years agoMerge commit 'e3453fd44480d903338c663238bf280215dd9a07'
Derek Buitenhuis [Sun, 8 May 2016 22:25:58 +0000 (23:25 +0100)]
Merge commit 'e3453fd44480d903338c663238bf280215dd9a07'

* commit 'e3453fd44480d903338c663238bf280215dd9a07':
  matroska: Write the field order information

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d'
Derek Buitenhuis [Sun, 8 May 2016 22:07:39 +0000 (23:07 +0100)]
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>
4 years agoMerge commit '33275a0de05e9bc321f2537a2a67921fab81624f'
Derek Buitenhuis [Sun, 8 May 2016 22:06:55 +0000 (23:06 +0100)]
Merge commit '33275a0de05e9bc321f2537a2a67921fab81624f'

* commit '33275a0de05e9bc321f2537a2a67921fab81624f':
  ac3dec: change logging of skipped E-AC-3 substreams.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'fef2147b7a689b80d716c3edb9d4a18904865275'
Derek Buitenhuis [Sun, 8 May 2016 22:05:12 +0000 (23:05 +0100)]
Merge commit 'fef2147b7a689b80d716c3edb9d4a18904865275'

* commit 'fef2147b7a689b80d716c3edb9d4a18904865275':
  eac3dec: don't call avpriv_request_sample every frame.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '1db8eb154908cde577477b6ab17430a0cd46b7bd'
Derek Buitenhuis [Sun, 8 May 2016 22:04:47 +0000 (23:04 +0100)]
Merge commit '1db8eb154908cde577477b6ab17430a0cd46b7bd'

* commit '1db8eb154908cde577477b6ab17430a0cd46b7bd':
  avconv: Drop an unused variable

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43'
Derek Buitenhuis [Sun, 8 May 2016 22:01:58 +0000 (23:01 +0100)]
Merge commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43'

* commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43':
  jack: Support OSX

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1'
Derek Buitenhuis [Sun, 8 May 2016 21:58:18 +0000 (22:58 +0100)]
Merge commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1'

* commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1':
  matroska: Support interlaced content correctly

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954'
Derek Buitenhuis [Sun, 8 May 2016 21:53:50 +0000 (22:53 +0100)]
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>
4 years agoMerge commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d'
Derek Buitenhuis [Sun, 8 May 2016 21:52:32 +0000 (22:52 +0100)]
Merge commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d'

* commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d':
  Mark tables used only within their files as static

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '061dc20351bf3b8a237216d2b39d3a3b736d1916'
Derek Buitenhuis [Sun, 8 May 2016 21:51:09 +0000 (22:51 +0100)]
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>
4 years agoMerge commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628'
Derek Buitenhuis [Sun, 8 May 2016 21:50:42 +0000 (22:50 +0100)]
Merge commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628'

* commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628':
  avconv: fix -frames for video

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '83f230c2445a94fdd94c66504482217fcece5909'
Derek Buitenhuis [Sun, 8 May 2016 21:46:52 +0000 (22:46 +0100)]
Merge commit '83f230c2445a94fdd94c66504482217fcece5909'

* commit '83f230c2445a94fdd94c66504482217fcece5909':
  lavc: VAAPI MJPEG encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '31fe1f2577f8208f79a4b3ab59465e78dd497555'
Derek Buitenhuis [Sun, 8 May 2016 21:45:39 +0000 (22:45 +0100)]
Merge commit '31fe1f2577f8208f79a4b3ab59465e78dd497555'

* commit '31fe1f2577f8208f79a4b3ab59465e78dd497555':
  lavc: VAAPI H.265 encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '2c62fcdf5d617791a653d7957d449f75569eede0'
Derek Buitenhuis [Sun, 8 May 2016 21:43:52 +0000 (22:43 +0100)]
Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'

* commit '2c62fcdf5d617791a653d7957d449f75569eede0':
  lavc: VAAPI H.264 encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e'
Derek Buitenhuis [Sun, 8 May 2016 21:40:42 +0000 (22:40 +0100)]
Merge commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e'

* commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e':
  lavc: VAAPI encode common infrastructure

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'
Derek Buitenhuis [Sun, 8 May 2016 21:39:20 +0000 (22:39 +0100)]
Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'

* commit '5d273d3efac340ef8de445c955ff44c7abed4e8f':
  avconv: VAAPI hwcontext initialisation and hwaccel helper

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agovc2: fate tests
Christophe Gisquet [Thu, 5 May 2016 09:06:09 +0000 (11:06 +0200)]
vc2: fate tests

4 years agoavcodec/simple_idct_template: Fix strict aliasing violation
Michael Niedermayer [Sun, 8 May 2016 17:19:47 +0000 (19:19 +0200)]
avcodec/simple_idct_template: Fix strict aliasing violation

Fixes intrax8 test

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agovc2enc_dwt: use 32 bit coefficients by default
Rostislav Pehlivanov [Sat, 7 May 2016 17:05:25 +0000 (18:05 +0100)]
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>
4 years agoavcodec/dxva2_h264: fix slice offset in long slice struct after ca2f19b9
Hendrik Leppkes [Sun, 8 May 2016 15:37:30 +0000 (17:37 +0200)]
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.

4 years agovaapi_h264: Fix bit offset of slice data.
Mark Thompson [Sat, 2 Apr 2016 15:48:53 +0000 (16:48 +0100)]
vaapi_h264: Fix bit offset of slice data.

Commit ca2f19b9cc37be509d85f05c8f902860475905f8 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>
4 years agofate: Remove duplicate wmv8_x8intra.wmv test
Michael Niedermayer [Sat, 7 May 2016 23:19:37 +0000 (01:19 +0200)]
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>
4 years agox86: lossless audio: SSE4 madd 32bits
Christophe Gisquet [Sun, 1 May 2016 13:33:46 +0000 (15:33 +0200)]
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>
4 years agoMerge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'
Derek Buitenhuis [Sat, 7 May 2016 20:41:27 +0000 (21:41 +0100)]
Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'

* commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7':
  intrax8: Remove mpegvideo dependency

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '6ebd06a9b2508747a135ee4c880d8f612e08932b'
Derek Buitenhuis [Sat, 7 May 2016 20:40:16 +0000 (21:40 +0100)]
Merge commit '6ebd06a9b2508747a135ee4c880d8f612e08932b'

* commit '6ebd06a9b2508747a135ee4c880d8f612e08932b':
  intrax8: Drop lots of pointless parentheses

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c'
Derek Buitenhuis [Sat, 7 May 2016 20:40:00 +0000 (21:40 +0100)]
Merge commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c'

* commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c':
  intrax8: Drop MB emulation code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '9fa888c02801fff2e8817c24068f5296bbe60000'
Derek Buitenhuis [Sat, 7 May 2016 20:38:30 +0000 (21:38 +0100)]
Merge commit '9fa888c02801fff2e8817c24068f5296bbe60000'

* commit '9fa888c02801fff2e8817c24068f5296bbe60000':
  intrax8: Keep a reference to the decoder blocks

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f'
Derek Buitenhuis [Sat, 7 May 2016 20:37:28 +0000 (21:37 +0100)]
Merge commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f'

* commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f':
  intrax8: Use the generic horizband function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b'
Derek Buitenhuis [Sat, 7 May 2016 20:36:46 +0000 (21:36 +0100)]
Merge commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b'

* commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b':
  intrax8: Pass macroblock coordinates to ff_intrax8_decode_picture

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'd0540fd02171a6233d2016b199d013299debf7e3'
Derek Buitenhuis [Sat, 7 May 2016 20:35:20 +0000 (21:35 +0100)]
Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3'

* commit 'd0540fd02171a6233d2016b199d013299debf7e3':
  intrax8: Pass macroblock size to ff_intrax8_common_init

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '9f4d99138df434a73b097c997fb4cafc65f4ff54'
Derek Buitenhuis [Sat, 7 May 2016 20:23:46 +0000 (21:23 +0100)]
Merge commit '9f4d99138df434a73b097c997fb4cafc65f4ff54'

* commit '9f4d99138df434a73b097c997fb4cafc65f4ff54':
  fate: Add test for WMV2 with jframes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoh265_parse: skip zero sized NAL units
Hendrik Leppkes [Sat, 7 May 2016 14:28:39 +0000 (16:28 +0200)]
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>
4 years agoh264: do not return an error when NAL parsing of extradata failed
Hendrik Leppkes [Sat, 7 May 2016 11:28:31 +0000 (13:28 +0200)]
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>
4 years agoMerge commit 'ca2f19b9cc37be509d85f05c8f902860475905f8'
Hendrik Leppkes [Sat, 7 May 2016 08:31:13 +0000 (10:31 +0200)]
Merge commit 'ca2f19b9cc37be509d85f05c8f902860475905f8'

* commit 'ca2f19b9cc37be509d85f05c8f902860475905f8':
  h264: switch to h2645_parse for NAL parsing

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoh2645_parse: allow partial escaping
Hendrik Leppkes [Fri, 6 May 2016 14:20:13 +0000 (16:20 +0200)]
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>
4 years agoh2645_parse: initialize the GetBitContext to the proper size
Hendrik Leppkes [Fri, 6 May 2016 16:31:05 +0000 (18:31 +0200)]
h2645_parse: initialize the GetBitContext to the proper size

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agohevc: fix size condition in ptl parsing
Hendrik Leppkes [Fri, 6 May 2016 17:09:04 +0000 (19:09 +0200)]
hevc: fix size condition in ptl parsing

When only one sublayer is present, no information is coded. Only when at least two
are present, all 8 sublayers are written.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavformat/tee: Use ref instead copy in write_packet
Jan Sebechlebsky [Sun, 1 May 2016 22:34:46 +0000 (01:34 +0300)]
avformat/tee: Use ref instead copy in write_packet

Replace av_copy_packet and deprecated av_dup_packet by
creating reference using av_packet_ref.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoavformat/tee: Fix TeeSlave.bsfs pointer array size
Jan Sebechlebsky [Tue, 3 May 2016 13:21:20 +0000 (16:21 +0300)]
avformat/tee: Fix TeeSlave.bsfs pointer array size

TeeSlave.bsfs is array of pointers to AVBitStreamFilterContext,
so element size should be really size of a pointer, not size
of TeeSlave structure.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoffplay: force setting alsa buffer size
Marton Balint [Wed, 20 Apr 2016 21:50:38 +0000 (23:50 +0200)]
ffplay: force setting alsa buffer size

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoriff: add comment for g721,g723 codec tags
compn [Sat, 7 May 2016 10:56:43 +0000 (06:56 -0400)]
riff: add comment for g721,g723 codec tags

Signed-off-by: Piotr Bandurski <ami_stuff@o2.pl>
4 years agoavformat/riff: add M102 FourCC
Piotr Bandurski [Fri, 6 May 2016 20:43:00 +0000 (22:43 +0200)]
avformat/riff: add M102 FourCC

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/m101: simplify 8bit code
Michael Niedermayer [Sat, 7 May 2016 01:43:17 +0000 (03:43 +0200)]
avcodec/m101: simplify 8bit code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/m101: remove unneeded zeroing of priv_data_size
Michael Niedermayer [Sat, 7 May 2016 01:41:03 +0000 (03:41 +0200)]
avcodec/m101: remove unneeded zeroing of priv_data_size

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/m101: Simplify if() condition
Michael Niedermayer [Sat, 7 May 2016 01:38:13 +0000 (03:38 +0200)]
avcodec/m101: Simplify if() condition

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agofate: fix dcadec test dependencies
James Almer [Fri, 6 May 2016 21:52:27 +0000 (18:52 -0300)]
fate: fix dcadec test dependencies

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoconfigure: Only utvideo <= 15.3.0 is supported.
Carl Eugen Hoyos [Fri, 6 May 2016 17:42:35 +0000 (19:42 +0200)]
configure: Only utvideo <= 15.3.0 is supported.

Fixes ticket #5511.

4 years agoavcodec/avcodec: Move AV_CODEC_ID_M101 to the 2nd group of video codecs
Michael Niedermayer [Fri, 6 May 2016 13:52:46 +0000 (15:52 +0200)]
avcodec/avcodec: Move AV_CODEC_ID_M101 to the 2nd group of video codecs

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/riff: add M101
Michael Niedermayer [Thu, 5 May 2016 16:49:37 +0000 (18:49 +0200)]
avformat/riff: add M101

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: add M101 decoder
Michael Niedermayer [Thu, 5 May 2016 16:09:24 +0000 (18:09 +0200)]
avcodec: add M101 decoder

Fixes Ticket 2611

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/nvenc: don't set profile in lossless mode
Timo Rothenpieler [Thu, 5 May 2016 16:05:05 +0000 (18:05 +0200)]
avcodec/nvenc: don't set profile in lossless mode

4 years agoavcodec/dcadsp: use LOCAL_ALIGNED_32 instead of LOCAL_ALIGNED(32, ...)
James Almer [Fri, 6 May 2016 03:47:55 +0000 (00:47 -0300)]
avcodec/dcadsp: use LOCAL_ALIGNED_32 instead of LOCAL_ALIGNED(32, ...)

4 years agoavcodec: Add "sar" alias to "aspect" option of video encoders
Andrey Utkin [Thu, 5 May 2016 12:37:49 +0000 (15:37 +0300)]
avcodec: Add "sar" alias to "aspect" option of video encoders

It is impossible to pass "aspect" parameter to encoder from ffmpeg CLI
because option from lavc/options_table.h is eclipsed by option with same
name in ffmpeg_opt.c, which has different meaning (DAR, not SAR).

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/graphparser: add '\r' as whitespace
Muhammad Faiz [Fri, 6 May 2016 00:37:12 +0000 (07:37 +0700)]
avfilter/graphparser: add '\r' as whitespace

for compatibility with platforms that treat it
as newline

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
4 years agoavutil/parsing: add '\r' as whitespace
Muhammad Faiz [Fri, 6 May 2016 00:35:45 +0000 (07:35 +0700)]
avutil/parsing: add '\r' as whitespace

for compatibility with platforms that treat it
as newline

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
4 years agovc2enc: prevent random data
Christophe Gisquet [Thu, 5 May 2016 09:06:08 +0000 (11:06 +0200)]
vc2enc: prevent random data

The slice prefix is 0 in the reference encoder and the decoder ignores it.
Writing 0 there seems like the best temporary solution.

The padding could have contained uninitialized data, but reference VC2
encoders put 0xFF there, hence the memset value.

Overall this allows producing bistreams with no random data for use by fate.

4 years agofate: Add test for vorbis encoder
Petru Rares Sincraian [Thu, 5 May 2016 16:56:38 +0000 (18:56 +0200)]
fate: Add test for vorbis encoder

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/alac: fix 20-bit support
Paul B Mahol [Thu, 5 May 2016 16:13:28 +0000 (18:13 +0200)]
avcodec/alac: fix 20-bit support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavd/avfoundation: use AVCodecParameters
Rick Kern [Thu, 5 May 2016 13:08:02 +0000 (09:08 -0400)]
lavd/avfoundation: use AVCodecParameters

Fixes "Could not find codec parameters for stream" error (#5494)

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agoavfilter/vf_waveform: fix order of graticule scale items
Paul B Mahol [Thu, 5 May 2016 08:34:13 +0000 (10:34 +0200)]
avfilter/vf_waveform: fix order of graticule scale items

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/avf_showcqt: add .
Muhammad Faiz [Thu, 5 May 2016 07:03:32 +0000 (14:03 +0700)]
avfilter/avf_showcqt: add .

4 years agofate: Add test for broken SPS (Ticket 2580)
Michael Niedermayer [Tue, 3 May 2016 14:30:03 +0000 (16:30 +0200)]
fate: Add test for broken SPS (Ticket 2580)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agovc2enc: do not print the lavc version if the bitexact flag is enabled
Rostislav Pehlivanov [Wed, 4 May 2016 23:18:03 +0000 (00:18 +0100)]
vc2enc: do not print the lavc version if the bitexact flag is enabled

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agoavformat/dtsdec: reduce the scope of crctab
James Almer [Wed, 4 May 2016 22:23:23 +0000 (19:23 -0300)]
avformat/dtsdec: reduce the scope of crctab

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavformat/dtsdec: detect core-less streams
foo86 [Tue, 3 May 2016 13:06:41 +0000 (16:06 +0300)]
avformat/dtsdec: detect core-less streams

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavformat/mpegtsenc: fix usage of AVStream.codec
James Almer [Wed, 4 May 2016 21:39:27 +0000 (18:39 -0300)]
avformat/mpegtsenc: fix usage of AVStream.codec

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/hevc_parser: fix packet_split function name
James Almer [Wed, 4 May 2016 21:26:06 +0000 (18:26 -0300)]
avcodec/hevc_parser: fix packet_split function name

Fixes compilation of hevc_parser without hevc_decoder

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavformat/h264dec: Avoid get_ue_golomb_31( ) due to ff_ prefixed table from golomb.c
Michael Niedermayer [Wed, 4 May 2016 20:43:01 +0000 (22:43 +0200)]
avformat/h264dec: Avoid get_ue_golomb_31( ) due to ff_ prefixed table from golomb.c

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/utils: Do not detect video codecs when audio is expected
Michael Niedermayer [Wed, 4 May 2016 19:31:18 +0000 (21:31 +0200)]
avformat/utils: Do not detect video codecs when audio is expected

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/h264dec: Check pps_id/sps_id fields from parameter sets
Michael Niedermayer [Wed, 4 May 2016 19:20:15 +0000 (21:20 +0200)]
avformat/h264dec: Check pps_id/sps_id fields from parameter sets

Fixes a misdetection in wav.detected.as.h264.error.wav

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc/videotoolboxenc: Set colorimetry values
Rick Kern [Wed, 27 Apr 2016 14:53:15 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Set colorimetry values

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agolavc/videotoolboxenc: Support pixel aspect ratio
Rick Kern [Wed, 27 Apr 2016 14:53:14 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Support pixel aspect ratio

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agolavc/videotoolboxenc: Support for forced I-frames
Rick Kern [Wed, 27 Apr 2016 14:53:13 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Support for forced I-frames

Setting AVFrame.pic_type to AV_PICTURE_TYPE_I will force an I-frame.

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agolavc/videotoolboxenc: add concatentation properties
Rick Kern [Wed, 27 Apr 2016 14:53:12 +0000 (10:53 -0400)]
lavc/videotoolboxenc: add concatentation properties

Add frames_before and frames_after as hints that there will be frames before
or after the frames produced in this session. This may help with
concatenation issues like bit rate spikes.

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agolavc/videotoolboxenc: Add realtime encoding property
Rick Kern [Wed, 27 Apr 2016 14:53:11 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Add realtime encoding property

Hint to the encoder that encoding should be done in real-time, even at the
expense of quality.

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agolavc/videotoolboxenc: Handle out-of-memory and fix memory leak
Rick Kern [Wed, 27 Apr 2016 14:53:10 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Handle out-of-memory and fix memory leak

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agolavc/videotoolboxenc: Fix DTS
Rick Kern [Wed, 27 Apr 2016 14:53:09 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Fix DTS

Some devices output an invalid DTS when B-frames aren't used. Using PTS for
the DTS in this case.

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agolavc/videotoolboxenc: Fix AVCodecContext.has_b_frames usage.
Rick Kern [Wed, 27 Apr 2016 14:53:08 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Fix AVCodecContext.has_b_frames usage.

Now set by the encoder, not used as an input parameter.

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agolavc/videotoolboxenc: Add entropy setting
Rick Kern [Wed, 27 Apr 2016 14:53:07 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Add entropy setting

Add an entropy setting to choose between CAVLC and CABAC.

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agolavc/videotoolboxenc: Require hardware encoding
Rick Kern [Wed, 27 Apr 2016 14:53:06 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Require hardware encoding

Software encoding can be allowed by setting allow_sw to 1.

Signed-off-by: Rick Kern <kernrj@gmail.com>