virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
82,813 Commits 37 Branches 400 Tags 467 MiB
34db650784
Commit Graph

82813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
34db650784 swresample/resample_template: Reorder operations to avoid one addition 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-10 02:05:17 +01:00
Michael Niedermayer
b3928a1cc6 swresample/swresample: Check count before memcpy() 
Fixes undefined operation
Fixes part of 668007-media

Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-10 02:05:17 +01:00
Michael Niedermayer
8258e36385 avcodec/mpeg4videodec: Fix undefined shifts in mpeg4_decode_sprite_trajectory() 
Fixes: part of 670190.ogg

Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-09 17:44:54 +01:00
Michael Niedermayer
ee2a6f5df8 avformat/oggdec: Skip streams in duration correction that did not had their duration set. 
Fixes: part of 670190.ogg
Fixes integer overflow

Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-09 17:43:47 +01:00
Derek Buitenhuis
4413e950b2 h264_slice: Wait for refs to be available before we use them in error concealment 
This could happen when there was a frame number gap and frame threading was used.

This fixes #5458.

Debugging-by: Ronald S. Bultje <rsbultje@gmail.com>
Debugging-by: Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-12-09 15:00:29 +00:00
James Almer
06c62ce09c fate: add a monoscopic spherical matroska test 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-09 11:19:38 -03:00
James Almer
77aa8005ec fate: improve fate-mov dependencies 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-09 11:19:29 -03:00
Michael Niedermayer
38a7834bbb avcodec/ffv1enc: Allocate smaller packet if the worst case size cannot be allocated 
We are checking during encoding if there is enough space as version 4 needs that
check.

Fixes Ticket6005

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-09 01:59:40 +01:00
Michael Niedermayer
cff1c0edaa avcodec/ffv1enc: Fix size of first slice 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-09 01:59:30 +01:00
Alex Converse
51a055b206 aacdec: Rename elem_type_prev to che_prev_type. 
It describes the type of the previous che element (SCE, CPE, CCE, or
LFE) and does not reflect non-che elements.
 2016-12-08 13:31:50 -08:00
Alex Converse
d379592687 aacdec: Allow SBR after DRC. 
Fixes https://www2.iis.fraunhofer.de/AAC/7.1auditionOutLeader_v2_rtb.mp4

Reported-by: rcombs on IRC
 2016-12-08 13:31:50 -08:00
Lou Logan
ee795d9d26 doc/muxers: remove "-strict experimental" from tee muxer examples 
Examples use the native FFmpeg AAC encoder but it is no longer
considered experimental and therefore not required.

Signed-off-by: Lou Logan <lou@lrcd.com>
 2016-12-08 12:06:05 -09:00
Paul B Mahol
a251149833 avfilter/vf_deband: fix silly mistakes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-12-08 21:29:58 +01:00
Michael Niedermayer
1296f84495 avformat: Add max_streams option 
This allows user apps to stop OOM due to excessive number of streams

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-08 18:25:30 +01:00
Martin Storsjö
da5c8284c0 aarch64: h264idct: Use the offset parameter to movrel 
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 6a62795d40)
Cherry pick Suggested-by: Martin Storsjö

This should fix the build failure on macosx

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-08 18:11:07 +01:00
Srinath K R
4df5a6a26a avfilter/vf_hwupload_cuda: Add min/max limits for the 'device' option 
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
 2016-12-08 11:11:26 +01:00
James Almer
120471da2d avformat/matroskadec: remove unused variable 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-08 01:23:24 -03:00
James Almer
8396d54d3c avformat/matroskadec: fix memleak on stream side data failure 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-08 01:21:11 -03:00
Michael Niedermayer
3ab1311aba avcodec/golomb: Consume invalid data in get_ur_golomb_jpegls() 
Fixes slow loops on fuzzed data
Fixes: 245/fuzz-3-ffmpeg_AUDIO_AV_CODEC_ID_FLAC_fuzzer

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-08 02:47:47 +01:00
James Almer
445204cd57 avformat/matroskadec: add support for Spherical Video elements 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-07 22:40:59 -03:00
Andreas Cadhalpun
e3694478a9 yuv4mpegdec: fix leaking pkt in yuv4_read_packet 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-12-08 00:26:41 +01:00
James Darnley
acdd2d805d avcodec/h264: resolve assert being triggered when stack is not aligned 
32-bit msvc.
 2016-12-07 22:32:19 +01:00
Vittorio Giovara
0c0da45f0f fate: Add a monoscopic spherical mov test 2016-12-07 14:41:02 -05:00
Vittorio Giovara
4dcdecf471 mov: Export spherical information 
This implements Spherical Video V1 and V2, as described in the
spatial-media collection by Google.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-12-07 14:40:59 -05:00
Vittorio Giovara
e7a6f8c972 lavc: Add spherical packet side data API 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-12-07 14:40:06 -05:00
Vittorio Giovara
8f58ecc344 lavu: Add AVSphericalMapping type and frame side data 
While no decoder currently exports spherical information, this type
represents a frame property that has to be passed through from container
to frames.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-12-07 14:39:04 -05:00
Michael Niedermayer
c188f358aa avcodec/wavpack: Treat the first block coding too many channels as an error 
Fixes memleak
Fixes: 236/8aeebc9ca49b91bf71c114dcefac56c154a3a563

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-07 13:16:32 +01:00
Steven Liu
6b95da9af9 avformat/hlsenc: save the EXT-X-DISCONTINUITY from old list 
when use fix ticket 2nd problem.

command line test step:
rm -rf output*;./ffmpeg  -i ~/Movies/objectC/facebook.mp4 -an -c:v copy
-f hls -hls_time 4 -hls_list_size 5 -hls_flags +delete_segments
-hls_flags +append_list -hls_flags +omit_endlist -hls_flags
+discont_start -t 50 output.m3u8
./ffmpeg -i ~/Movies/objectC/facebook.mp4 -an -c:v libx264 -g 4 -f hls
-hls_time 4 -hls_list_size 5 -hls_flags +delete_segments -hls_flags
+append_list -hls_flags +omit_endlist -hls_flags +discont_start -t 5
output.m3u8
./ffmpeg -i ~/Movies/objectC/facebook.mp4 -an -c:v libx264 -g 4 -f hls
-hls_time 4 -hls_list_size 5 -hls_flags +delete_segments -hls_flags
+append_list -hls_flags +omit_endlist -hls_flags +discont_start -t 5
output.m3u8

result:
 #EXTM3U
 #EXT-X-VERSION:3
 #EXT-X-TARGETDURATION:5
 #EXT-X-MEDIA-SEQUENCE:6
 #EXTINF:4.120000,
 output6.ts
 #EXT-X-DISCONTINUITY
 #EXTINF:4.000000,
 output7.ts
 #EXTINF:0.960000,
 output8.ts
 #EXT-X-DISCONTINUITY
 #EXTINF:4.000000,
 output9.ts
 #EXTINF:0.960000,
 output10.ts

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2016-12-07 07:43:36 +08:00
James Darnley
728651df06 avcodec/h264: mmx2, sse2, avx 10-bit 4:2:2 h chroma deblock/loop filter 
Yorkfield:
 - mmx2: 2.53x (504 vs. 199 cycles)
 - sse2: 3.83x (504 vs. 131 cycles)

Nehalem:
 - mmx2: 2.42x (365 vs. 151 cycles)
 - sse2: 3.56x (365 vs. 103 cycles)

Skylake:
 - mmx2: 1.81x (308 vs. 170 cycles)
 - sse2: 2.84x (308 vs. 108 cycles)
 - avx:  2.93x (308 vs. 105 cycles)
 2016-12-07 00:29:13 +01:00
James Darnley
add21d0bb3 avcodec/h264: mmx2, sse2, avx 10-bit h chroma deblock/loop filter 
Yorkfield:
 - mmx2: 2.45x (279 vs. 114 cycles)
 - sse2: 3.36x (279 vs.  83 cycles)

Nehalem:
 - mmx2: 2.10x (192 vs.  92 cycles)
 - sse2: 2.84x (192 vs.  68 cycles)

Skylake:
 - mmx2: 1.75x (170 vs.  97 cycles)
 - sse2: 2.47x (170 vs.  69 cycles)
 - avx:  2.47x (170 vs.  69 cycles)
 2016-12-07 00:29:13 +01:00
James Darnley
58ca2ef62e whitespace changes after last commit 2016-12-07 00:29:13 +01:00
James Darnley
f33714a694 avcodec/h264: clean up and expand x86 function definitions 2016-12-07 00:29:13 +01:00
Timothy Gu
b6f80b16d1 qsvdec: Fix memory leak 
Fixes CID1396851.
 2016-12-06 13:21:08 -08:00
Timothy Gu
16a75304fe omx: Fix OOM check 
Also use av_mallocz_array().

Fixes CID1396839.
 2016-12-06 13:20:55 -08:00
Georgi D. Sotirov
581f93f37e lavf/chromaprint: Update for version 1.4 
Fixes ticket #5997.
 2016-12-06 21:07:59 +01:00
Thomas Turner
da3c69a5a9 Added test for libavcodec/avpacket.c 
Signed-off-by: Thomas Turner <thomastdt@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-06 17:12:38 +01:00
Michael Niedermayer
7679c38b3b tests/api/api-seek-test: check all compute_crc_of_packets() calls 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-06 15:42:07 +01:00
Michael Niedermayer
5952b8da0b tests/api/api-seek-test: Silence compiler warnings about uninitialized variables 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-06 15:41:32 +01:00
Michael Niedermayer
108db37586 tests/api/api-seek-test: Fix use of uinitialized value 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-06 15:41:31 +01:00
James Almer
9c1ccee7f8 avformat/dump: remove line break on mastering display metadata info dump 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-12-05 20:03:16 -03:00
Mathieu Velten
49e8e5fc56 avcodec/vaapi-vp9: add support for profile 2 (bpp > 8) 
Signed-off-by: Mark Thompson <sw@jkqxz.net>
 2016-12-05 22:12:34 +00:00
Mathieu Velten
b1f630f1a6 avcodec/vp9: move bpp to the shared context for use in hwaccel 
Signed-off-by: Mark Thompson <sw@jkqxz.net>
 2016-12-05 22:12:26 +00:00
Andreas Cadhalpun
46e75617d9 truemotion1: fix leaking frame on init failure 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-12-05 23:04:35 +01:00
Ronald S. Bultje
845bb40178 http: move chunk handling from http_read_stream() to http_buf_read(). 2016-12-05 16:15:10 -05:00
Ronald S. Bultje
2a05c8f813 http: make length/offset-related variables unsigned. 
Fixes #5992, reported and found by Paul Cher <paulcher@icloud.com>.
 2016-12-05 16:15:10 -05:00
Mark Thompson
51020adcec vaapi_encode: Write sequence header as extradata 
Only works if packed headers are supported, where we can know the
output before generating the first frame.

(cherry picked from commit 0cf86fabfa)
 2016-12-05 21:04:00 +00:00
Jun Zhao
f17eea883a lavf: fix the wrong warning msg and comments about av_find_stream_info 
av_find_stream_info() was deprecated by avformat_find_stream_info(),
correct the warning message in the avformat_find_stream_info() and
comments in the avformat.h

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-05 21:30:12 +01:00
Michael Niedermayer
a5d25faa3f ffserver: Check chunk size 
Fixes out of array access

Fixes: poc_ffserver.py
Found-by: Paul Cher <paulcher@icloud.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-05 21:30:12 +01:00
Michael Niedermayer
a5f27a9c3a Avoid using the term "file" and prefer "url" in some docs and comments 
This should make it less ambigous that these are URLs

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-05 21:30:12 +01:00
Michael Niedermayer
7d57ca4d9a avformat/rtmppkt: Check for packet size mismatches 
Fixes out of array access

Found-by: Paul Cher <paulcher@icloud.com>
Reviewed-by: Paul Cher <paulcher@icloud.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-05 21:30:12 +01:00