Hendrik Leppkes
6fc74934de
Merge commit 'dc7501e524dc3270335749302c7aa449973625f3'
...
* commit 'dc7501e524dc3270335749302c7aa449973625f3':
checkasm: Issue emms after benchmarking functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:18:05 +02:00
Hendrik Leppkes
6f74e3cde6
Merge commit 'beb62dac629603eb074a44c44389c230b5caac7c'
...
* commit 'beb62dac629603eb074a44c44389c230b5caac7c':
Use AVFrame.pts instead of deprecated pkt_pts.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:16:36 +02:00
Hendrik Leppkes
3f9137c57d
Merge commit '32c8359093d1ff4f45ed19518b449b3ac3769d27'
...
* commit '32c8359093d1ff4f45ed19518b449b3ac3769d27':
lavc: export the timestamps when decoding in AVFrame.pts
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:03:36 +02:00
Hendrik Leppkes
04a3577263
ffmpeg: remove unused and errorneous AVFrame timestamp check
...
Decoders have previously not used AVFrame.pts, and with the upcoming
deprecation of pkt_pts (in favor of pts), this would lead to an errorneous
interpration of timestamps.
2016-10-07 12:21:18 +02:00
Rodger Combs
0212867202
tests: add -nostdin flag when calling ffmpeg
...
This fixes a long-standing issue where running FATE in parallel could result
in the terminal being left misconfigured, particularly if a test failed or
was canceled wtih ^C.
2016-10-06 18:31:07 -05:00
Rodger Combs
1f7d586052
ffmpeg: don't reconfigure terminal if we're not taking input from stdin
2016-10-06 18:31:06 -05:00
James Almer
711bfb33df
avformat/matroskaenc: add an option to disable writting CRC32 elements
...
Also add missing Changelog entry.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 18:42:10 -03:00
James Almer
3bcadf8227
avformat/matroskaenc: write a CRC32 element on Info
...
Finishes implementing ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 17:16:12 -03:00
James Almer
650e17d88b
avformat/matroskaenc: write a CRC32 element on Tags
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 17:13:59 -03:00
James Almer
4687240d52
avformat/matroskaenc: write a CRC32 element on Attachments
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 17:10:51 -03:00
James Almer
eccefece61
avformat/matroskaenc: write a CRC32 element on Chapters
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 17:08:14 -03:00
James Almer
87ce2595de
avformat/matroskaenc: write a CRC32 element on Tracks
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 17:05:03 -03:00
James Almer
79248795d4
avformat/matroskaenc: write a CRC32 element on Cues
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 17:01:20 -03:00
James Almer
3b189fae73
avformat/matroskaenc: write a CRC32 element on SeekHead
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 16:59:09 -03:00
James Almer
6724525a15
avformat/matroskaenc: write a CRC32 element on each Cluster
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 16:54:07 -03:00
James Almer
4e3bdf729a
avformat/matroskaenc: always use a dynamic buffer when writting clusters
...
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 16:30:56 -03:00
James Almer
d41aeea8a6
avformat/matroskaenc: print debug message with cluster offsets only if the output is seekable
...
Printing the dynamic buffer offset is useless.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 16:30:56 -03:00
James Almer
a4044498f7
avformat/matroskadec: check for more reserved values on some Colour elements
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 13:49:29 -03:00
James Almer
9b8ac526f6
avformat/matroskaenc: don't write an empty Colour master element
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 13:49:10 -03:00
Carl Eugen Hoyos
d2af93ac16
configure: Also try -mstack-alignment for clang,
...
Fixes stack alignment on x86_32 FreeBSD.
Fixes ticket #5231 .
2016-10-06 18:44:29 +02:00
Matthieu Bouron
0919151651
lavc/mediacodecdec: fix size variable shadowing in ff_mediacodec_dec_decode
...
Fixes incompatible pointer type warning on 64-bit systems.
2016-10-06 16:49:28 +02:00
Nablet Developer
8d858674fd
avcodec/qsvenc_h264: fix segfault when a53 SEI is not available
...
Signed-off-by: Nablet Developer <sdk@nablet.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-06 14:01:40 +02:00
Rodger Combs
a6bce3ca90
lavf/utils: avoid using programs for duration when there's only one
...
This allows us to be more selective about the streams we derive durations from
(specifically, ignoring text streams with outlier end times) in the common case
2016-10-06 01:36:05 -05:00
Rodger Combs
4c9c4fe8b2
lavf/utils: ignore outlier subtitle and data stream end times as well
2016-10-06 01:36:05 -05:00
Timothy Gu
54220ce731
pixfmt: Use enum assignment for aliases
...
This way, Doxygen is happier as aliases are now grouped together, and
it never handled #define's in an enum well in the first place.
Y400A already exists as an enum assignment.
2016-10-05 17:17:50 -07:00
Timothy Gu
bdcd586c0d
pixdesc: Order function prototypes semantically
2016-10-05 17:17:50 -07:00
Shivraj Patil
c1cc13cd2a
avutil/mips/generic_macros_msa: rename macro variable which causes segfault for mips r6
...
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-05 23:44:03 +02:00
Florian Diemer
db4c1bee96
avformat/riffenc: added possibility to set first to ninth audio language for RIFF taged files (e.g. avi files)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-05 23:38:21 +02:00
Burt P
2c3d936487
af_hdcd: disable auto-convert by default
...
As all known valid HDCD sample formats and sample rates are now handled
by the filter, remove the scan that "invades the privacy" of the filter graph
and turn off autoconvert by default as requested by Nicolas George.
http://ffmpeg.org/pipermail/ffmpeg-devel/2016-August/197571.html
Signed-off-by: Burt P <pburt0@gmail.com >
2016-10-05 12:52:56 -05:00
Burt P
f51ddbf83c
af_hdcd: add experimental 20 and 24-bit decoding support
...
I don't have any legitimate 20 or 24-bit HDCD to test. It is known
that the PM Model Two would insert packets into 20 and 24-bit output,
but I have no idea what differences in behavior existed when decoding
20 or 24-bit. For now, as with 16-bit, PE (if enabled) will expand the
top 3dB into 9dB and LLE (gain adjust) will be applied if signaled.
Signed-off-by: Burt P <pburt0@gmail.com >
2016-10-05 12:48:59 -05:00
Burt P
4f94f01414
af_hdcd: hdcd_scan() and hdcd_integrate() handle stereo and single channel
...
New versions of hdcd_scan() and hdcd_integrate() that also do the
work of hdcd_scan_stereo() and hdcd_integrate_stereo().
Some code split into previously separate functions to remove
duplication is now merged back into each function in the single
place where it is used.
Signed-off-by: Burt P <pburt0@gmail.com >
2016-10-05 12:39:52 -05:00
Burt P
80d89c1960
af_hdcd: support s16p (WavPack) directly
...
The buffer is already being copied anyway, so interlace the planar
format during the copy and remove one use of auto-convert.
Signed-off-by: Burt P <pburt0@gmail.com >
2016-10-05 12:38:26 -05:00
Burt P
7e46bb80ef
af_hdcd: allow all HDCD sample rates
...
The PM Model Two could output HDCD-encoded audio in CD and all
DVD-Audio sample rates. (44100, 48000, 88200, 96000, 176400, and
192000 Hz)
Signed-off-by: Burt P <pburt0@gmail.com >
2016-10-05 12:37:55 -05:00
Burt P
de9b23ac1f
af_hdcd: add mono as a supported channel layout
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-10-05 12:37:22 -05:00
Philip Langdale
e5bbedff82
ChangeLog: Add latest CUVID changes
2016-10-05 08:28:21 -07:00
Carl Eugen Hoyos
beb877bae0
lavc/tiff: Print compression debug information.
2016-10-05 13:49:17 +02:00
wm4
40fbf32042
lavc: set best effort timestamp if unset when using new decode API
...
Some API users (in particular ffmpeg.c) check the best effort timestamp
only.
2016-10-05 11:35:54 +02:00
Josh de Kock
5173ffb27f
doc/developer: remove duplicate policies and fix error
...
Fixes regression as of ee72b6d1
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Josh de Kock <josh@itanimul.li >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-04 22:55:44 -03:00
James Almer
b33369b612
avformat/matroskaenc: don't reserve space for stream duration tags if the output is not seekable
...
The durations are never written in that situation.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-04 21:19:58 -03:00
James Almer
3cc9d6d382
avformat/matroska: write FlagInterlaced element in WebM
...
It's listed as supported in both https://www.webmproject.org/docs/container/
and https://matroska.org/technical/specs/index.html
Reviewed-by: Dave Rice <dave@dericed.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-04 19:42:55 -03:00
Josh de Kock
ee72b6d187
doc/developer: add sections for policies
...
And sort policies into these sections.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-10-04 18:42:13 +01:00
Josh de Kock
36fa3d8807
doc/developer: reword some of the policies
...
Explicitly state that FATE should pass, and code should work
for all reviewers who tested.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-10-04 18:41:50 +01:00
Adriano Pallavicino
21d3f0c020
lavc/ivi_dsp.c: fix warnings due to indentation
...
Signed-off-by: Adriano Pallavicino <adriano.pallavicino@gmail.com >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-10-04 18:38:41 +01:00
Timo Rothenpieler
5d4fea88d4
avcodec/cuvid: don't align frame size
...
hwcontext_cuda was changed to take care of proper alignment internally
2016-10-04 12:58:42 +02:00
Rodger Combs
14fe54bbfb
lavf/mpegtsenc: fix autobsf when the first NAL is 0x1<XX> bytes
2016-10-04 01:20:20 -05:00
Rodger Combs
63fbeebf6e
configure: add linker export script support on Darwin
...
This isn't a "version script" in the usual sense, since it doesn't set symbol
versions directly. Instead, the version for the whole .dylib is set in the
linker flags, and we generate a list of symbol patterns to export. This allows
us to keep our local symbols (e.g. ff_*) local on the platform.
The Darwin linker's exported_symbols_list format is a bit different than the
one used by the GNU linker. It doesn't handle local symbols at all, since when
a list is provided, all unlisted symbols are local by default; thus, we remove
local sections. It doesn't handle per-version sections, so we remove the
headers and brackets. It expects symbols to be prefixed with an underscore.
It errors if a listed symbol with no wildcards is not present in the output,
so we append an asterisk to any symbol that doesn't already end in one.
2016-10-04 01:11:04 -05:00
Steven Liu
be1d32492e
avformat/hlsenc: support multi level path in m3u8 with filename
...
before patch:
localhost:osx liuqi$ tree 20160926/
20160926/
└── file-20160909
└── 26
└── 16
└── 15
├── 46
│ ├── 13.ts
│ ├── 25.ts
│ ├── 36.ts
│ ├── 45.ts
│ └── 54.ts
└── 47
├── 04.ts
├── 14.ts
├── 24.ts
└── 35.ts
6 directories, 9 files
localhost:osx liuqi$ cat out.m3u8
#EXTM3U
#EXT-X-VERSION:3
#EXT-X-TARGETDURATION:12
#EXT-X-MEDIA-SEQUENCE:0
#EXTINF:11.360000,
13.ts
#EXTINF:10.800000,
25.ts
#EXTINF:9.120000,
36.ts
#EXTINF:8.760000,
45.ts
#EXTINF:10.200000,
54.ts
#EXTINF:10.720000,
04.ts
#EXTINF:9.600000,
14.ts
#EXTINF:10.600000,
24.ts
#EXTINF:8.760000,
35.ts
#EXT-X-ENDLIST
after patch:
localhost:osx liuqi$ tree 20160926/
20160926/
└── file-20160909
└── 26
└── 16
└── 15
├── 46
│ ├── 13.ts
│ ├── 25.ts
│ ├── 36.ts
│ ├── 45.ts
│ └── 54.ts
└── 47
├── 04.ts
├── 14.ts
├── 24.ts
└── 35.ts
6 directories, 9 files
localhost:osx liuqi$ cat out.m3u8
#EXTM3U
#EXT-X-VERSION:3
#EXT-X-TARGETDURATION:12
#EXT-X-MEDIA-SEQUENCE:0
#EXTINF:11.360000,
20160926/file-20160909/26/16/15/46/13.ts
#EXTINF:10.800000,
20160926/file-20160909/26/16/15/46/25.ts
#EXTINF:9.120000,
20160926/file-20160909/26/16/15/46/36.ts
#EXTINF:8.760000,
20160926/file-20160909/26/16/15/46/45.ts
#EXTINF:10.200000,
20160926/file-20160909/26/16/15/46/54.ts
#EXTINF:10.720000,
20160926/file-20160909/26/16/15/47/04.ts
#EXTINF:9.600000,
20160926/file-20160909/26/16/15/47/14.ts
#EXTINF:10.600000,
20160926/file-20160909/26/16/15/47/24.ts
#EXTINF:8.760000,
20160926/file-20160909/26/16/15/47/35.ts
#EXT-X-ENDLIST
Signed-off-by: Steven Liu <lingjiujianke@gmail.com >
2016-10-04 06:41:53 +08:00
Stephan Holljes
d0be0cbebc
lavf/aviobuf.c: Adapt avio_accept and avio_handshake to new AVIOContext API
...
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com >
2016-10-03 23:28:48 +02:00
Marton Balint
fbf8ac7d2a
lavd/openal: don't return zero sized packet if no samples are available
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-03 21:15:48 +02:00
Marton Balint
2face3e7b5
lavc/utils: disallow zero sized packets with data set in avcodec_send_packet
...
Reviewed-by: wm4 <nfxjfg@googlemail.com >
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-03 21:15:26 +02:00