ffmpeg.git
4 years agoMerge commit '6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3'
Clément Bœsch [Tue, 21 Jun 2016 10:17:12 +0000 (12:17 +0200)]
Merge commit '6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3'

* commit '6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3':
  dds: Drop gray-alpha swapping

This commit is not merged, see 139cbeb75e0f5e3176b2b09660d2570b1bcc2408.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a'
Clément Bœsch [Tue, 21 Jun 2016 09:33:56 +0000 (11:33 +0200)]
Merge commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a'

* commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a':
  dxva2_h264: Unbreak compilation after 3176217c6

This commit is a noop. The compilation was fixed in the merge commit
itself (1534ef87c74cc66a117bf61c467641c2129bc964). The additional local
unused sps is not merged.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '4012fe1ee819edc7689e182189e66c5401fb4b41'
Clément Bœsch [Tue, 21 Jun 2016 09:30:29 +0000 (11:30 +0200)]
Merge commit '4012fe1ee819edc7689e182189e66c5401fb4b41'

* commit '4012fe1ee819edc7689e182189e66c5401fb4b41':
  ape: Unbreak adaptcoeffs computation

This commit is a noop, see dd4fb2339f76a958bd7e63e5ac18b8c10852ae1a

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '2e5bde956519ae19cedfa482e199518e495bcaf5'
Clément Bœsch [Tue, 21 Jun 2016 09:25:53 +0000 (11:25 +0200)]
Merge commit '2e5bde956519ae19cedfa482e199518e495bcaf5'

* commit '2e5bde956519ae19cedfa482e199518e495bcaf5':
  h264: eliminate max_contexts

This commit is a noop as max_contexts can change and mismatch the
nb_slice_ctx (see 507b01f89969601f15555f7416804fb691632cbb).

The file in the Ticket is not decodable anymore, so it was not possible
to check if that code path was triggerable some way or another, or even
test a different fix.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit 'e3c9041cfe2e6526802255583d27abf9a921863e'
Clément Bœsch [Tue, 21 Jun 2016 08:28:14 +0000 (10:28 +0200)]
Merge commit 'e3c9041cfe2e6526802255583d27abf9a921863e'

* commit 'e3c9041cfe2e6526802255583d27abf9a921863e':
  h264: allocate some tables per slice contexts, not threads

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit 'e0652795292223f8bc8e5bac019c1fca7323d23c'
Clément Bœsch [Tue, 21 Jun 2016 08:19:13 +0000 (10:19 +0200)]
Merge commit 'e0652795292223f8bc8e5bac019c1fca7323d23c'

* commit 'e0652795292223f8bc8e5bac019c1fca7323d23c':
  h264: remove an artificial restriction on the number of slice threads

Tested with multiple runs of fate-h264 THREADS=50 THREAD_TYPE=slice

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agolavc/h264_slice: mark ref2frm as const pointers
Clément Bœsch [Tue, 21 Jun 2016 08:09:19 +0000 (10:09 +0200)]
lavc/h264_slice: mark ref2frm as const pointers

4 years agoavformat/oggparsevorbis: free base64 encoded data immediately after decoding it
James Almer [Thu, 16 Jun 2016 22:17:26 +0000 (19:17 -0300)]
avformat/oggparsevorbis: free base64 encoded data immediately after decoding it

It has no use afterwards and freeing it before calling ff_flac_parse_picture()
may help prevent OOM issues on memory constrained scenarios.

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavformat/oggparsevorbis: use the base64 decode size macro
James Almer [Thu, 16 Jun 2016 22:10:42 +0000 (19:10 -0300)]
avformat/oggparsevorbis: use the base64 decode size macro

Allocate the memory needed for the decoded data rather than the
encoded data.

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoswresample/x86: add support for exact_rational
Muhammad Faiz [Wed, 15 Jun 2016 17:17:35 +0000 (00:17 +0700)]
swresample/x86: add support for exact_rational

phase_shift and phase_mask is removed
generally exact_rational=on is faster than exact_rational=off

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
4 years agoMAINTAINERS: update my entries
Clément Bœsch [Mon, 20 Jun 2016 19:32:23 +0000 (21:32 +0200)]
MAINTAINERS: update my entries

4 years agoRemove Benjamin Larsson from MAINTAINERS
Benjamin Larsson [Mon, 20 Jun 2016 19:19:45 +0000 (11:19 -0800)]
Remove Benjamin Larsson from MAINTAINERS

Signed-off-by: Lou Logan <lou@lrcd.com>
4 years agofate: add test for alimiter
Petru Rares Sincraian [Mon, 20 Jun 2016 17:32:36 +0000 (19:32 +0200)]
fate: add test for alimiter

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc/h264_ps: add ff_h264_ps_uninit and use it
Matthieu Bouron [Mon, 20 Jun 2016 14:02:10 +0000 (16:02 +0200)]
lavc/h264_ps: add ff_h264_ps_uninit and use it

4 years agolavf/mov: ignore ctts entries that do not apply to a least one sample
Matthieu Bouron [Thu, 16 Jun 2016 11:16:52 +0000 (13:16 +0200)]
lavf/mov: ignore ctts entries that do not apply to a least one sample

Fixes packet pts of samples which contain ctts entries with count <= 0.

4 years agoMerge commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69'
Clément Bœsch [Mon, 20 Jun 2016 13:38:11 +0000 (15:38 +0200)]
Merge commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69'

* commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69':
  h264: remove pointless setting of some variables in loop_filter

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '9c858ce33fa9b94ebc320dd9d9fa423e708e90cc'
Clément Bœsch [Mon, 20 Jun 2016 13:36:44 +0000 (15:36 +0200)]
Merge commit '9c858ce33fa9b94ebc320dd9d9fa423e708e90cc'

* commit '9c858ce33fa9b94ebc320dd9d9fa423e708e90cc':
  h264: remove a pointless comment

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit 'b77fffa127663028169c5ed543956af4b9496c29'
Clément Bœsch [Mon, 20 Jun 2016 11:00:17 +0000 (13:00 +0200)]
Merge commit 'b77fffa127663028169c5ed543956af4b9496c29'

* commit 'b77fffa127663028169c5ed543956af4b9496c29':
  h264: make slice threading work with deblocking_filter=1

again label, and SLICE_SINGLETHREAD error handling are preserved as that
SLICE_SINGLETHREAD can be raised on a remaining case.

slice_context_count is also kept since it's still in use.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '370ddc7b38d6b27b54fc2f5ee5f3dd9506f8c7c8'
Clément Bœsch [Mon, 20 Jun 2016 10:35:32 +0000 (12:35 +0200)]
Merge commit '370ddc7b38d6b27b54fc2f5ee5f3dd9506f8c7c8'

* commit '370ddc7b38d6b27b54fc2f5ee5f3dd9506f8c7c8':
  h264: remove H264Context.pict_type

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '56087ec0a29314d1860f6f0e6f40fbb9b40feccd'
Clément Bœsch [Mon, 20 Jun 2016 10:31:29 +0000 (12:31 +0200)]
Merge commit '56087ec0a29314d1860f6f0e6f40fbb9b40feccd'

* commit '56087ec0a29314d1860f6f0e6f40fbb9b40feccd':
  h264: drop a pointless indirection

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agolavc/audiotoolboxdec: Forward extradata for QDMC and QDM2.
Carl Eugen Hoyos [Mon, 20 Jun 2016 10:23:59 +0000 (12:23 +0200)]
lavc/audiotoolboxdec: Forward extradata for QDMC and QDM2.

Fixes audiotoolbox decoding of QDMC and QDM2.

4 years agoMerge commit '0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a'
Clément Bœsch [Mon, 20 Jun 2016 10:07:05 +0000 (12:07 +0200)]
Merge commit '0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a'

* commit '0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a':
  h264: remove unused H264SliceContext.rbsp_buffer

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '7f045c4429e91688f1f2335dd347203431901c06'
Clément Bœsch [Mon, 20 Jun 2016 10:00:29 +0000 (12:00 +0200)]
Merge commit '7f045c4429e91688f1f2335dd347203431901c06'

* commit '7f045c4429e91688f1f2335dd347203431901c06':
  h264: merge ff_h264_free_context() into h264_decode_end()

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '99c554efc8b09c3f1bb2fb41c3da5431085f7470'
Clément Bœsch [Mon, 20 Jun 2016 09:37:49 +0000 (11:37 +0200)]
Merge commit '99c554efc8b09c3f1bb2fb41c3da5431085f7470'

* commit '99c554efc8b09c3f1bb2fb41c3da5431085f7470':
  h264: eliminate low_delay

ff_print_debug_info2() is adjusted to allow a NULL pointer as low_delay.
It's only useful for MPEG codecs with the exception of H264.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agolavc/h264_parser: replace AVCodecContext with logging ctx in scan_mmco_reset()
Clément Bœsch [Mon, 20 Jun 2016 08:30:08 +0000 (10:30 +0200)]
lavc/h264_parser: replace AVCodecContext with logging ctx in scan_mmco_reset()

4 years agolavc/h264: add a logging ctx to ff_h264_pred_weight_table()
Clément Bœsch [Mon, 20 Jun 2016 08:28:17 +0000 (10:28 +0200)]
lavc/h264: add a logging ctx to ff_h264_pred_weight_table()

4 years agolavc/mediacodecdec{,_h264}: set FF_CODEC_CAP_SETS_PKT_DTS capability
Matthieu Bouron [Thu, 16 Jun 2016 16:30:16 +0000 (18:30 +0200)]
lavc/mediacodecdec{,_h264}: set FF_CODEC_CAP_SETS_PKT_DTS capability

And sets frames pkt_dts to AV_NOPTS_VALUE as we do not want lavc/utils
to overwrite the field with incorrect values as the decoder is
asynchronous.

4 years agolavc/videotoolbox: Fix videotoolbox compile error on OS X 10.8.
Dan Dennedy [Sun, 19 Jun 2016 21:55:18 +0000 (14:55 -0700)]
lavc/videotoolbox: Fix videotoolbox compile error on OS X 10.8.

Fixes error:
libavcodec/videotoolbox.c:511:18: error: implicit declaration of function
'CMVideoFormatDescriptionCreateFromH264ParameterSets' is invalid in C99

This was added in 10.9:
https://developer.apple.com/reference/coremedia/1489818-cmvideoformatdescriptioncreatefr?language=objc

4 years agoavformat/mux: do not call write_packet with a flush packet if header is not written
Marton Balint [Sat, 11 Jun 2016 18:25:58 +0000 (20:25 +0200)]
avformat/mux: do not call write_packet with a flush packet if header is not written

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoavformat/mux: do not call write_header multiple times if it fails the first time
Marton Balint [Sat, 11 Jun 2016 18:18:40 +0000 (20:18 +0200)]
avformat/mux: do not call write_header multiple times if it fails the first time

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agodoc/filters.texi: Move bwdif to correct alphabetical position
Thomas Mundt [Sun, 19 Jun 2016 19:35:32 +0000 (21:35 +0200)]
doc/filters.texi: Move bwdif to correct alphabetical position

Signed-off-by: Thomas Mundt <loudmax@yahoo.de>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agotests/api/api-codec-param-test: Do not directly access caps_internal
Michael Niedermayer [Thu, 16 Jun 2016 13:35:26 +0000 (15:35 +0200)]
tests/api/api-codec-param-test: Do not directly access caps_internal

The caps_internal field has moved without major bump and direct
access causes crashes, found when testing 3.1

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/version: Change the version bumping comment
Michael Niedermayer [Mon, 13 Jun 2016 11:10:07 +0000 (13:10 +0200)]
avformat/version: Change the version bumping comment

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffplay: ensure that we buffer at least 1 second of content
Marton Balint [Sat, 11 Jun 2016 10:11:11 +0000 (12:11 +0200)]
ffplay: ensure that we buffer at least 1 second of content

In order to do that, we keep track of the total duration of packets in a packet
queue.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoffplay: factorize checking if a stream needs additional packets
Marton Balint [Sat, 11 Jun 2016 09:33:46 +0000 (11:33 +0200)]
ffplay: factorize checking if a stream needs additional packets

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoavformat/udp: replace packet_gap with bitrate option
Marton Balint [Fri, 10 Jun 2016 00:32:21 +0000 (02:32 +0200)]
avformat/udp: replace packet_gap with bitrate option

We haven't had a stable release since the packet_gap addition, so probably it
is worth reworking the option to something that makes more sense to the end
user. Also add burst_bits option to specify maximum length of bit bursts.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoavformat/udp: do not accumulate packet_gap delay errors
Marton Balint [Thu, 9 Jun 2016 21:56:22 +0000 (23:56 +0200)]
avformat/udp: do not accumulate packet_gap delay errors

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoavfilter/vf_bwdif: Change default to deinterlace all frames
Thomas Mundt [Sun, 19 Jun 2016 19:19:33 +0000 (21:19 +0200)]
avfilter/vf_bwdif: Change default to deinterlace all frames

Signed-off-by: Thomas Mundt <loudmax@yahoo.de>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agolavc/magicyuv: fix undefined behaviour introduced in 8a135a55b
Clément Bœsch [Sun, 19 Jun 2016 16:47:53 +0000 (18:47 +0200)]
lavc/magicyuv: fix undefined behaviour introduced in 8a135a55b

Order of evaluation of parameters in C is not defined.

4 years agolavc/cafenc: Allow QDMC muxing.
Carl Eugen Hoyos [Sun, 19 Jun 2016 16:51:39 +0000 (18:51 +0200)]
lavc/cafenc: Allow QDMC muxing.

4 years agoavcodec/qsvenc_h264: declare the QSVEncContext variable before using it
James Almer [Sun, 19 Jun 2016 15:04:03 +0000 (12:04 -0300)]
avcodec/qsvenc_h264: declare the QSVEncContext variable before using it

Should fix compilation.

Regression introduced by commit 63adb3602d3b35c5d1df14cf1e477bc458f96b7b

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoMerge commit '5b35b290dd76db64f079b3940f6148c8f273fc17'
Clément Bœsch [Sun, 19 Jun 2016 11:48:09 +0000 (13:48 +0200)]
Merge commit '5b35b290dd76db64f079b3940f6148c8f273fc17'

* commit '5b35b290dd76db64f079b3940f6148c8f273fc17':
  h264: remove a stale comment

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '89ae244e78a8d636fbb8427a2da052b04cf710bd'
Clément Bœsch [Sun, 19 Jun 2016 11:45:59 +0000 (13:45 +0200)]
Merge commit '89ae244e78a8d636fbb8427a2da052b04cf710bd'

* commit '89ae244e78a8d636fbb8427a2da052b04cf710bd':
  h264_refs: remove an unused parameter from ff_h264_fill_mbaff_ref_list()

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '755f79f84cbeb5d749fb120e55e0098a2d7663a0'
Clément Bœsch [Sun, 19 Jun 2016 11:34:22 +0000 (13:34 +0200)]
Merge commit '755f79f84cbeb5d749fb120e55e0098a2d7663a0'

* commit '755f79f84cbeb5d749fb120e55e0098a2d7663a0':
  h264_refs: make the H264Context const where possible

ff_h264_decode_ref_pic_list_reordering() and h264_initialise_ref_list()
do not have a const H264Context * as they modify the default_ref inside
that context.

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit 'a2fd547839d3ef8f342b6f2c096d0887675d3b1a'
Clément Bœsch [Sun, 19 Jun 2016 11:03:31 +0000 (13:03 +0200)]
Merge commit 'a2fd547839d3ef8f342b6f2c096d0887675d3b1a'

* commit 'a2fd547839d3ef8f342b6f2c096d0887675d3b1a':
  h264_refs: reorder functions to avoid forward declarations

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '0ba471d7d864c712f45d7ac6aca4829aba025adc'
Clément Bœsch [Sun, 19 Jun 2016 10:53:19 +0000 (12:53 +0200)]
Merge commit '0ba471d7d864c712f45d7ac6aca4829aba025adc'

* commit '0ba471d7d864c712f45d7ac6aca4829aba025adc':
  h264: eliminate copy_fields

Added a copy of default_ref which isn't present in Libav.

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '72da8d9bb24d1b1bf74c2f1108650c0da0054d2e'
Clément Bœsch [Sun, 19 Jun 2016 10:43:21 +0000 (12:43 +0200)]
Merge commit '72da8d9bb24d1b1bf74c2f1108650c0da0054d2e'

* commit '72da8d9bb24d1b1bf74c2f1108650c0da0054d2e':
  h264_parser: remove the remaining dependencies on the h264 decoder

Merged-by: Clément Bœsch <u@pkh.me>
4 years agolavc/h264: move history parsing variable to H264ParseContext
Clément Bœsch [Sun, 19 Jun 2016 10:38:28 +0000 (12:38 +0200)]
lavc/h264: move history parsing variable to H264ParseContext

This makes h264_find_frame_end() not depend on H264Context anymore.

4 years agolavc/h264_parser: pass logctx to h264_find_frame_end()
Clément Bœsch [Sun, 19 Jun 2016 10:34:38 +0000 (12:34 +0200)]
lavc/h264_parser: pass logctx to h264_find_frame_end()

This helps removing the H264Context from the H264ParseContext.

4 years agoMerge commit '98c97994c5b90bdae02accb155eeceeb5224b8ef'
Clément Bœsch [Sun, 19 Jun 2016 10:17:41 +0000 (12:17 +0200)]
Merge commit '98c97994c5b90bdae02accb155eeceeb5224b8ef'

* commit '98c97994c5b90bdae02accb155eeceeb5224b8ef':
  h264: decouple extradata parsing from the decoder

Main changes:

- move get_avc_nalsize() inside h264_parser.c and make it use
  H264ParseContext instead of H264Context. This helps fixing
  fate-flv-demux.

- Also use is_avc/nal_length_size from the H264ParseContext in various
  places instead of the H264Context one as that's the fields now filled
  by ff_h264_decode_extradata()

- h264_parse: dont fail decode_extradata_ps() due to nal split failure.
  Change by Michael to fix decoding of h264/ref_10.avi.

Merged-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/magicyuv: check dimensions
Paul B Mahol [Sun, 19 Jun 2016 07:43:22 +0000 (09:43 +0200)]
avcodec/magicyuv: check dimensions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolibavcodec: factor out SEI generation for A53 captions
Andrey Turkin [Sat, 4 Jun 2016 18:11:52 +0000 (21:11 +0300)]
libavcodec: factor out SEI generation for A53 captions

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoRevert "avfilter/trim: add compatibility layer to not break ABI used by ffmpeg"
Michael Niedermayer [Tue, 7 Jun 2016 15:26:38 +0000 (17:26 +0200)]
Revert "avfilter/trim: add compatibility layer to not break ABI used by ffmpeg"

This reverts commit 9219ec93b145725ac74fbfbde7f67ac5135b85cf.

Fixes Ticket 5411

4 years agolavc/h264_parse: remove tabs introduced in a2922b5d
Clément Bœsch [Sat, 18 Jun 2016 12:10:00 +0000 (14:10 +0200)]
lavc/h264_parse: remove tabs introduced in a2922b5d

4 years agoMerge commit '728d90a0c1973661a9e73da697bf4f90c9d19577'
Clément Bœsch [Sat, 18 Jun 2016 12:04:17 +0000 (14:04 +0200)]
Merge commit '728d90a0c1973661a9e73da697bf4f90c9d19577'

* commit '728d90a0c1973661a9e73da697bf4f90c9d19577':
  h264: decouple h264_sei from the h264 decoder

Main changes:

- SEI decoding doesn't have access to the debug flag in the codec context so a
  few logging are dropped.

- naming of quincunx_sampling_flag and frame_packing_arrangement_type are kept
  as they are in FFmpeg instead of respectively quincunx_subsampling and
  arrangement_type used in Libav because the former match the specifications.

- don't reset the x264 build info once read in order to fix
  fate-h264-lossless (change by Hendrik)

- H264Context.has_recovery_point and deprecated
  AVCodecContext.dtg_active_format are set after ff_h264_sei_decode()
  based on the SEI state since ff_h264_sei_decode() doesn't have access
  to H264Context anymore.

- frame_packing_arrangement_type is not checked against <= 0 in
  decode_postinit() since it is always read as a positive value with
  get_bits(). This fixes a -Wtype-limits warning by GCC spotted by
  Michael.

Side Notes:

- tested that ffprobe on the file from ticket #3652 still returns 4
  keyframes
- tested that playback from ticket #3063 still works

Merged-by: Clément Bœsch <clement@stupeflix.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoavcodec/ffv1enc: silence warning about deprecated coded_frame
James Almer [Fri, 17 Jun 2016 16:47:02 +0000 (13:47 -0300)]
avcodec/ffv1enc: silence warning about deprecated coded_frame

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/snow: Document BlockNode
Michael Niedermayer [Fri, 17 Jun 2016 19:24:06 +0000 (21:24 +0200)]
avcodec/snow: Document BlockNode

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/snow: Remove unused function
Michael Niedermayer [Fri, 17 Jun 2016 19:08:23 +0000 (21:08 +0200)]
avcodec/snow: Remove unused function

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc/videotoolbox: remove config_info maximum capacity
Clément Bœsch [Fri, 17 Jun 2016 13:55:58 +0000 (15:55 +0200)]
lavc/videotoolbox: remove config_info maximum capacity

In case of extradata, config_info will contain two entries instead of
one.

4 years agolavc/videotoolbox: CFRelease() session
Clément Bœsch [Fri, 17 Jun 2016 13:51:08 +0000 (15:51 +0200)]
lavc/videotoolbox: CFRelease() session

"When you are done with a decompression session you created, call
VTDecompressionSessionInvalidate to tear it down and then CFRelease to
release your object reference."

4 years agofate/h264: add test for ticket #631
Clément Bœsch [Fri, 17 Jun 2016 12:29:05 +0000 (14:29 +0200)]
fate/h264: add test for ticket #631

4 years agoAdd experimental support for vp9 in iso-bmff
Kongqun Yang [Wed, 15 Jun 2016 20:53:01 +0000 (13:53 -0700)]
Add experimental support for vp9 in iso-bmff

Implemented according to the draft specification
"VP Codec ISO Media File Format Binding":
http://www.webmproject.org/vp9/#draft-vp-codec-iso-media-file-format-binding

'-strict -2' is required to use this feature.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
4 years agoswresample/resample: do not increase phase_count on exact_rational
Muhammad Faiz [Thu, 16 Jun 2016 22:34:30 +0000 (05:34 +0700)]
swresample/resample: do not increase phase_count on exact_rational

high phase_count is only useful when dst_incr_mod is non zero
in other word, it is only useful on soft compensation

on init, it will build filter with low phase_count
but when soft compensation is enabled, rebuild filter
with high phase_count

this approach saves lots of memory

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
4 years agoswresample/resample: add support for odd phase_count
Muhammad Faiz [Thu, 16 Jun 2016 22:30:37 +0000 (05:30 +0700)]
swresample/resample: add support for odd phase_count

because exact_rational does not guarantee
that phase_count is even

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
4 years agod3d11va: don't keep the context lock while waiting for a frame
Steve Lhomme [Wed, 15 Jun 2016 07:24:29 +0000 (09:24 +0200)]
d3d11va: don't keep the context lock while waiting for a frame

also fixes a deadlock found by Денис Кулаков <kudesnik33ra@gmail.com>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc/videotoolboxenc: remove unnecessary logging
Rick Kern [Fri, 17 Jun 2016 01:22:13 +0000 (21:22 -0400)]
lavc/videotoolboxenc: remove unnecessary logging

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agoMAINTAINERS: Add myself for videotoolbox.c, remove vda* maintainer
Rick Kern [Thu, 16 Jun 2016 13:05:06 +0000 (09:05 -0400)]
MAINTAINERS: Add myself for videotoolbox.c, remove vda* maintainer

Person in MAINTAINERS hasn't responded to a patch on the ML or private
email, and doesn't maintain the files according to git.

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agolavc/videotoolbox: fix H.264 hwaccel init issue
Rick Kern [Thu, 2 Jun 2016 01:40:22 +0000 (21:40 -0400)]
lavc/videotoolbox: fix H.264 hwaccel init issue

Fixes VTDecompressionSessionCreate() error.

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agolavc/audiotoolboxenc: fix dropped frames on iOS
Rick Kern [Thu, 2 Jun 2016 06:25:21 +0000 (02:25 -0400)]
lavc/audiotoolboxenc: fix dropped frames on iOS

AudioConverterFillComplexBuffer() doesn't always call its callback. A frame
queue is used to prevent skipped audio samples.

Signed-off-by: Rick Kern <kernrj@gmail.com>
4 years agoavformat/http: change seek_ret to int64
Yuri Zats [Thu, 9 Jun 2016 17:54:20 +0000 (10:54 -0700)]
avformat/http: change seek_ret to int64

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil/threadmessage.h: Fix swapped comments
Jan Sebechlebsky [Fri, 10 Jun 2016 17:11:00 +0000 (19:11 +0200)]
avutil/threadmessage.h: Fix swapped comments

Fix swapped descriptions of av_thread_message_queue_set_err_send
and av_thread_message_queue_set_err_recv.

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoavodec/h264dec: fix compilation with -DTRACE
James Almer [Thu, 16 Jun 2016 21:52:23 +0000 (18:52 -0300)]
avodec/h264dec: fix compilation with -DTRACE

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agofate: add test for agate
Petru Rares Sincraian [Thu, 16 Jun 2016 15:12:29 +0000 (17:12 +0200)]
fate: add test for agate

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/sheervideo: check build_vlc for failure
Paul B Mahol [Thu, 16 Jun 2016 21:05:30 +0000 (23:05 +0200)]
avcodec/sheervideo: check build_vlc for failure

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavd/v4l2: allow devices not implementing VIDIOC_G_PARM
Niklas Söderlund [Wed, 15 Jun 2016 15:21:42 +0000 (17:21 +0200)]
lavd/v4l2: allow devices not implementing VIDIOC_G_PARM

Not all v4l2 devices implement the VIDIOC_G_PARM ioctl. This patch allow
ffmpeg to open such device and treat it the same as devices that do
implement the ioctl but returns that it do not implement the
V4L2_CAP_TIMEPERFRAME capability.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodoc/APIchanges: Fill in some missing things
Michael Niedermayer [Wed, 15 Jun 2016 21:27:38 +0000 (23:27 +0200)]
doc/APIchanges: Fill in some missing things

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agofate: add swr-resample_exact_async tests
Muhammad Faiz [Wed, 15 Jun 2016 06:58:01 +0000 (13:58 +0700)]
fate: add swr-resample_exact_async tests

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
4 years agolavc/dpx: Support decoding 12 bit colourspace with transparency information.
Carl Eugen Hoyos [Wed, 15 Jun 2016 15:45:51 +0000 (17:45 +0200)]
lavc/dpx: Support decoding 12 bit colourspace with transparency information.

4 years agolavc/mediacodec: re-indent after previous commit
Matthieu Bouron [Wed, 15 Jun 2016 14:40:36 +0000 (16:40 +0200)]
lavc/mediacodec: re-indent after previous commit

4 years agolavc/mediacodec: refactor ff_AMediaCodecList_getCodecByType
Matthieu Bouron [Thu, 2 Jun 2016 08:42:25 +0000 (10:42 +0200)]
lavc/mediacodec: refactor ff_AMediaCodecList_getCodecByType

Allows to select a codec (encoder or decoder) only if it supports a
specific profile.

Adds ff_AMediaCodecProfile_getProfileFromAVCodecContext to convert an
AVCodecContext profile to a MediaCodec profile. It only supports H264
for now.

The codepath using MediaCodecList.findDecoderForFormat() (Android >= 5.0)
has been dropped as this method does not allow to select a decoder
compatible with a specific profile.

4 years agoavfilter/af_hdcd: Use int32_t instead of int for gaintable in hdcd filter.
Benjamin Steffes [Sun, 29 May 2016 15:45:33 +0000 (17:45 +0200)]
avfilter/af_hdcd: Use int32_t instead of int for gaintable in hdcd filter.

Signed-off-by: Benjamin Steffes <benjaminst123@gmail.com>
(comment by ronald)
prevent the theoretical case where the container type (int)
would be 64 bit on some platforms, which would waste some space

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agovf_codecview: added new options
dsmudhar [Thu, 9 Jun 2016 13:12:33 +0000 (18:42 +0530)]
vf_codecview: added new options

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agohls muxer doc: clarify segment splitting option
Benoit Fouet [Wed, 8 Jun 2016 09:42:51 +0000 (11:42 +0200)]
hls muxer doc: clarify segment splitting option

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoos_support: use the appropriate stat functions matching the stat type
Hendrik Leppkes [Tue, 14 Jun 2016 15:02:40 +0000 (17:02 +0200)]
os_support: use the appropriate stat functions matching the stat type

The stat struct is defined to stati64, which requires using the appropriate wstati/stati functions as well.
Fixes a whole bunch of compiler warnings as well as build breakage with the decklink avdevice.

Fixes trac #5640

4 years agoavformat/utils: in debug mode, print number of streams found before avformat_find_str...
Aman Gupta [Tue, 14 Jun 2016 18:08:54 +0000 (11:08 -0700)]
avformat/utils: in debug mode, print number of streams found before avformat_find_stream_info()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/mpegts: enhance logging in trace mode
Aman Gupta [Tue, 14 Jun 2016 18:08:53 +0000 (11:08 -0700)]
avformat/mpegts: enhance logging in trace mode

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/vf_telecine: Make frame writable before writing into it
Michael Niedermayer [Tue, 14 Jun 2016 15:13:51 +0000 (17:13 +0200)]
avfilter/vf_telecine: Make frame writable before writing into it

Fixes Ticket 5627

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agox86/aacpsdsp: optimize add_squares loop
James Almer [Tue, 14 Jun 2016 15:41:23 +0000 (12:41 -0300)]
x86/aacpsdsp: optimize add_squares loop

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agolavc/dpx: Support decoding 10 bit colourspace with transparency information.
Carl Eugen Hoyos [Tue, 14 Jun 2016 15:02:34 +0000 (17:02 +0200)]
lavc/dpx: Support decoding 10 bit colourspace with transparency information.

Fixes one sample from ticket #5639.

4 years agodoc/muxers/mpegts: apply misc consistency/formatting fixes
Stefano Sabatini [Sun, 5 Jun 2016 08:36:26 +0000 (10:36 +0200)]
doc/muxers/mpegts: apply misc consistency/formatting fixes

4 years agolavf/utils: fix timestamp trace log in estimate_timings() function
Stefano Sabatini [Thu, 2 Jun 2016 15:50:00 +0000 (17:50 +0200)]
lavf/utils: fix timestamp trace log in estimate_timings() function

Use the correct timebase, also replace "stream" with "format" in the
context of the format.

4 years agolavc/h264_sei: fix broken style around green metadata code
Clément Bœsch [Mon, 13 Jun 2016 20:57:48 +0000 (22:57 +0200)]
lavc/h264_sei: fix broken style around green metadata code

4 years agolavc/h264: rename GreenMetaData to H264SEIGreenMetaData
Clément Bœsch [Mon, 13 Jun 2016 20:56:16 +0000 (22:56 +0200)]
lavc/h264: rename GreenMetaData to H264SEIGreenMetaData

Reduces diff for the next merge with Libav.

4 years agolavc/h264_sei: reduce scope of parameters for green meta decode
Clément Bœsch [Mon, 13 Jun 2016 20:54:23 +0000 (22:54 +0200)]
lavc/h264_sei: reduce scope of parameters for green meta decode

This is again will help the merge as ff_h264_decode_sei will not have
access to H264Context anymore.

4 years agolavc/h264: move green meta logging out of the sei decoding
Clément Bœsch [Mon, 13 Jun 2016 19:41:53 +0000 (21:41 +0200)]
lavc/h264: move green meta logging out of the sei decoding

This will simplify the next Libav merge where SEI decoding doesn't have
access to the debug level anymore.

4 years agortpdec_vp9: Support parsing the scalability structure
Martin Storsjö [Wed, 27 Apr 2016 11:36:57 +0000 (14:36 +0300)]
rtpdec_vp9: Support parsing the scalability structure

We still only support one single layer though, but this allows
receiving streams that have this structure present even for
single layer streams.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_h264: Use avpriv_report_missing_feature instead of a manual av_log
Martin Storsjö [Fri, 29 Apr 2016 19:19:33 +0000 (22:19 +0300)]
rtpdec_h264: Use avpriv_report_missing_feature instead of a manual av_log

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec: Use AVERROR_PATCHWELCOME instead of AVERROR(ENOSYS) for
Martin Storsjö [Fri, 29 Apr 2016 17:37:24 +0000 (20:37 +0300)]
rtpdec: Use AVERROR_PATCHWELCOME instead of AVERROR(ENOSYS) for
unimplemented features

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_vp9: Update header parsing to spec draft 02
Martin Storsjö [Wed, 27 Apr 2016 11:36:24 +0000 (14:36 +0300)]
rtpdec_vp9: Update header parsing to spec draft 02

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_vp9: Make sure to free the temp buffer on close
Martin Storsjö [Wed, 27 Apr 2016 11:03:18 +0000 (14:03 +0300)]
rtpdec_vp9: Make sure to free the temp buffer on close

Signed-off-by: Martin Storsjö <martin@martin.st>