Commit Graph

80842 Commits

Author SHA1 Message Date
Matthieu Bouron
55816c9269 lavc/mediacodec: increase buffer dequeue timeout when the codec needs to be drained
Increase buffer dequeue timeout when the codec needs to be drained as it
could happen that no input buffer is available when we receive a null
packet for the first time (meaning we are unable to signal end of stream
and mark the codec as draining).

Fixes potential loss of last frames after sending a null packet.
2016-06-23 14:14:15 +02:00
Matthieu Bouron
b316ebf46d lavc/mediacodec: rely on buffer flags to detect end of stream 2016-06-23 14:14:15 +02:00
Matthieu Bouron
30e3a27119 lavc/mediacodec: re-indent after previous commit 2016-06-23 14:14:15 +02:00
Matthieu Bouron
a71d518575 lavc/mediacodec: discard 0-sized buffers
Their only purpose is to carry the end of stream flag.
2016-06-23 14:14:15 +02:00
Clément Bœsch
c8550e8244 ffprobe: print stereo3d information
Based on 8e757716c6

See https://github.com/mpv-player/mpv/issues/1045 for mk3d
elektranox.org samples.
2016-06-23 13:48:14 +02:00
Clément Bœsch
ccf942a0c2 ffprobe: refactor pkt side data printing 2016-06-23 13:48:14 +02:00
Clément Bœsch
78f5589b29 Merge commit '8e757716c61e0563a63829e30b02d5ba2a422ad6'
* commit '8e757716c61e0563a63829e30b02d5ba2a422ad6':
  avprobe: Print stereo3d information

This commit is not merged as it doesn't apply at all in our tree. The
two following commits will add the same feature.

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-23 13:47:01 +02:00
Derek Buitenhuis
a02766fb4d avcodec: remove libutvideo wrapper support
The 10-bit decoding support is available now in native decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-06-23 13:04:11 +02:00
Paul B Mahol
dccea0ed0d avcodec/sheervideo: fix YbYr format decoding
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-06-23 12:59:20 +02:00
Clément Bœsch
abb3cc46d5 Merge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'
* commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd':
  stereo3d: Add API to get name from value or value from name

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-23 12:38:51 +02:00
Clément Bœsch
5954730ba3 Merge commit 'd621b2f795684f7119057f986066060adbe84220'
* commit 'd621b2f795684f7119057f986066060adbe84220':
  lavf: Raw G.729 demuxer

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-23 12:26:25 +02:00
Clément Bœsch
28dac0dc06 Merge commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7'
* commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7':
  fate: Update fate-lavf-ts after commit 393596f9d5

This commit is a noop, see c0ff42bf64

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-23 12:16:42 +02:00
Clément Bœsch
84b39d3e14 Merge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8'
* commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8':
  tools: Port to codec parameters API

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-23 12:14:45 +02:00
David Murmann
c3b0af7456 avformat/mov: add more datatypes in metadata handling
Implement variable sized big-endian integers, since these are found
in files created by ARRI cameras.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-23 11:40:32 +02:00
Clément Bœsch
c0ff42bf64 Merge commit '393596f9d51134d6e45d81ae129223f4faea1232'
* commit '393596f9d51134d6e45d81ae129223f4faea1232':
  mpegtsenc: stop impersonating ses in sdt

This commit also includes the needed FATE updates later spotted by
Martin Storsjö and fixed in 34effe816f on
Libav side.

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-23 08:17:31 +02:00
rogerdpack
bfbffbd7d8 dshow: avoid duplicate NULL check before free
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-23 03:18:16 +02:00
rogerdpack
9e907c040d dshow: don't add two instances of same device to graphs
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-23 03:18:16 +02:00
Michael Niedermayer
18f687f737 MAINTAINERS: Remove Linux / PowerPC maintainer
See: [FFmpeg-devel] PPC64: PowerPC Maintainer information is incorrect

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-23 00:55:13 +02:00
Petru Rares Sincraian
f6c48a7316 fate: add apad test
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-23 00:47:13 +02:00
Clément Bœsch
aef2d3d2b5 lavc: fix previous merge 2016-06-23 00:42:16 +02:00
Clément Bœsch
bcafc41a5a Merge commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c'
* commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c':
  Move VLC and RL_VLC_ELEM structure definitions to a separate header

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-23 00:29:25 +02:00
Hendrik Leppkes
e799e2270c Merge commit 'b23613268c6b56a8f9de7859562d82b4b88353d9'
* commit 'b23613268c6b56a8f9de7859562d82b4b88353d9':
  avconv_dxva2: use the hwcontext API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-22 23:36:37 +02:00
Hendrik Leppkes
0c312a4562 hwcontext_dxva2: support P010 10-bit surfaces 2016-06-22 23:28:47 +02:00
Petru Rares Sincraian
610c0770e3 fate: add test for amerge
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 23:05:33 +02:00
Hendrik Leppkes
3689efea3d Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'
* commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8':
  hwcontext: add a dxva2 implementation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-22 22:38:49 +02:00
Michael Niedermayer
d0b21b28a3 avformat/flacdec: Fix seeking close to EOF
Fixes Ticket5428

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 21:10:37 +02:00
Michael Niedermayer
b0b3676e13 avcodec/flac_parser: Raise threshold for detecting invalid data
Fixes regression from Ticket5428

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 21:10:36 +02:00
Clément Bœsch
6c98398b0b lavc/get_bits: add a logging context to check_marker()
Based on d338abb664
2016-06-22 20:07:49 +02:00
Clément Bœsch
7475a9351f Merge commit 'd338abb664febbc2c7266af7818aab1f12dbc161'
* commit 'd338abb664febbc2c7266af7818aab1f12dbc161':
  mpeg4videodec: Call av_log() in check_marker() with AVCodecContext instead of NULL

This commit is a noop.

Since check_marker() is still in get_bits.h in FFmpeg and shared amongst
decoders, a similar but different change will be committed in the next
commit in to serve the same purpose of this one (that is, passing a
logging context to the av_log() in that function).

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-22 20:05:03 +02:00
Clément Bœsch
575be7311c Merge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834'
* commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834':
  Move check_marker() from get_bits to mpeg4videodec

Not merged, check_marker() is used in various other places in FFmpeg.

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-22 19:57:11 +02:00
Clément Bœsch
541e1c2c3b Merge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'
* commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3':
  lavc: mark the old audio/video encoding API as deprecated

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-22 19:51:36 +02:00
Clément Bœsch
93f5a27313 Merge commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c'
* commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c':
  x86inc: Enable AVX emulation in additional cases

This commit is a noop, see e428f3b30c

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-22 19:40:49 +02:00
Clément Bœsch
1c85027afe Merge commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600'
* commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600':
  x86inc: Improve handling of %ifid with multi-token parameters

This commit is a noop, see 4bd5583ace

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-22 19:40:29 +02:00
Clément Bœsch
3d1b9383b7 Merge commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f'
* commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f':
  x86inc: Fix AVX emulation of some instructions

This commit is a noop, see 42be240ad6

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-22 19:39:13 +02:00
Clément Bœsch
a24cbbbfc4 Merge commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc'
* commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc':
  x86inc: Fix AVX emulation of scalar float instructions

This commit is a noop, see 8dd3ee9ddd

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-22 19:38:53 +02:00
Clément Bœsch
17fdffc9f8 Merge commit '8996515b137f962e3a8691241c285c96437b6c53'
* commit '8996515b137f962e3a8691241c285c96437b6c53':
  avpacket: fix setting AVPacket.data in av_packet_ref()

This commit is a noop, see ed3a02547c

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-22 19:32:00 +02:00
Clément Bœsch
d4b1b3b06c Merge commit 'e62ff72fc1052273deb708ba715f73e5187281d4'
* commit 'e62ff72fc1052273deb708ba715f73e5187281d4':
  lavc: make avcodec_open2() fail when the timebase is not set for encoding

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-22 19:29:56 +02:00
Michael Niedermayer
70d48accd8 avcodec/tests/options: Set timebase
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 18:49:33 +02:00
Clément Bœsch
a444a50510 Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f'
* commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f':
  Combine deprecation guards where appropriate

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-22 17:36:42 +02:00
Clément Bœsch
48ac4532d4 lavf/img2dec: add pnm pipe demuxers 2016-06-22 15:24:19 +02:00
Michael Niedermayer
99c3c3237b avformat/utils: Use internal->avctx for bitrate in estimate_timings_from_bit_rate() if needed
The internal avctx bitrate is copied into codecpar after estimate_timings()

Fixes Ticket5646

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 14:16:58 +02:00
Michael Niedermayer
4fecb97fd3 avformat/utils: change bit_rate to 64 bit in estimate_timings_from_bit_rate()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 14:16:58 +02:00
Clément Bœsch
a9eda4b260 swr: fix time.h include 2016-06-22 14:00:08 +02:00
Clément Bœsch
5d48e4eafa Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'
* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196':
  tests: Move all test programs to a subdirectory

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-22 13:44:34 +02:00
Michael Bradshaw
989a614b70 libavformat/matroskaenc: omit segment UID for webm
SegmentUID is not a supported element in WebM. See:
http://www.webmproject.org/docs/container/#SegmentUID

Reviewed-by: Dave Rice <dave@dericed.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 12:12:46 +02:00
Clément Bœsch
5558ff3a9f Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'
* commit '257f00ec1ab06a2a161f535036c6512f3fc8e801':
  Split global .gitignore file into per-directory files

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-22 11:28:51 +02:00
Clément Bœsch
85185578ce lavc/qtrleenc: simplify FF_API_CODED_FRAME deprecation guard 2016-06-22 11:09:19 +02:00
Clément Bœsch
0491d6993a lavc/error_resilience: remove unused skip_last_mv label
Unused since a7b8a6e704
2016-06-22 11:07:54 +02:00
Clément Bœsch
e6247a22c0 Merge commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b'
* commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b':
  Add some more deprecation guards

- psnr() deprecation is not merged within ffmpeg.c as we still use it in
  non-deprecated code

- the XVMC chunk is not merged as we still apparently maintain it

- The guarding in lavc/qtrleenc.c could be simplified but merged anyway.

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-22 11:06:04 +02:00
Matthieu Bouron
df3484f87c lavc/videotoolbox: fix avcC extradata creation
Fixes properly ticket #5638.

Since 772ad7142d PPS and SPS contain the
nal type byte.

This reverts commit b8d754c5d0.
This reverts commit 8e47a99f57.
2016-06-22 10:03:45 +02:00