ffmpeg.git
3 months agoarm/h264dsp: change loop filter stride argument to ptrdiff_t
James Almer [Wed, 20 Feb 2019 22:38:55 +0000 (19:38 -0300)]
arm/h264dsp: change loop filter stride argument to ptrdiff_t

This was missed in d5d699ab6e6f8a8290748d107416fd5c19757a1b

Signed-off-by: James Almer <jamrial@gmail.com>
3 months agoaarch64/h264dsp: change loop filter stride argument to ptrdiff_t
James Almer [Wed, 20 Feb 2019 22:38:46 +0000 (19:38 -0300)]
aarch64/h264dsp: change loop filter stride argument to ptrdiff_t

This was missed in d5d699ab6e6f8a8290748d107416fd5c19757a1b

Signed-off-by: James Almer <jamrial@gmail.com>
3 months agoavcodec/h264_direct: Fix overflow in POC comparission
Michael Niedermayer [Wed, 13 Feb 2019 23:05:34 +0000 (00:05 +0100)]
avcodec/h264_direct: Fix overflow in POC comparission

Fixes: runtime error: signed integer overflow: 2147421862 - -33624063 cannot be represented in type 'int'
Fixes: 12885/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-5733516975800320

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agodoc/mailing-list-faq: add Mail Delivery info
Lou Logan [Wed, 20 Feb 2019 20:50:17 +0000 (11:50 -0900)]
doc/mailing-list-faq: add Mail Delivery info

Can be used as a vacation mode to enable/disable mail delivery
without needing to unsubscribe.

Signed-off-by: Lou Logan <lou@lrcd.com>
3 months agoMAINTAINERS: add myself for tonemap_opencl
Ruiling Song [Wed, 13 Feb 2019 01:29:10 +0000 (09:29 +0800)]
MAINTAINERS: add myself for tonemap_opencl

Signed-off-by: Ruiling Song <ruiling.song@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agolavf/jacosubdec: compute subtitle duration correctly
Adam Sampson [Tue, 19 Feb 2019 09:20:31 +0000 (09:20 +0000)]
lavf/jacosubdec: compute subtitle duration correctly

When a JACOsub subtitle has two timestamps, they represent its start and
end times (http://unicorn.us.com/jacosub/jscripts.html#l_times); the
duration is the difference between the two, not the sum of the two.

The subtitle end times in the FATE test for this were wrong as a result;
fix them too. (This test is based on JACOsub's demo.txt, and the end
time computed for the last line using @ now matches what the comments
there say it should be.)

Also tested in practice using MPV, a LaserDisc, and some authentic 1993
JACOsub files.

Signed-off-by: Adam Sampson <ats@offog.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agoMerge commit '90b15f60bf4919deaed66d868e18107eba371da7'
James Almer [Wed, 20 Feb 2019 18:50:06 +0000 (15:50 -0300)]
Merge commit '90b15f60bf4919deaed66d868e18107eba371da7'

* commit '90b15f60bf4919deaed66d868e18107eba371da7':
  srt: Set srto_sender flag to sender srt socket

Merged-by: James Almer <jamrial@gmail.com>
3 months agoMerge commit '156ea66c91b1986a87916f187216978d686725f6'
James Almer [Wed, 20 Feb 2019 18:47:24 +0000 (15:47 -0300)]
Merge commit '156ea66c91b1986a87916f187216978d686725f6'

* commit '156ea66c91b1986a87916f187216978d686725f6':
  h264/x86: sign extend int stride in deblock functions

This commit is a noop, see d5d699ab6e6f8a8290748d107416fd5c19757a1b

Merged-by: James Almer <jamrial@gmail.com>
3 months agoMerge commit 'eec93e57096aa4804862d62760442380c70d489b'
James Almer [Wed, 20 Feb 2019 18:43:30 +0000 (15:43 -0300)]
Merge commit 'eec93e57096aa4804862d62760442380c70d489b'

* commit 'eec93e57096aa4804862d62760442380c70d489b':
  libopenh264dec: Use a newer decoding entry point function

Merged-by: James Almer <jamrial@gmail.com>
3 months agoMerge commit '28a8b5413b64b831dfb8650208bccd8b78360484'
James Almer [Wed, 20 Feb 2019 18:42:01 +0000 (15:42 -0300)]
Merge commit '28a8b5413b64b831dfb8650208bccd8b78360484'

* commit '28a8b5413b64b831dfb8650208bccd8b78360484':
  h264/aarch64: add intra loop filter neon asm

Merged-by: James Almer <jamrial@gmail.com>
3 months agoMerge commit '846c3d6aca5484904e60946c4fe8b8833bc07f92'
James Almer [Wed, 20 Feb 2019 18:41:03 +0000 (15:41 -0300)]
Merge commit '846c3d6aca5484904e60946c4fe8b8833bc07f92'

* commit '846c3d6aca5484904e60946c4fe8b8833bc07f92':
  h264/aarch64: optimize neon loop filter

Merged-by: James Almer <jamrial@gmail.com>
3 months agoMerge commit 'd7f4f5c4a18a0c9e62635cfa6fe8a9302b413c01'
James Almer [Wed, 20 Feb 2019 18:28:25 +0000 (15:28 -0300)]
Merge commit 'd7f4f5c4a18a0c9e62635cfa6fe8a9302b413c01'

* commit 'd7f4f5c4a18a0c9e62635cfa6fe8a9302b413c01':
  checkasm/h264: add loop filter tests

Merged-by: James Almer <jamrial@gmail.com>
3 months agoavcodec/h264dsp: change loop filter stride argument to ptrdiff_t
James Almer [Wed, 20 Feb 2019 18:23:15 +0000 (15:23 -0300)]
avcodec/h264dsp: change loop filter stride argument to ptrdiff_t

3 months agoMerge commit 'bb515e3a735f526ccb1068031e289eb5aeb69e22'
James Almer [Wed, 20 Feb 2019 17:50:37 +0000 (14:50 -0300)]
Merge commit 'bb515e3a735f526ccb1068031e289eb5aeb69e22'

* commit 'bb515e3a735f526ccb1068031e289eb5aeb69e22':
  h264/aarch64: sign extend int stride in loop filter asm

Merged-by: James Almer <jamrial@gmail.com>
3 months agoMerge commit '41cf3e3b1ca375962951fde1b90a03b16197d205'
James Almer [Wed, 20 Feb 2019 17:48:58 +0000 (14:48 -0300)]
Merge commit '41cf3e3b1ca375962951fde1b90a03b16197d205'

* commit '41cf3e3b1ca375962951fde1b90a03b16197d205':
  arm: Create proper .rdata sections for COFF

Merged-by: James Almer <jamrial@gmail.com>
3 months agoMerge commit 'ca44fa5d7fda7e954f3ebfeb5b0d6d1be55fcaa3'
James Almer [Wed, 20 Feb 2019 17:47:43 +0000 (14:47 -0300)]
Merge commit 'ca44fa5d7fda7e954f3ebfeb5b0d6d1be55fcaa3'

* commit 'ca44fa5d7fda7e954f3ebfeb5b0d6d1be55fcaa3':
  avcodec/libdav1d: properly free all output picture references

This commit is a noop, see 10931a0661eea87e3a7142e15b5077e617be55e9

Merged-by: James Almer <jamrial@gmail.com>
3 months agoMerge commit '90adbf4abf336f8042aecdf1e18fdf76a96304b1'
James Almer [Wed, 20 Feb 2019 17:47:13 +0000 (14:47 -0300)]
Merge commit '90adbf4abf336f8042aecdf1e18fdf76a96304b1'

* commit '90adbf4abf336f8042aecdf1e18fdf76a96304b1':
  cook: Use the correct table for 6-bit stereo coupling

Merged-by: James Almer <jamrial@gmail.com>
3 months agoMerge commit '70ab2778be9c83dab84340af7e3ba83fa0f98576'
James Almer [Wed, 20 Feb 2019 17:02:04 +0000 (14:02 -0300)]
Merge commit '70ab2778be9c83dab84340af7e3ba83fa0f98576'

* commit '70ab2778be9c83dab84340af7e3ba83fa0f98576':
  libdav1d: update API usage to the first stable release
  libdav1d: fix build after a recent API break
  qsvenc: Add VDENC support for H264 and HEVC
  avcodec: libdav1d AV1 decoder wrapper.
  swscale: Add GRAY10
  pixfmt: Add GRAY10
  libx264: Pass the reordered_opaque field through the encoder
  libavutil: Undeprecate the AVFrame reordered_opaque field
  libaom: remove references to yuva444p pixfmt
  Revert "decode: copy the output parameters from the last bsf in the chain back to the AVCodecContext"

This commit is a noop, see
87588caf8cff318cd022ad5002304198c6ddbd51
4e9cff2824769e792c7867b09e1efb67278abe79
882ae091d48b112004b977314884176841f12cef
3f1b5ca22ec372bc6d4a45694e3070b8f5d05ad3
b5177c7051d1bece9e26d78c9978599334e90836
beaa350e24167f4ff31275a6114693f5ce7cd409
e92ce340e63058de32aec733b59fe2b196bed214

Merged-by: James Almer <jamrial@gmail.com>
3 months agoMerge commit '1ff6cb2ca6652e7d2a929afd33d8ed6268c45568'
James Almer [Wed, 20 Feb 2019 16:54:51 +0000 (13:54 -0300)]
Merge commit '1ff6cb2ca6652e7d2a929afd33d8ed6268c45568'

* commit '1ff6cb2ca6652e7d2a929afd33d8ed6268c45568':
  lavc/qsvenc_jpeg: set a default quality
  lavc/qsvenc_jpeg: add async_depth support

This commit is a noop, see
0e3d7d845d9b4596c0dac1f6e99c493af07308ae
92c25963e8b68c47055b813334eaf76599936a90

Merged-by: James Almer <jamrial@gmail.com>
3 months agoMerge commit '5584abf69d83169a010aca404cd1cf95c23ad9ef'
James Almer [Wed, 20 Feb 2019 16:51:30 +0000 (13:51 -0300)]
Merge commit '5584abf69d83169a010aca404cd1cf95c23ad9ef'

* commit '5584abf69d83169a010aca404cd1cf95c23ad9ef':
  arm: Emit .thumb_func directives

Merged-by: James Almer <jamrial@gmail.com>
3 months agodoc/libav-merge: add a line about the previous skipped merge
James Almer [Wed, 20 Feb 2019 16:51:19 +0000 (13:51 -0300)]
doc/libav-merge: add a line about the previous skipped merge

3 months agoMerge commit '04e8b8b0530e2aa33010faba3d0b6b6c9c5b704e'
James Almer [Wed, 20 Feb 2019 16:48:42 +0000 (13:48 -0300)]
Merge commit '04e8b8b0530e2aa33010faba3d0b6b6c9c5b704e'

* commit '04e8b8b0530e2aa33010faba3d0b6b6c9c5b704e':
  avcodec/libaomenc: export the Sequence Header OBU as extradata

This commit is a noop. aom_codec_get_global_headers() is buggy at the moment.
See https://bugs.chromium.org/p/aomedia/issues/detail?id=2208

Merged-by: James Almer <jamrial@gmail.com>
3 months agoMerge commit '97c9a5084479eeb66f4beb100cc7589a2c8bfe81'
James Almer [Wed, 20 Feb 2019 16:48:09 +0000 (13:48 -0300)]
Merge commit '97c9a5084479eeb66f4beb100cc7589a2c8bfe81'

* commit '97c9a5084479eeb66f4beb100cc7589a2c8bfe81':
  avcodec/libaomenc: remove AVOption related to frame partitions
  avcodec/extract_extradata: don't uninitialize the H2645Packet on every processed packet
  avcodec/extract_extradata: Move the reference in the bsf internal buffer
  avcodec/extract_extradata: Do not allocate more space than needed when removing NALUs in h264/hevc
  avcodec/extract_extradata: Zero-initialize the padding bytes in all allocated buffers
  avcodec/extract_extradata_bsf: Fix leak discovered via fuzzing
  avcodec/bsf: Add ff_bsf_get_packet_ref() function

This commit is a noop, see

7ae52f8a6b4a137f79b032b7094b3d5867839d52
5a412a5c3cc216ae1d15e6b884bda7214b73a5b0
d168e78effd170377ec57f67bca05c9f0de91bca
2536bd863246218631ab27144d8a3be45036445a
9c6dd9d6248897a2d8dd4ede948c166e5a579a4b
016d40011ac2815157fc11f6dda2f9bfb520ecfe
b69ea742ab23ad74b2ae2772764743642212a139

Merged-by: James Almer <jamrial@gmail.com>
3 months agoaarch64: vp8: Move the vp8dsp makefile entries to the right places
Martin Storsjö [Thu, 31 Jan 2019 21:03:55 +0000 (23:03 +0200)]
aarch64: vp8: Move the vp8dsp makefile entries to the right places

Even if NEON would be disabled, the init functions should be built
as they are called as long as ARCH_AARCH64 is set.

These functions are part of a generic DSP subsytem, not tied directly
to one decoder. (They should be built if the vp7 decoder is enabled,
even if the vp8 decoder is disabled.)

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit b4b27dce95a6d40bfcd78043d3abec7d80dae143)

3 months agoaarch64: vp8: Remove superfluous includes
Martin Storsjö [Thu, 31 Jan 2019 21:03:38 +0000 (23:03 +0200)]
aarch64: vp8: Remove superfluous includes

This fixes building with MSVC, which lacks unistd.h.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit ad32f7b1264dbc614f0db1c443d5361420e9e07e)

3 months agoaarch64: vp8: Fix assembling with armasm64
Martin Storsjö [Thu, 31 Jan 2019 21:49:31 +0000 (23:49 +0200)]
aarch64: vp8: Fix assembling with armasm64

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 2eeac79936e83c4495cbe5905064ab797e9b45ff)

3 months agoaarch64: vp8: Fix assembling with clang
Martin Storsjö [Thu, 31 Jan 2019 21:43:45 +0000 (23:43 +0200)]
aarch64: vp8: Fix assembling with clang

This also partially fixes assembling with MS armasm64 (via
gas-preprocessor).

The movrel macro invocations need to pass the offset via a separate
parameter. Mach-o and COFF relocations don't allow a negative
offset to a symbol, which is handled properly if the offset is passed
via the parameter. If no offset parameter is given, the macro
evaluates to something like "adrp x17, subpel_filters-16+(0)", which
older clang versions also fail to parse (the older clang versions
only support one single offset term, although it can be a parenthesis.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 26d7af4c381ee3c7b13b032b3817168b84b98ca6)

3 months agopalettegen: Fill with last color, not black
Tomas Härdin [Wed, 16 Jan 2019 12:07:48 +0000 (13:07 +0100)]
palettegen: Fill with last color, not black

If we fill with black then the generated palette will have one color more
than what the user requested. This also resulted in unwanted black specks in
the output of paletteuse, especially when generating small palettes.

3 months agolibavcodec/zmbvenc: motion estimation improvements/bug fixes:
Matthew Fearnley [Thu, 7 Feb 2019 12:54:59 +0000 (12:54 +0000)]
libavcodec/zmbvenc: motion estimation improvements/bug fixes:

- Clamp ME range to -64..63 (prevents corruption when me_range is too high)
- Allow MV's up to *and including* the positive range limit
- Allow out-of-edge ME by padding the prev buffer with a border of 0's
- Try previous MV before checking the rest (improves speed in some cases)
- More robust logic in code - ensure *mx,*my,*xored are updated together

3 months agolibavcodec/zmbvenc: block scoring improvements/bug fixes
Matthew Fearnley [Sat, 9 Feb 2019 13:10:20 +0000 (13:10 +0000)]
libavcodec/zmbvenc: block scoring improvements/bug fixes

- Improve block choices by counting 0-bytes in the entropy score
- Make histogram use uint16_t type, to allow byte counts from 16*16
(current block size) up to 255*255 (maximum allowed 8bpp block size)
- Make sure score table is big enough for a full block's worth of bytes
- Calculate *xored without using code in inner loop

3 months agolavc/libdavs2: fix parameter setting error
hwren [Thu, 24 Jan 2019 15:16:18 +0000 (23:16 +0800)]
lavc/libdavs2: fix parameter setting error

Signed-off-by: hwrenx <hwrenx@126.com>
3 months agolavc/libxavs2: use upper layer qp parameters first
hwren [Thu, 24 Jan 2019 15:16:17 +0000 (23:16 +0800)]
lavc/libxavs2: use upper layer qp parameters first

Signed-off-by: hwrenx <hwrenx@126.com>
3 months agolavc/libxavs2: remove unused context parameter
hwren [Thu, 24 Jan 2019 15:16:16 +0000 (23:16 +0800)]
lavc/libxavs2: remove unused context parameter

Signed-off-by: hwrenx <hwrenx@126.com>
3 months agolavf/mpeg: fix indent
Xiaofeng Wang [Mon, 18 Feb 2019 01:16:58 +0000 (09:16 +0800)]
lavf/mpeg: fix indent

Signed-off-by: Xiaofeng Wang <xiaofeng.wang@bqvision.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agoavformat/matroskadec: Check parents remaining length
Steve Lhomme [Wed, 13 Feb 2019 12:20:45 +0000 (13:20 +0100)]
avformat/matroskadec: Check parents remaining length

This was found through the Hacker One program on VLC but is not a security issue in libavformat
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agoavformat/webmdashenc: Check id in adaption_sets
Michael Niedermayer [Wed, 13 Feb 2019 09:15:04 +0000 (10:15 +0100)]
avformat/webmdashenc: Check id in adaption_sets

Fixes: out of array access

Found-by: Wenxiang Qian
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agoavformat/http: Fix Out-of-Bounds access in process_line()
Wenxiang Qian [Wed, 13 Feb 2019 07:54:08 +0000 (08:54 +0100)]
avformat/http: Fix Out-of-Bounds access in process_line()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agoavformat/ftp: Fix Out-of-Bounds Access and Information Leak in ftp.c:393
Wenxiang Qian [Wed, 13 Feb 2019 07:47:20 +0000 (08:47 +0100)]
avformat/ftp: Fix Out-of-Bounds Access and Information Leak in ftp.c:393

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agoavcodec/htmlsubtitles: Fixes denial of service due to use of sscanf in inner loop...
Kevin Backhouse via RT [Wed, 6 Feb 2019 12:56:01 +0000 (12:56 +0000)]
avcodec/htmlsubtitles: Fixes denial of service due to use of sscanf in inner loop for handling braces

Fixes: [Semmle Security Reports #19439]
Fixes: dos_sscanf2.mkv

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agoavcodec/htmlsubtitles: Fixes denial of service due to use of sscanf in inner loop...
Kevin Backhouse via RT [Wed, 6 Feb 2019 11:29:22 +0000 (11:29 +0000)]
avcodec/htmlsubtitles: Fixes denial of service due to use of sscanf in inner loop for tag scaning

Fixes: [Semmle Security Reports #19438]
Fixes: dos_sscanf1.mkv

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agoavcodec/mpegvideo_enc: Use av_assert1() instead of assert()
Michael Niedermayer [Fri, 1 Feb 2019 21:53:53 +0000 (22:53 +0100)]
avcodec/mpegvideo_enc: Use av_assert1() instead of assert()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agoavformat/matroskadec: Do not leak queued packets on sync errors
Michael Niedermayer [Wed, 6 Feb 2019 14:29:38 +0000 (15:29 +0100)]
avformat/matroskadec: Do not leak queued packets on sync errors

Fixes: memleak
Fixes: clusterfuzz-testcase-minimized-audio_decoder_fuzzer-5649187601121280

Reported-by: Chris Cunningham <chcunningham@google.com>
Tested-by: Chris Cunningham <chcunningham@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agodoc/fftools-common-opts: add example for codec option stream specifiers
Gyan Doshi [Sun, 17 Feb 2019 05:58:31 +0000 (11:28 +0530)]
doc/fftools-common-opts: add example for codec option stream specifiers

3 months agodoc/muxers: grammar fix
Reto Kromer [Wed, 13 Feb 2019 16:03:07 +0000 (17:03 +0100)]
doc/muxers: grammar fix

Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
3 months agolavc/libgsmenc: Force mono and use 13k as default bitrate.
Carl Eugen Hoyos [Sat, 16 Feb 2019 19:18:07 +0000 (20:18 +0100)]
lavc/libgsmenc: Force mono and use 13k as default bitrate.

3 months agoavcodec/mips: [loongson] optimize theora decoding with mmi.
gxw [Tue, 12 Feb 2019 10:55:48 +0000 (18:55 +0800)]
avcodec/mips: [loongson] optimize theora decoding with mmi.

Optimize theora decoding with mmi in functions:
1. ff_vp3_idct_add_mmi
2. ff_vp3_idct_put_mmi
3. ff_vp3_idct_dc_add_mmi
4. ff_put_no_rnd_pixels_l2_mmi

Theora decoding speed improved about 32%(from 88fps to 116fps, Tested on loongson 3A3000).

Reviewed-by: Shiyou Yin <yinshiyou-hf@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agoavcodec/mpeg4videodec: Clear interlaced_dct for studio profile
Michael Niedermayer [Fri, 15 Feb 2019 00:57:09 +0000 (01:57 +0100)]
avcodec/mpeg4videodec: Clear interlaced_dct for studio profile

Fixes: Out of array access
Fixes: 13090/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5408668986638336

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 months agoavcodec/version: Bump micro-version for nvdec/cuviddec changes
Philip Langdale [Sat, 16 Feb 2019 18:40:32 +0000 (10:40 -0800)]
avcodec/version: Bump micro-version for nvdec/cuviddec changes

I forgot to add the version bump and changelog within the changes.

3 months agoavcodec/cuviddec: Add support for decoding HEVC 4:4:4 content
Philip Langdale [Sun, 7 Oct 2018 16:10:00 +0000 (09:10 -0700)]
avcodec/cuviddec: Add support for decoding HEVC 4:4:4 content

This is the equivalent change for cuviddec after the previous change
for nvdec. I made similar changes to the copying routines to handle
pixel formats in a more generic way.

Note that unlike with nvdec, there is no confusion about the ability
of a codec to output 444 formats. This is because the cuvid parser is
used, meaning that 444 JPEG content is still indicated as using a 420
output format.

3 months agoavcodec/nvdec: Explicitly mark codecs that support 444 output formats
Philip Langdale [Sun, 7 Oct 2018 03:20:58 +0000 (20:20 -0700)]
avcodec/nvdec: Explicitly mark codecs that support 444 output formats

With the introduction of HEVC 444 support, we technically have two
codecs that can handle 444 - HEVC and MJPEG. In the case of MJPEG,
it can decode, but can only output one of the semi-planar formats.

That means we need additional logic to decide whether to use a
444 output format or not.

3 months agoavcodec/nvdec: Add support for decoding HEVC 4:4:4 content
Philip Langdale [Sun, 7 Oct 2018 01:11:52 +0000 (18:11 -0700)]
avcodec/nvdec: Add support for decoding HEVC 4:4:4 content

The latest generation video decoder on the Turing chips supports
decoding HEVC 4:4:4. Supporting this is relatively straight-forward;
we need to account for the different chroma format and pick the
right output and sw formats at the right times.

There was one bug which was the hard-coded assumption that the
first chroma plane would be half-height; I fixed this to use the
actual shift value on the plane.

We also need to pass the SPS and PPS range extension flags.

3 months agoavcodec/hevc_ps: Expose all SPS and PPS range extension flags
Philip Langdale [Wed, 13 Feb 2019 20:40:52 +0000 (12:40 -0800)]
avcodec/hevc_ps: Expose all SPS and PPS range extension flags

We need all the flags to be exposed to be able to pass them on to
HW decoders. I did not attempt to nuance any of the warnings about
flags being unsupported as there's no way, at the point we extract
flags, to say whether an HW decoder is being used.

4 months agoavutil/cuda_check: fix usage of removed .c file
Timo Rothenpieler [Thu, 14 Feb 2019 23:37:49 +0000 (00:37 +0100)]
avutil/cuda_check: fix usage of removed .c file

Why did this not break compilation?

4 months agoavformat/mov: Do not use reference stream in mov_read_sidx() if there is no reference...
Michael Niedermayer [Tue, 12 Feb 2019 22:28:35 +0000 (23:28 +0100)]
avformat/mov: Do not use reference stream in mov_read_sidx() if there is no reference stream

Fixes: NULL pointer dereference
Fixes: clusterfuzz-testcase-minimized-audio_decoder_fuzzer-5634316373721088

Reported-by: Chris Cunningham <chcunningham@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavcodec/nvenc: add b_as_ref support for HEVC
Roman Arzumanyan [Thu, 14 Feb 2019 12:20:25 +0000 (13:20 +0100)]
avcodec/nvenc: add b_as_ref support for HEVC

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
4 months agoavutil/cuda_check: avoid pointlessly exporting same symbol from two libraries
Timo Rothenpieler [Fri, 8 Feb 2019 21:47:01 +0000 (22:47 +0100)]
avutil/cuda_check: avoid pointlessly exporting same symbol from two libraries

4 months agoavformat/utils: parse some stream specifiers recursively
Marton Balint [Mon, 4 Feb 2019 23:16:36 +0000 (00:16 +0100)]
avformat/utils: parse some stream specifiers recursively

This removes lots of code duplication and also allows more complex specifiers,
for example you can use p:204:a:m:language:eng to select the English language
audio stream from program 204.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoavformat/mpegts: also convert strings without a specified encoding to UTF-8
Marton Balint [Sat, 9 Feb 2019 23:33:04 +0000 (00:33 +0100)]
avformat/mpegts: also convert strings without a specified encoding to UTF-8

The default codepage (ISO6937) should be used in this case.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoavformat/mpegts: fix charset of type 0x11
Marton Balint [Sat, 9 Feb 2019 23:25:05 +0000 (00:25 +0100)]
avformat/mpegts: fix charset of type 0x11

ISO-10646 alone means UCS-4 for iconv, the specs refers to the Basic
Multilingual Plane (BMP), therefore we need UCS-2. VLC also using that.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agodoc/muxers: fix typo
Reto Kromer [Wed, 13 Feb 2019 13:08:23 +0000 (14:08 +0100)]
doc/muxers: fix typo

Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
4 months agoavfilter/tests/integral: Correct the comment
Jun Zhao [Wed, 13 Feb 2019 11:59:39 +0000 (19:59 +0800)]
avfilter/tests/integral: Correct the comment

Correct the comment

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
4 months agoconfigure: fix dependencies for mlp and truehd encoders
Moritz Barsnick [Tue, 12 Feb 2019 16:51:26 +0000 (17:51 +0100)]
configure: fix dependencies for mlp and truehd encoders

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
4 months agolavc/libaribb24: use integer math to calculate font scaling
Jan Ekström [Mon, 11 Feb 2019 01:01:51 +0000 (03:01 +0200)]
lavc/libaribb24: use integer math to calculate font scaling

4 months agolavc/libaribb24: add missing type struct members to AVOptions
Jan Ekström [Mon, 11 Feb 2019 00:09:48 +0000 (02:09 +0200)]
lavc/libaribb24: add missing type struct members to AVOptions

4 months agolavc/libaribb24: protect handled value with parenthesis in RGB_TO_BGR
Jan Ekström [Mon, 11 Feb 2019 00:06:37 +0000 (02:06 +0200)]
lavc/libaribb24: protect handled value with parenthesis in RGB_TO_BGR

4 months agolavc/libaribb24: add error handling to region handling
Jan Ekström [Sun, 10 Feb 2019 23:54:26 +0000 (01:54 +0200)]
lavc/libaribb24: add error handling to region handling

Fixes some rather embarrassing mistakes that somehow passed my
eyes.

* Now catches if memory allocation has failed during bprint usage
  by checking av_bprint_is_complete().
* Now catches if adding an ASS rectangle into an AVSubtitle failed.
* Returns AVERROR_INVALIDDATA if we get an invalid region buffer
  length.

4 months agotests/api/api-h264-test: Add AV_NOPTS_VALUE check for AVFrame.pkt_dts/pts
Jun Zhao [Tue, 12 Feb 2019 06:16:57 +0000 (14:16 +0800)]
tests/api/api-h264-test: Add AV_NOPTS_VALUE check for AVFrame.pkt_dts/pts

Use av_ts2str() for AVFrame.pkt_dts/pts to avoid print the
pkt_dts/pts as negative number like:
"0,    3616613, -9223372036854775808,     1001,  3110400, 0x75e37a65"

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Jun Zhao <mypopydev@gmail.com>
4 months agosrt: Set srto_sender flag to sender srt socket
Sven Dueking [Thu, 7 Feb 2019 08:38:16 +0000 (09:38 +0100)]
srt: Set srto_sender flag to sender srt socket

SRT API Documentation:
This flag is superfluous if both parties are at least version 1.3.0
(this shall be enforced by setting this value to SRTO_MINVERSION if
you expect that it be true) and therefore support HSv5 handshake,
where the SRT extended handshake is done with the overall handshake
process.

This flag is however obligatory if at least one party may be using
SRT below version 1.3.0 and does not support HSv5.

4 months agoavfilter/tests/integral: Fix build warning after adjust the location
Jun Zhao [Sun, 10 Feb 2019 06:28:22 +0000 (14:28 +0800)]
avfilter/tests/integral: Fix build warning after adjust the location

Fix build warning like "warning: ISO C90 forbids mixed declarations
and code" after adjust the location for malloc fail check.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Jun Zhao <mypopydev@gmail.com>
4 months agoavfilter/tests/integral: Check malloc fail before using it
Jun Zhao [Sun, 10 Feb 2019 04:57:44 +0000 (12:57 +0800)]
avfilter/tests/integral: Check malloc fail before using it

Need to check malloc fail before using it, so adjust the location
in the code.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Jun Zhao <mypopydev@gmail.com>
4 months agoconfigure: warn about disabled explicitly enabled components
Marton Balint [Mon, 28 Jan 2019 00:49:46 +0000 (01:49 +0100)]
configure: warn about disabled explicitly enabled components

If we enable a component but a dependant library is disabled, then the enabled
component gets silently disabled. Warning about disabled explicitly enabled components
allows configure to show the missing dependencies and if --fatal-warnings is
used it can also fail if the user wants it so.

For example if libdav1d is not availble ./configure --enable-decoder=libdav1d
succeeds but the libdav1d decoder is not be enabled. After the patch configure
will warn about this:

WARNING: Disabled libdav1d_decoder because not all dependencies are satisfied: libdav1d

Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoavformat/mov: fix hang while seek on a kind of fragmented mp4
Charles Liu [Sun, 3 Feb 2019 15:09:06 +0000 (23:09 +0800)]
avformat/mov: fix hang while seek on a kind of fragmented mp4

Binary searching would hang if the fragment items do NOT have timestamp for the
specified stream.

For example, a fmp4 consists of separated 'moof' boxes for each track, and
separated 'sidx' for each segment, but no 'mfra' box.  Then every fragment item
only have the timestamp for one of its tracks.

Example:
ffmpeg -f lavfi -i testsrc -f lavfi -i sine -movflags dash+frag_keyframe+skip_trailer+separate_moof -t 1 out.mp4
ffmpeg -ss 0.5 -i out.mp4 -f null none

Also fixes the hang in ticket #7572, but not the reason for having
AV_NOPTS_VALUE timestamps there.

Signed-off-by: Charles Liu <liuchh83@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoavformat/mov: don't rescale mastering display values from the SmDm atom
James Almer [Sat, 9 Feb 2019 23:14:14 +0000 (20:14 -0300)]
avformat/mov: don't rescale mastering display values from the SmDm atom

Simplifies code.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 months agodoc/faq: update macOS and URLs
Reto Kromer [Sun, 10 Feb 2019 16:44:10 +0000 (17:44 +0100)]
doc/faq: update macOS and URLs

Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
4 months agoavcodec/cbs_av1: don't call cbs_av1_read_trailing_bits() when no bits remain in the OBU
James Almer [Sun, 10 Feb 2019 20:41:38 +0000 (17:41 -0300)]
avcodec/cbs_av1: don't call cbs_av1_read_trailing_bits() when no bits remain in the OBU

Reviewed-by: jkqxz
Signed-off-by: James Almer <jamrial@gmail.com>
4 months agolavf/img2: Move "loop" into common options.
Carl Eugen Hoyos [Sun, 10 Feb 2019 17:56:46 +0000 (18:56 +0100)]
lavf/img2: Move "loop" into common options.

While the image2pipe demuxer ignores the option - confusing users -
the autodetecting demuxers that are favoured over image2 act on it.

4 months agolavf/img2dec: Split img2 and img2pipe options.
Carl Eugen Hoyos [Sun, 10 Feb 2019 16:56:01 +0000 (17:56 +0100)]
lavf/img2dec: Split img2 and img2pipe options.

4 months agodoc/snow: fix typos
Reto Kromer [Sun, 10 Feb 2019 12:24:05 +0000 (13:24 +0100)]
doc/snow: fix typos

4 months agodoc: fix various typos
Moritz Barsnick [Sun, 10 Feb 2019 11:10:20 +0000 (12:10 +0100)]
doc: fix various typos

Found with the help of codespell-1.14.0.

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
4 months agodoc/filters: fix typos
Reto Kromer [Sun, 10 Feb 2019 05:59:09 +0000 (06:59 +0100)]
doc/filters: fix typos

Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
4 months agoavformat/hlsenc: fix fmp4_init_filename file name with %v problem
Steven Liu [Sat, 19 Jan 2019 06:59:44 +0000 (14:59 +0800)]
avformat/hlsenc: fix fmp4_init_filename file name with %v problem

when set option fmp4_init_filename to init_%v.mp4
before patch:
the init file will be init_%v_0.mp4, init_%v_1.mp4
after patch:
the init file will be init_0.mp4, init_1.mp4

Reported-By: Gyan Doshi <ffmpeg@gyani.pro>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
4 months agolavf/mpegts: add reading of ARIB data coding descriptor
Jan Ekström [Mon, 14 Jan 2019 20:07:51 +0000 (22:07 +0200)]
lavf/mpegts: add reading of ARIB data coding descriptor

This enables us to read the data coding type utilized for
a specific private data stream, of which we currently are
interested in ARIB caption streams.

The component tag limitations are according to ARIB TR-B14,
and the component IDs are defined in ARIB STD-B10.

4 months agoadd libaribb24 ARIB STD-B24 caption decoder
Jan Ekström [Mon, 14 Jan 2019 19:52:23 +0000 (21:52 +0200)]
add libaribb24 ARIB STD-B24 caption decoder

* Outputs ASS lines with basic coloring and font scaling for each
  given region.
* Sets the default style to the resolution of the subtitle plane
  (for example, 960x540 / 36pt font for profile A).
* Has options to:
  * Disable ruby text (which is coded as regions which have
    half-height text in libaribb24).
    Enabled by default as without positioning ruby text only
    confuses as it is usually coded in the beginning of the decoded
    subtitle line.
  * Set the working directory, in which libaribb24 will read
    configuration as well as into which it may save broadcast extra
    symbols as PNG.
    Unset by default.

The unconventional library check can be explained by the library's
current master branch being licensed as LGPLv3, but at the time of
writing the latest official release is still licensed under GPLv3.

Thus, one either has to wait for the following release, or enable
GPLv3.

4 months agolavf/mpegts: Convert service_name and service_provider to utf-8.
Carl Eugen Hoyos [Sat, 9 Feb 2019 17:38:13 +0000 (18:38 +0100)]
lavf/mpegts: Convert service_name and service_provider to utf-8.

Fixes ticket #6320.

4 months agodoc/ffprobe: fix typo and update URL in man
Reto Kromer [Sat, 9 Feb 2019 18:07:46 +0000 (19:07 +0100)]
doc/ffprobe: fix typo and update URL in man

4 months agotools/target_dec_fate.list: Extend selftests upto issue 2000
Michael Niedermayer [Sun, 3 Feb 2019 14:34:40 +0000 (15:34 +0100)]
tools/target_dec_fate.list: Extend selftests upto issue 2000

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavcodec/sbrdsp_fixed.c: remove input value limit for sbr_sum_square_c()
Michael Niedermayer [Sun, 3 Feb 2019 14:13:03 +0000 (15:13 +0100)]
avcodec/sbrdsp_fixed.c: remove input value limit for sbr_sum_square_c()

Fixes: 1377/clusterfuzz-testcase-minimized-5487049807233024
Fixes: assertion failure in sbr_sum_square_c()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agolavu/parseutils: Allow to parse >= 100 hours.
Carl Eugen Hoyos [Sat, 9 Feb 2019 00:20:43 +0000 (01:20 +0100)]
lavu/parseutils: Allow to parse >= 100 hours.

Reported and tested by gamnark.
Fixes ticket #7721.

4 months agoavcodec/h264_parse: Clear ref_list[1] if only [0] is used
Michael Niedermayer [Fri, 8 Feb 2019 10:04:54 +0000 (11:04 +0100)]
avcodec/h264_parse: Clear ref_list[1] if only [0] is used

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavcodec/h264_parse: no need check ref list1 for P slices.
Decai Lin [Thu, 31 Jan 2019 07:36:56 +0000 (15:36 +0800)]
avcodec/h264_parse: no need check ref list1 for P slices.

This is robust for some corner case there is incorrect list1 count
in pps header, but it's a P slice and can be decoded well.

Signed-off-by: Decai Lin <decai.lin@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavformat/mov: validate chunk_count vs stsc_data
chcunningham [Thu, 7 Feb 2019 22:58:17 +0000 (14:58 -0800)]
avformat/mov: validate chunk_count vs stsc_data

Bad content may contain stsc boxes with a first_chunk index that
exceeds stco.entries (chunk_count). This ammends the existing check to
include cases where chunk_count == 0. It also patches up the case
when stsc refers to unknown chunks, but stts has no samples (so we
can simply ignore stsc).

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavformat/mov.c: require tfhd to begin parsing trun
chcunningham [Thu, 7 Feb 2019 00:12:51 +0000 (16:12 -0800)]
avformat/mov.c: require tfhd to begin parsing trun

Detecting missing tfhd avoids re-using tfhd track info from the previous
moof. For files with multiple tracks, this may make a mess of the
avindex and fragindex, which can later trigger av_assert0 in
mov_read_trun().

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoffplay: add support for setting the number of filter threads
Marton Balint [Sat, 2 Feb 2019 19:30:16 +0000 (20:30 +0100)]
ffplay: add support for setting the number of filter threads

Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoffplay: add missing avfilter_graph_alloc result check
Marton Balint [Sat, 2 Feb 2019 18:33:34 +0000 (19:33 +0100)]
ffplay: add missing avfilter_graph_alloc result check

Also do not allocate a graph at start, we will reallocate it anyway.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoffplay: use different decoder names for each media type
Marton Balint [Sat, 2 Feb 2019 10:32:50 +0000 (11:32 +0100)]
ffplay: use different decoder names for each media type

Signed-off-by: Marton Balint <cus@passwd.hu>
4 months agoavformat/movenc: Add more error checking when writing sample entries.
Nikolas Bowe [Tue, 5 Feb 2019 01:02:19 +0000 (17:02 -0800)]
avformat/movenc: Add more error checking when writing sample entries.

Fixes a problem where a sample entry which cannot be written correctly appears to succeed, but produces an invalid file.
For example, this command:
ffmpeg -f lavfi -i sine=frequency=1000:duration=5 -codec:a ac3 -movflags +empty_moov -frag_duration 5000000 /tmp/foo.mp4
produced a file with the ac-3 sample entry, but no AC3SpecificBox (dac3) child, which is invalid according to ETSI TS 102 366.

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavcodec/mpegvideo_enc: Use av_assert1() instead of assert() in merge_context_after_en...
Michael Niedermayer [Fri, 1 Feb 2019 16:08:35 +0000 (17:08 +0100)]
avcodec/mpegvideo_enc: Use av_assert1() instead of assert() in merge_context_after_encode()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agoavcodec/ac3: Explicitly return to discard large amounts of nonsense bytes
Michael Niedermayer [Wed, 30 Jan 2019 23:45:51 +0000 (00:45 +0100)]
avcodec/ac3: Explicitly return to discard large amounts of nonsense bytes

Changes 19sec to 10ms (12559) runtime, 17sec to 177ms (12570)
Fixes: Timeout
Fixes: 12559/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AC3_fuzzer-5666516266123264
Fixes: 12561/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AC3_FIXED_fuzzer-5682923041193984
Fixes: 12570/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EAC3_fuzzer-5194734308425728

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 months agolibavformat/dashdec: disable seeking only for live streams.
Paweł Wegner [Mon, 4 Feb 2019 20:27:29 +0000 (21:27 +0100)]
libavformat/dashdec: disable seeking only for live streams.

Signed-off-by: Paweł Wegner <pawel.wegner95@gmail.com>
4 months agolibswscale/ppc: VSX-optimize 9-16 bit yuv2planeX
Lauri Kasanen [Sun, 13 Jan 2019 08:26:20 +0000 (10:26 +0200)]
libswscale/ppc: VSX-optimize 9-16 bit yuv2planeX

./ffmpeg_g -f rawvideo -pix_fmt rgb24 -s hd1080 -i /dev/zero -pix_fmt yuv420p16be \
-s 1920x1728 -f null -vframes 100 -v error -nostats -

9-14 bit funcs get about 6x speedup, 16-bit gets about 15x.
Fate passes, each format tested with an image to video conversion.

Only POWER8 includes 32-bit vector multiplies, so POWER7 is locked out
of the 16-bit function. This includes the vec_mulo/mule functions too,
not just vmuluwm.

With TIMER_REPORT skips disabled:
yuv420p9le
  12412 UNITS in planarX,  131072 runs,      0 skips
  73136 UNITS in planarX,  131072 runs,      0 skips
yuv420p9be
  12481 UNITS in planarX,  131072 runs,      0 skips
  73410 UNITS in planarX,  131072 runs,      0 skips
yuv420p10le
  12322 UNITS in planarX,  131072 runs,      0 skips
  72546 UNITS in planarX,  131072 runs,      0 skips
yuv420p10be
  12291 UNITS in planarX,  131072 runs,      0 skips
  72935 UNITS in planarX,  131072 runs,      0 skips
yuv420p12le
  12316 UNITS in planarX,  131072 runs,      0 skips
  72708 UNITS in planarX,  131072 runs,      0 skips
yuv420p12be
  12319 UNITS in planarX,  131072 runs,      0 skips
  72577 UNITS in planarX,  131072 runs,      0 skips
yuv420p14le
  12259 UNITS in planarX,  131072 runs,      0 skips
  72516 UNITS in planarX,  131072 runs,      0 skips
yuv420p14be
  12440 UNITS in planarX,  131072 runs,      0 skips
  72962 UNITS in planarX,  131072 runs,      0 skips
yuv420p16le
  10548 UNITS in planarX,  131072 runs,      0 skips
  73429 UNITS in planarX,  131072 runs,      0 skips
yuv420p16be
  10634 UNITS in planarX,  131072 runs,      0 skips
 150959 UNITS in planarX,  131072 runs,      0 skips

Signed-off-by: Lauri Kasanen <cand@gmx.com>