ffmpeg.git
2 years agodashenc: don't write header data before the first packet arrives
Peter Große [Thu, 26 Oct 2017 15:58:37 +0000 (17:58 +0200)]
dashenc: don't write header data before the first packet arrives

Fixes: 1b8ef01f04ab ("dashenc: add webm support")
Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodashenc: set DASH related options for the subsequent matroska muxer when using webm
Peter Große [Sun, 29 Oct 2017 15:10:36 +0000 (16:10 +0100)]
dashenc: set DASH related options for the subsequent matroska muxer when using webm

This patch is inspired by the ffmpeg webm_chunk muxer and fixes that all resulting
tracks have the same track number.

Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodashenc: fix bitrate estimation with correct scaling
Anton Schubert [Sun, 29 Oct 2017 15:10:34 +0000 (16:10 +0100)]
dashenc: fix bitrate estimation with correct scaling

Signed-off-by: Anton Schubert <ischluff@mailbox.org>
Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolavf/rtpenc: Add support for 24 bit pcm encoding as defined by RFC 3190.
Carl Eugen Hoyos [Tue, 24 Oct 2017 21:03:02 +0000 (23:03 +0200)]
lavf/rtpenc: Add support for 24 bit pcm encoding as defined by RFC 3190.

Fixes ticket #6770.

2 years agolibavcodec/bswapdsp : add AVX2 func for bswap_buf (swap uint32_t)
Martin Vignali [Sun, 22 Oct 2017 17:06:50 +0000 (19:06 +0200)]
libavcodec/bswapdsp : add AVX2 func for bswap_buf (swap uint32_t)

2 years agolsws/yuv2rgb: Fix yuva2rgb32 on big endian hardware.
Carl Eugen Hoyos [Sat, 28 Oct 2017 23:40:18 +0000 (01:40 +0200)]
lsws/yuv2rgb: Fix yuva2rgb32 on big endian hardware.

2 years agoavformat/avformat.h: fix pairs typo
James Almer [Sun, 29 Oct 2017 13:35:40 +0000 (10:35 -0300)]
avformat/avformat.h: fix pairs typo

Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavformat: deprecate getters and setters for AVFormatContext and AVStream fields
James Almer [Mon, 23 Oct 2017 14:39:08 +0000 (11:39 -0300)]
avformat: deprecate getters and setters for AVFormatContext and AVStream fields

The fields can be accessed directly, so these are not needed anymore.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavformat: move public AVStream fields up in the struct
James Almer [Mon, 23 Oct 2017 14:28:07 +0000 (11:28 -0300)]
avformat: move public AVStream fields up in the struct

Remove the silly second notice.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavutil/frame: deprecate getters and setters for AVFrame fields
James Almer [Mon, 23 Oct 2017 14:10:48 +0000 (11:10 -0300)]
avutil/frame: deprecate getters and setters for AVFrame fields

The fields can be accessed directly, so these are not needed anymore.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/magicyuvenc: improve compression
Paul B Mahol [Sun, 29 Oct 2017 11:13:54 +0000 (12:13 +0100)]
avcodec/magicyuvenc: improve compression

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agolibavcodec/magicyuv : remove unneed variable assignment
Martin Vignali [Sat, 28 Oct 2017 21:17:44 +0000 (23:17 +0200)]
libavcodec/magicyuv : remove unneed variable assignment

2 years agoavformat/hlsenc: reindent hlsenc code
Steven Liu [Sun, 29 Oct 2017 04:32:24 +0000 (12:32 +0800)]
avformat/hlsenc: reindent hlsenc code

Signed-off-by: Steven Liu <lq@onvideo.cn>
2 years agoavformat/hlsenc: fix missing first segment bug in fmp4 mode
Steven Liu [Sun, 29 Oct 2017 04:31:49 +0000 (12:31 +0800)]
avformat/hlsenc: fix missing first segment bug in fmp4 mode

fix ticket id: #6776
fix code logic error, need not check first segment.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2 years agoavformat/hlsenc: fix base_output_dirname is null when basename_size is 0 bug
Steven Liu [Sun, 29 Oct 2017 04:30:44 +0000 (12:30 +0800)]
avformat/hlsenc: fix base_output_dirname is null when basename_size is 0 bug

fix ticket id: #6777
when use argument hls_segment_filename, the basename_size will be 0

Signed-off-by: Steven Liu <lq@onvideo.cn>
2 years agoavformat: remove use of deprecated AVFMT_FLAG_KEEP_SIDE_DATA flag
James Almer [Sun, 29 Oct 2017 02:47:22 +0000 (23:47 -0300)]
avformat: remove use of deprecated AVFMT_FLAG_KEEP_SIDE_DATA flag

It has no effect whatsoever since the major bump.
Replace the flag's documentation to reflect this as well.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agolavfi/palettegen: Fix compilation after 1da8c4e.
Carl Eugen Hoyos [Sun, 29 Oct 2017 00:35:36 +0000 (02:35 +0200)]
lavfi/palettegen: Fix compilation after 1da8c4e.

Found-by: James Almer
2 years agolavfi/palettegen: Allow setting the background colour.
Carl Eugen Hoyos [Tue, 17 Oct 2017 21:39:59 +0000 (23:39 +0200)]
lavfi/palettegen: Allow setting the background colour.

2 years agoMerge commit '8fd8f91e47f33cd82371a97ac81afc476144964f'
James Almer [Sat, 28 Oct 2017 21:30:31 +0000 (18:30 -0300)]
Merge commit '8fd8f91e47f33cd82371a97ac81afc476144964f'

* commit '8fd8f91e47f33cd82371a97ac81afc476144964f':
  qsvenc: Make sure the interlaced encoding works
  qsvenc: Use MFXVideoENCODE_Query() to update the parameters

This commit is a noop, see
dd8319767e1674d030b5d803c43029e67db5efb8
ae5b67ee64bec00c52881ff8426fddaf477341c1

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'e00db9f78bb475ed5103364f61892f4e75ef89ba'
James Almer [Sat, 28 Oct 2017 21:18:41 +0000 (18:18 -0300)]
Merge commit 'e00db9f78bb475ed5103364f61892f4e75ef89ba'

* commit 'e00db9f78bb475ed5103364f61892f4e75ef89ba':
  checkasm: hevc: Add a hevc_ prefix to the add_residual functions

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '1731c3530bffb876deb9e00dfffdf9841a8412cd'
James Almer [Sat, 28 Oct 2017 21:16:01 +0000 (18:16 -0300)]
Merge commit '1731c3530bffb876deb9e00dfffdf9841a8412cd'

* commit '1731c3530bffb876deb9e00dfffdf9841a8412cd':
  mm: Skip unexpected audio packets

This commit is a noop. The generic code already drops packets from
non-existant streams.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f2c469b73f8ac3dd6a98d38281f61b68ea6dd336'
James Almer [Sat, 28 Oct 2017 21:08:41 +0000 (18:08 -0300)]
Merge commit 'f2c469b73f8ac3dd6a98d38281f61b68ea6dd336'

* commit 'f2c469b73f8ac3dd6a98d38281f61b68ea6dd336':
  mjpeg: Report non-3 component rgb lossless as not supported

[15:56:27] <jamrial> michaelni: can't reproduce the failure f2c469b73f is trying to "fix"
[15:56:30] <jamrial> do we support what that commit claims is unsupported?
[16:56:54] <michaelni> jamrial, yes, we support lossless rgba

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agofate: change fate-ffmpeg-attached_pics to encode to pcm_s16le
Marton Balint [Fri, 27 Oct 2017 20:14:23 +0000 (22:14 +0200)]
fate: change fate-ffmpeg-attached_pics to encode to pcm_s16le

Previously alac encoder was used, from a first glance I thought it is bitexact,
but it turns out it is using floating point arithmetic as well, so probably it
is not. Fixes fate failures on mingw32/64.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoMerge commit '279e3aaa14daba6b7a37d75f3fb6e29c732d123f'
James Almer [Sat, 28 Oct 2017 18:29:23 +0000 (15:29 -0300)]
Merge commit '279e3aaa14daba6b7a37d75f3fb6e29c732d123f'

* commit '279e3aaa14daba6b7a37d75f3fb6e29c732d123f':
  flv: Validate the packet size

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavformat/ac3dec: Check buf2 before adding 16 in ac3_eac3_probe()
Michael Niedermayer [Sat, 28 Oct 2017 14:16:46 +0000 (16:16 +0200)]
avformat/ac3dec: Check buf2 before adding 16 in ac3_eac3_probe()

This is needed since e0250cf3651e6417e0117486a7816b45fb2d34cd as that uses end-buf2
Note, there are more than 16 bytes allocated beyond "end"

Fixes: regression (segfault) with probetest

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolavf/mov.c: Fix parsing of edit list atoms with invalid elst entry count.
Sasi Inguva [Thu, 19 Oct 2017 03:11:16 +0000 (20:11 -0700)]
lavf/mov.c: Fix parsing of edit list atoms with invalid elst entry count.

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodashenc: move UTCTiming element to the end of the manifest
Peter Große [Fri, 27 Oct 2017 19:18:47 +0000 (21:18 +0200)]
dashenc: move UTCTiming element to the end of the manifest

Required by comformance XSD [1].

[1] https://github.com/Dash-Industry-Forum/Conformance-and-reference-source/blob/master/conformance/MPDValidator/schemas/DASH-MPD.xsd

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodashenc: use av_dict_set_int instead of static function
Peter Große [Thu, 26 Oct 2017 15:58:35 +0000 (17:58 +0200)]
dashenc: use av_dict_set_int instead of static function

Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoMerge commit '4809781586d1c956005f72946a2aab5915eab350'
James Almer [Sat, 28 Oct 2017 18:08:31 +0000 (15:08 -0300)]
Merge commit '4809781586d1c956005f72946a2aab5915eab350'

* commit '4809781586d1c956005f72946a2aab5915eab350':
  travis: Exclude gcc for the macOS target

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '5352802da81f2083e65d466612e639a4e6e5530e'
James Almer [Sat, 28 Oct 2017 18:06:08 +0000 (15:06 -0300)]
Merge commit '5352802da81f2083e65d466612e639a4e6e5530e'

* commit '5352802da81f2083e65d466612e639a4e6e5530e':
  dca: Account for lfe when checking for the channel count

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '37f573543c4fd7f44339e04d8d15b95118493ddd'
James Almer [Sat, 28 Oct 2017 18:04:25 +0000 (15:04 -0300)]
Merge commit '37f573543c4fd7f44339e04d8d15b95118493ddd'

* commit '37f573543c4fd7f44339e04d8d15b95118493ddd':
  swscale: Convert the check check_image_pointers helper to a macro

[14:52:50] <jamrial> michaelni, ubitux: 37f573543c yay or nay? we don't have the warnings mentioned there because we cast the argument
[14:54:10] <@ubitux> i don't really see the improvement, no opinion
[15:04:14] <michaelni> jamrial, functions are better/cleaner than macros
[15:04:20] <michaelni> IMHO that is

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f56fa95cd13f627891a1bfb66bf61b971b9e0238'
James Almer [Sat, 28 Oct 2017 17:42:28 +0000 (14:42 -0300)]
Merge commit 'f56fa95cd13f627891a1bfb66bf61b971b9e0238'

* commit 'f56fa95cd13f627891a1bfb66bf61b971b9e0238':
  swscale: Do not shift negative values directly

14:30:21] <jamrial> michaelni: do you prefer how f56fa95cd1 (libav) handles left shift of negative value, or how we're currently doing it?
[14:30:31] <jamrial> ours is cleaner looking, IMO
[14:30:57] <@ubitux> i agree
[14:31:13] <@ubitux> if we didn't forget any, i think this commit is better noop'ed
[14:31:57] <jamrial> ubitux: we even have a bunch of other cases this commit doesn't handle that i'd have to manually change, so yeah, i'm leaning towards nooping it
[14:34:04] <michaelni> jamrial, +1, ours as its cleaner

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavfilter/zscale: fix memory leak
dxfhgwet [Sat, 28 Oct 2017 04:54:13 +0000 (21:54 -0700)]
avfilter/zscale: fix memory leak

2 years agoavfilter/zscale: fix segfault on library error
dxfhgwet [Sat, 28 Oct 2017 17:20:22 +0000 (10:20 -0700)]
avfilter/zscale: fix segfault on library error

2 years agoMerge commit '378460fef1e563704bc5a307ba748a2b819cc09d'
James Almer [Sat, 28 Oct 2017 17:04:32 +0000 (14:04 -0300)]
Merge commit '378460fef1e563704bc5a307ba748a2b819cc09d'

* commit '378460fef1e563704bc5a307ba748a2b819cc09d':
  utvideodec: Support for gradient prediction
  utvideodec: Reuse the huffyuv add_left
  utvideodec: Support ULY4 and ULH4
  utvideodec: Support UQRA and UQRG
  swscale: Add gbrap10 output
  swscale: Add input support for gbrap10 pixel format
  pixfmt: Add gbrap10 pixel format
  utvideodec: Support UQY2

This commit is a noop, see
115e63c8d6791ebdc921caf40c3def024690af2e
8100426fe4ba41b74404cbbd83184afa3239f64b
9d30690f20343ed3057fe4abf82009598d320ce5
b828788d58cb6f55e0bffa4682d75ddf84b4214b
84efdabc94251f1f6f483eb737e95d53376ae921
c62cb9bf5a50df416532afd8d5f79ebade174ac7
ea93052db3594f93f2d10be085a770184da0513d
faa94a576f5f3de10fc7016e0d94229faa1c2159

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d'
James Almer [Sat, 28 Oct 2017 17:01:25 +0000 (14:01 -0300)]
Merge commit '9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d'

* commit '9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d':
  avformat: Free the internal codec context at the end

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '19c5fa9eea47d45b5eedce3bff4edeaf83fb3942'
James Almer [Sat, 28 Oct 2017 17:01:05 +0000 (14:01 -0300)]
Merge commit '19c5fa9eea47d45b5eedce3bff4edeaf83fb3942'

* commit '19c5fa9eea47d45b5eedce3bff4edeaf83fb3942':
  golomb: Simplify get_ur_golomb_jpegls

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: James Almer <jamrial@gmail.com>
2 years agolavfi/paletteuse: fix debug_kdtree after aba926e7d
Clément Bœsch [Sat, 28 Oct 2017 16:49:30 +0000 (18:49 +0200)]
lavfi/paletteuse: fix debug_kdtree after aba926e7d

2 years agoconfigure: add missing llvidencdsp dependency to MagicYUV encoder
James Almer [Sat, 28 Oct 2017 16:14:51 +0000 (13:14 -0300)]
configure: add missing llvidencdsp dependency to MagicYUV encoder

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec: bump minor after addition of MagicYUV encoder
James Almer [Sat, 28 Oct 2017 16:14:47 +0000 (13:14 -0300)]
avcodec: bump minor after addition of MagicYUV encoder

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agolavfi/paletteuse: fix debug_mean_error after aba926e7d
Clément Bœsch [Sat, 28 Oct 2017 16:01:41 +0000 (18:01 +0200)]
lavfi/paletteuse: fix debug_mean_error after aba926e7d

2 years agolavfi/paletteuse: fix debug_accuracy after aba926e7d
Clément Bœsch [Sat, 28 Oct 2017 15:59:47 +0000 (17:59 +0200)]
lavfi/paletteuse: fix debug_accuracy after aba926e7d

2 years agoavcodec: add MagicYUV encoder
Paul B Mahol [Sat, 8 Jul 2017 17:14:05 +0000 (19:14 +0200)]
avcodec: add MagicYUV encoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agolavfi/paletteuse: simplify color get function prototypes
Clément Bœsch [Sat, 28 Oct 2017 15:39:48 +0000 (17:39 +0200)]
lavfi/paletteuse: simplify color get function prototypes

2 years agolavfi/paletteuse: move "new" option before debugging options
Clément Bœsch [Sat, 28 Oct 2017 15:15:06 +0000 (17:15 +0200)]
lavfi/paletteuse: move "new" option before debugging options

2 years agolavfi/paletteuse: fix to support transparency
Bjorn Roche [Mon, 23 Oct 2017 23:12:57 +0000 (19:12 -0400)]
lavfi/paletteuse: fix to support transparency

This patch enables paletteuse to identify the transparency in incoming
video and tag transparent pixels on outgoing video with the correct
index from the palette.

This requires tracking the transparency index in the palette,
establishing an alpha threshold below which a pixel is considered
transparent and above which the pixel is considered opaque, and
additional changes to track the alpha value throughout the conversion
process.

This change is a partial fix for https://trac.ffmpeg.org/ticket/4443
However, animated GIFs are still output incorrectly due to a bug
in gif optimization which does not correctly handle transparency.

Signed-off-by: Clément Bœsch <u@pkh.me>
2 years agolswr/swresample: Mention the actually supported formats when erroring out.
Carl Eugen Hoyos [Thu, 26 Oct 2017 14:52:22 +0000 (16:52 +0200)]
lswr/swresample: Mention the actually supported formats when erroring out.

Fixes ticket #6779.

2 years agoMerge commit '1fe858136b315796dd5349f3b4448a29d1bd6fa1'
James Almer [Sat, 28 Oct 2017 01:21:13 +0000 (22:21 -0300)]
Merge commit '1fe858136b315796dd5349f3b4448a29d1bd6fa1'

* commit '1fe858136b315796dd5349f3b4448a29d1bd6fa1':
  utvideodec: Prevent possible signed overflow

This commit is a noop, see e86444b19d0b63c098298243fb20fd577f34cf34

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '4d4d7cf9d539a053f531f662a972b23d335738eb'
James Almer [Sat, 28 Oct 2017 00:16:18 +0000 (21:16 -0300)]
Merge commit '4d4d7cf9d539a053f531f662a972b23d335738eb'

* commit '4d4d7cf9d539a053f531f662a972b23d335738eb':
  fmvc: Add FATE tests

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '95a8a03a191204c3ca5c8cf6b69ab166765d5ff3'
James Almer [Sat, 28 Oct 2017 00:15:34 +0000 (21:15 -0300)]
Merge commit '95a8a03a191204c3ca5c8cf6b69ab166765d5ff3'

* commit '95a8a03a191204c3ca5c8cf6b69ab166765d5ff3':
  Add FM Screen Capture Codec decoder

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/audiotoolboxdec: fix ac3_parser header include
James Almer [Fri, 27 Oct 2017 22:41:38 +0000 (19:41 -0300)]
avcodec/audiotoolboxdec: fix ac3_parser header include

2 years agoMerge commit '89d9869d2491d4209d707a8e7f29c58227ae5a4e'
James Almer [Fri, 27 Oct 2017 21:22:39 +0000 (18:22 -0300)]
Merge commit '89d9869d2491d4209d707a8e7f29c58227ae5a4e'

* commit '89d9869d2491d4209d707a8e7f29c58227ae5a4e':
  hevc: Add NEON 16x16 IDCT

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '50a1c66cf6ab7eb683daaa9e2da3869fa3a54609'
James Almer [Fri, 27 Oct 2017 16:52:19 +0000 (13:52 -0300)]
Merge commit '50a1c66cf6ab7eb683daaa9e2da3869fa3a54609'

* commit '50a1c66cf6ab7eb683daaa9e2da3869fa3a54609':
  ac3_parser: add a public function for parsing the data required by the demuxer

avpriv_ac3_parse_header() is left in place but without the
GetBitContext parameter, as the mov muxer requires a lot more fields
than just bitstream_id and frame_size from the AC3HeaderInfo struct.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMAINTAINERS: add my GPG fingerprint
James Almer [Fri, 27 Oct 2017 03:33:13 +0000 (00:33 -0300)]
MAINTAINERS: add my GPG fingerprint

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agofate: fix ffmpeg-attached_pics test dependencies
Marton Balint [Fri, 27 Oct 2017 00:42:25 +0000 (02:42 +0200)]
fate: fix ffmpeg-attached_pics test dependencies

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoflvdec: Check the avio_seek return value after reading a metadata packet
Martin Storsjö [Fri, 27 Oct 2017 00:27:43 +0000 (08:27 +0800)]
flvdec: Check the avio_seek return value after reading a  metadata packet

merge from libav: 585dc1aecef0371ad6f16cb3750ae2a6da9cf00a

If the metadata packet is corrupted, flv_read_metabody can accidentally
read past the start of the next packet. If the start of the  next packet
had been flushed out of the IO buffer, we would be unable to seek to
the right position (on a nonseekable stream).

Prefer to clearly error out instead of silently  trying to read from a
desynced stream which will only be interpreted as garbage.

2 years agoRevert "flvdec: Check the avio_seek return value after reading a metadata packet"
Steven Liu [Fri, 27 Oct 2017 00:26:11 +0000 (08:26 +0800)]
Revert "flvdec: Check the avio_seek return value after reading a  metadata packet"

This reverts commit ef7fe81b8554a2865d47a55edf47420878fa3d91.

2 years agofate: add fate test for ticket #6375
Marton Balint [Sun, 8 Oct 2017 13:27:50 +0000 (15:27 +0200)]
fate: add fate test for ticket #6375

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agofate: add fate test for ticket #6603
Marton Balint [Sun, 8 Oct 2017 12:51:03 +0000 (14:51 +0200)]
fate: add fate test for ticket #6603

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agolavf: Remove AVFMT_RAWPICTURE.
Carl Eugen Hoyos [Thu, 26 Oct 2017 21:43:11 +0000 (23:43 +0200)]
lavf: Remove AVFMT_RAWPICTURE.

Deprecated since October 2015.

2 years agoMerge commit '193b09189004ede4a6998e69192d1a9f63602088'
James Almer [Thu, 26 Oct 2017 20:13:14 +0000 (17:13 -0300)]
Merge commit '193b09189004ede4a6998e69192d1a9f63602088'

* commit '193b09189004ede4a6998e69192d1a9f63602088':
  thread: Define ff_mutex_* macros as stub functions when threads are disabled

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'b200a2c8da403b5a5c8b50f8cb4a75fd4f0131b1'
James Almer [Thu, 26 Oct 2017 19:58:39 +0000 (16:58 -0300)]
Merge commit 'b200a2c8da403b5a5c8b50f8cb4a75fd4f0131b1'

* commit 'b200a2c8da403b5a5c8b50f8cb4a75fd4f0131b1':
  examples: Fixed and extended Doxygen documentation

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'efddf2c09aed7400c73ecf327f86a4d0452b94b5'
James Almer [Thu, 26 Oct 2017 19:51:03 +0000 (16:51 -0300)]
Merge commit 'efddf2c09aed7400c73ecf327f86a4d0452b94b5'

* commit 'efddf2c09aed7400c73ecf327f86a4d0452b94b5':
  decode: Initialize ret before using it
  filtfmts-test: Mark filter as const

This commit is a noop, see
3c14547eb75c5b18099060085d12f09518ee2732
960b4d47612ec89cfdf0ff8b83bc7424ad4c754a

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f5950b8fd61ec85e0ad8790bea56b37ceea19436'
James Almer [Thu, 26 Oct 2017 19:46:11 +0000 (16:46 -0300)]
Merge commit 'f5950b8fd61ec85e0ad8790bea56b37ceea19436'

* commit 'f5950b8fd61ec85e0ad8790bea56b37ceea19436':
  lavfi: Drop unused and empty header file

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'd32d59bc977b43031007bb2ab21e232f96d2ebcb'
James Almer [Thu, 26 Oct 2017 19:40:05 +0000 (16:40 -0300)]
Merge commit 'd32d59bc977b43031007bb2ab21e232f96d2ebcb'

* commit 'd32d59bc977b43031007bb2ab21e232f96d2ebcb':
  matroska: Read only the data written in the scratch buffer

This commit is a noop, see fd59207c1c86c6a76059b3565d340da9f8f47530

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '6ac0e7818399a57e4684202bac79f35b3561ad1e'
James Almer [Thu, 26 Oct 2017 19:19:43 +0000 (16:19 -0300)]
Merge commit '6ac0e7818399a57e4684202bac79f35b3561ad1e'

* commit '6ac0e7818399a57e4684202bac79f35b3561ad1e':
  mpeg4videodec: raise an error if sprite_trajectory.table is NULL

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'b62ed6873821c8fce8f7e2c2927ae54f86afeb22'
James Almer [Thu, 26 Oct 2017 19:14:54 +0000 (16:14 -0300)]
Merge commit 'b62ed6873821c8fce8f7e2c2927ae54f86afeb22'

* commit 'b62ed6873821c8fce8f7e2c2927ae54f86afeb22':
  configure: Better names for functions that sanitize input

Merged-by: James Almer <jamrial@gmail.com>
2 years agoconfigure: add optional zlib dependency to avformat
James Almer [Thu, 26 Oct 2017 18:27:57 +0000 (15:27 -0300)]
configure: add optional zlib dependency to avformat

id3v2 code is compiled unconditionally and uses zlib when available.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '604fbb3132e88727e496c96c92cfe02748c25a1a'
James Almer [Thu, 26 Oct 2017 17:50:36 +0000 (14:50 -0300)]
Merge commit '604fbb3132e88727e496c96c92cfe02748c25a1a'

* commit '604fbb3132e88727e496c96c92cfe02748c25a1a':
  mov: Move code shared with CAF to a separate file

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '3d197514e613ccd9eab43180c0a7c8b09a307606'
James Almer [Thu, 26 Oct 2017 17:45:36 +0000 (14:45 -0300)]
Merge commit '3d197514e613ccd9eab43180c0a7c8b09a307606'

* commit '3d197514e613ccd9eab43180c0a7c8b09a307606':
  qsvenc: Allow use of hw_device_ctx to make the internal session
  qsvdec: Allow use of hw_device_ctx to make the internal session
  qsv: Add ability to create a session from a device
  doc: Add VAAPI encoders
  vaapi_encode: Add VP9 support
  vp9: Add bsf to fix reordering in raw streams

This commit is a noop, see
49419925d33304ff907075289808226a695ff57b
bde04604065db565373c315ad13d9c3c5db4d7c9
dc81f1a2cef11538401ee1ca13b76e61838283e6
91c3b50d74ba8874ea090c29063f953f4cc90ba9
8aa3c2df1ae64b4b30462cc8a164520e65312d1a
28aedeed1961392d6b27f2f3abe4fd4c33393b93

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '0cf949a01193dcf6f83fd95d46792dd94479b4e4'
James Almer [Thu, 26 Oct 2017 17:38:14 +0000 (14:38 -0300)]
Merge commit '0cf949a01193dcf6f83fd95d46792dd94479b4e4'

* commit '0cf949a01193dcf6f83fd95d46792dd94479b4e4':
  vp9: Add bsf to merge superframes

[14:25:37] <@BBB> the functional change is wrong
[14:25:48] <@BBB> it allows recusrively packing superframes in superframes
[14:26:37] <@BBB> so I would ignore the remainder

See 2e6636aa87303d37b112e79f093ca39500f92364

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f64d1100a54d12c78ce436181bb64229c56da6b3'
James Almer [Thu, 26 Oct 2017 17:11:45 +0000 (14:11 -0300)]
Merge commit 'f64d1100a54d12c78ce436181bb64229c56da6b3'

* commit 'f64d1100a54d12c78ce436181bb64229c56da6b3':
  avconv: Flush output BSFs when encode reaches EOF
  vf_deinterlace_vaapi: Add support for field rate output
  pthread_frame: Propagate sw_pix_fmt across threads

This commit is a noop, see
ebce1332285b16418dacb369defcfd7bae06d319
bff7bec1d7d0ed23f24a2c815f133d58b6b86b1e
bc4e33ce0f0ea797b28d02d02ff29778cbf975a4

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '10f4511f14a4e830c0ed471df4cd1cc2a18a481a'
James Almer [Thu, 26 Oct 2017 17:06:34 +0000 (14:06 -0300)]
Merge commit '10f4511f14a4e830c0ed471df4cd1cc2a18a481a'

* commit '10f4511f14a4e830c0ed471df4cd1cc2a18a481a':
  libavutil: Make LOCAL_ALIGNED(xx be equal to LOCAL_ALIGNED_xx(

Also added LOCAL_ALIGNED_4 as it's used in vp8 decoder, and
simplified the configure defines.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavformat/yuv4mpeg: add gray9/10/12 support
Mateusz [Sat, 7 Oct 2017 17:05:53 +0000 (19:05 +0200)]
avformat/yuv4mpeg: add gray9/10/12 support

Signed-off-by: Mateusz Brzostek <mateuszb@poczta.onet.pl>
2 years agolavc/avcodec: Constify the return value of av_bitstream_filter_next().
Carl Eugen Hoyos [Thu, 26 Oct 2017 16:29:02 +0000 (18:29 +0200)]
lavc/avcodec: Constify the return value of av_bitstream_filter_next().

Fixes the following gcc warning:
libavcodec/bitstream_filter.c:39:12: warning: return discards 'const' qualifier from pointer target type

2 years agoavformat/wavenc: skip writing incorrect peak-of-peaks position value
Tobias Rapp [Fri, 29 Sep 2017 14:32:20 +0000 (16:32 +0200)]
avformat/wavenc: skip writing incorrect peak-of-peaks position value

According to EBU tech 3285 supplement 3 the dwPosPeakOfPeaks field
should contain the absolute position to the maximum audio sample value,
but the current implementation writes the relative peak frame index
instead.

Fix the issue by writing the "unknown" value (-1) for now until the
feature is implemented correctly.

Previous version reviewed-by: Peter Bubestinger <p.bubestinger@av-rd.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2 years agoavcodec/exif: remove GetByteContext usage from avpriv_exif_decode_ifd()
James Almer [Tue, 24 Oct 2017 02:39:54 +0000 (23:39 -0300)]
avcodec/exif: remove GetByteContext usage from avpriv_exif_decode_ifd()

This prevents potential ABI issues with GetByteContext.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/tak: remove GetBitContext usage from avpriv_tak_parse_streaminfo()
James Almer [Sun, 22 Oct 2017 23:29:53 +0000 (20:29 -0300)]
avcodec/tak: remove GetBitContext usage from avpriv_tak_parse_streaminfo()

This prevents potential ABI issues with GetBitContext.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agofate: fix mpeg2-ticket6677 faillures on some platforms
Zhong Li [Wed, 25 Oct 2017 05:45:22 +0000 (13:45 +0800)]
fate: fix mpeg2-ticket6677 faillures on some platforms

Signed-off-by: Zhong Li <zhong.li@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoswscale: use dithering in DITHER_COPY only if not set -sws_dither none
Mateusz [Tue, 24 Oct 2017 08:02:17 +0000 (10:02 +0200)]
swscale: use dithering in DITHER_COPY only if not set -sws_dither none

This patch uses dithering in DITHER_COPY macro only if
it was not used option '-sws_dither none'.
With option '-sws_dither none' it uses downshift.

For human eye dithering is OK, for video codecs not necessarily.
If user don't want to use dithering, we should respect that.

Signed-off-by: Mateusz Brzostek <mateuszb@poczta.onet.pl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mips: Improve hevc bi weighted hv mc msa functions
Kaustubh Raste [Tue, 24 Oct 2017 07:11:30 +0000 (12:41 +0530)]
avcodec/mips: Improve hevc bi weighted hv mc msa functions

Use immediate unsigned saturation for clip to max saving one vector register.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mips: Improve avc chroma copy and avg vert mc msa functions
Kaustubh Raste [Tue, 24 Oct 2017 07:10:42 +0000 (12:40 +0530)]
avcodec/mips: Improve avc chroma copy and avg vert mc msa functions

Replace generic with block size specific function.
Load the specific destination bytes instead of MSA load and pack.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mips: Improve avc put mc 11, 31, 13 and 33 msa functions
Kaustubh Raste [Tue, 24 Oct 2017 07:08:30 +0000 (12:38 +0530)]
avcodec/mips: Improve avc put mc 11, 31, 13 and 33 msa functions

Remove loops and unroll as block sizes are known.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agotools/target_dec_fuzzer: Fix build after AV_CODEC_CAP_HWACCEL_VDPAU was removed
Michael Niedermayer [Wed, 25 Oct 2017 17:27:29 +0000 (19:27 +0200)]
tools/target_dec_fuzzer: Fix build after AV_CODEC_CAP_HWACCEL_VDPAU was removed

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agotools/target_dec_fuzzer: Fix build after FF_INPUT_BUFFER_PADDING_SIZE was removed
Michael Niedermayer [Wed, 25 Oct 2017 17:26:58 +0000 (19:26 +0200)]
tools/target_dec_fuzzer: Fix build after FF_INPUT_BUFFER_PADDING_SIZE was removed

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoDon't use _tzcnt instrinics with clang for windows w/o BMI.
Dale Curtis [Tue, 24 Oct 2017 20:03:59 +0000 (13:03 -0700)]
Don't use _tzcnt instrinics with clang for windows w/o BMI.

Technically _tzcnt* intrinsics are only available when the BMI
instruction set is present. However the instruction encoding
degrades to "rep bsf" on older processors.

Clang for Windows debatably restricts the _tzcnt* instrinics behind
the __BMI__ architecture define, so check for its presence or
exclude the usage of these intrinics when clang is present.

See also:
https://ffmpeg.org/pipermail/ffmpeg-devel/2015-November/183404.html
https://bugs.llvm.org/show_bug.cgi?id=30506
http://lists.llvm.org/pipermail/cfe-dev/2016-October/051034.html

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoMerge commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b'
James Almer [Tue, 24 Oct 2017 22:26:29 +0000 (19:26 -0300)]
Merge commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b'

* commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b':
  hevc: Avoid using LOCAL_ALIGNED for 4 byte alignment

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '163cc67beb3ed28aeb500c9a09df47c8df613025'
James Almer [Tue, 24 Oct 2017 22:25:05 +0000 (19:25 -0300)]
Merge commit '163cc67beb3ed28aeb500c9a09df47c8df613025'

* commit '163cc67beb3ed28aeb500c9a09df47c8df613025':
  takdec: Use ISO C printf conversion specifiers where appropriate
  dcadec: remove extra indirection
  hevcdec: Use LOCAL_ALIGNED_* for declaring local variables with alignment
  arm: Always build the hevcdsp_init_arm.c file

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agofate: add a test for mpeg2 issue of ticket #6677
Zhong Li [Mon, 23 Oct 2017 07:18:12 +0000 (15:18 +0800)]
fate: add a test for mpeg2 issue of ticket #6677

Signed-off-by: Zhong Li <zhong.li@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agotests/ffserver.regression.ref: update checksums to what ffserver currently produces
Michael Niedermayer [Sun, 22 Oct 2017 15:11:21 +0000 (17:11 +0200)]
tests/ffserver.regression.ref: update checksums to what ffserver currently produces

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffserver: Fix off by 1 error in path
Michael Niedermayer [Sun, 22 Oct 2017 15:11:20 +0000 (17:11 +0200)]
ffserver: Fix off by 1 error in path

Code suggested by ubitux

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolibopus: Add channel mapping 2 support in libopusdec
Felicia Lim [Mon, 27 Mar 2017 23:21:20 +0000 (16:21 -0700)]
libopus: Add channel mapping 2 support in libopusdec

Enables demuxing of Ambisonics content coded with channel mapping 2

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoMerge commit '5a969f64b9cf40bad923c73b66c3031b0018e848'
James Almer [Tue, 24 Oct 2017 22:17:02 +0000 (19:17 -0300)]
Merge commit '5a969f64b9cf40bad923c73b66c3031b0018e848'

* commit '5a969f64b9cf40bad923c73b66c3031b0018e848':
  jack: Drop support for old (2012) JACK versions

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b'
James Almer [Tue, 24 Oct 2017 22:14:22 +0000 (19:14 -0300)]
Merge commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b'

* commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b':
  hwcontext: Move NONE to the be the first member of AVHWDeviceType

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '0b9a237b2386ff84a6f99716bd58fa27a1b767e7'
James Almer [Tue, 24 Oct 2017 22:10:22 +0000 (19:10 -0300)]
Merge commit '0b9a237b2386ff84a6f99716bd58fa27a1b767e7'

* commit '0b9a237b2386ff84a6f99716bd58fa27a1b767e7':
  hevc: Add NEON 4x4 and 8x8 IDCT

[15:12:59] <@ubitux> hevc_idct_4x4_8_c: 389.1
[15:13:00] <@ubitux> hevc_idct_4x4_8_neon: 126.6
[15:13:02] <@ubitux> our ^
[15:13:06] <@ubitux> hevc_idct_4x4_8_c: 389.3
[15:13:08] <@ubitux> hevc_idct_4x4_8_neon: 107.8
[15:13:10] <@ubitux> hevc_idct_4x4_10_c: 418.6
[15:13:12] <@ubitux> hevc_idct_4x4_10_neon: 108.1
[15:13:14] <@ubitux> libav ^
[15:13:30] <@ubitux> so yeah, we can probably trash our versions here

Merged-by: James Almer <jamrial@gmail.com>
2 years agocbs_h264: Fix format specifier
Mark Thompson [Tue, 24 Oct 2017 21:58:47 +0000 (22:58 +0100)]
cbs_h264: Fix format specifier

2 years agocbs_mpeg2: Fix format specifier
Mark Thompson [Tue, 24 Oct 2017 21:57:44 +0000 (22:57 +0100)]
cbs_mpeg2: Fix format specifier

2 years agocbs_mpeg2: Fix type for marker_bit reading
Mark Thompson [Tue, 24 Oct 2017 21:56:48 +0000 (22:56 +0100)]
cbs_mpeg2: Fix type for marker_bit reading

2 years agolavc/vaapi_encode_h264: correct VUI max_dec_frame_buffering setting
Jun Zhao [Tue, 24 Oct 2017 05:25:21 +0000 (13:25 +0800)]
lavc/vaapi_encode_h264: correct VUI max_dec_frame_buffering setting

This should refer to the existing SPS structure, not the VAAPI sequence
parameter buffer (which is not yet initialised).

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Wang, Yi A <yi.a.wang@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
2 years agolavc/dvbsub: Add the missing line separator to dvb_encode_rle8().
Carl Eugen Hoyos [Tue, 24 Oct 2017 20:49:04 +0000 (22:49 +0200)]
lavc/dvbsub: Add the missing line separator to dvb_encode_rle8().

Fixes 256-colour dvb subtitle encoding.

Fixes ticket #6769.