generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
74,812 Commits 24 Branches 241 Tags 173 MiB
9136e65c40
Commit Graph

74812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul B Mahol
9136e65c40 avcodec/fraps: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-03 09:47:44 +00:00
Michael Niedermayer
4cad4bd4ca avformat/hlsenc: Fix memleak of path 
Fixes: CID1322343
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 11:28:29 +02:00
Michael Niedermayer
e3d8504fd0 avformat/hlsenc: Initialize vtt_oc to help static analyzers 
This is also more robust in case it ever is used

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 11:28:29 +02:00
Michael Niedermayer
879603fa3f avformat/latmenc: Add assert to avoid coverity warning 
Fixes CID1322323

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 11:28:29 +02:00
Paul B Mahol
8d2b4b8c82 avfilter/vf_drawgraph: add rscroll slide mode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-03 09:12:14 +00:00
Paul B Mahol
81f7a2579b avcodec/vorbisdec: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-03 09:12:14 +00:00
Paul B Mahol
7820197d2c avfilter/vf_vectorscope: constify more variables 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-03 09:12:14 +00:00
Paul B Mahol
1c88ef0c99 avfilter/vf_vectorscope: support more formats for color4 mode in common case 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-03 09:12:14 +00:00
Paul B Mahol
19dfbe9298 avfilter/vf_elbg: make it possible to output to pal8 pixel format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-03 09:12:06 +00:00
Michael Niedermayer
bd70303ead avformat/swfdec: Check return value of init_get_bits8() 
Fixes: CID1322320

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 10:20:29 +02:00
Michael Niedermayer
32f53958b8 swresample/swresample: Fix integer overflow in seed calculation 
Fixes CID1322333

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 09:32:43 +02:00
Michael Niedermayer
053e80f6ea avformat/mov: Fix integer overflow in FFABS 
Fixes: unknown_unknown_19e_414_cov_764838672_bellhamlam.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 09:20:57 +02:00
Michael Niedermayer
d6cd614dac avutil/common: Add FFNABS() 
This macro avoids the undefined corner case with the *_MIN values

Previous version Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 09:05:50 +02:00
Michael Niedermayer
d1bdaf3fb2 avformat/dump: Fix integer overflow in aspect ratio calculation 
Fixes: unknown_unknown_19e_414_cov_764838672_bellhamlam.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 02:50:41 +02:00
Michael Niedermayer
733511fb53 avutil/common: Document FFABS() corner case 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 02:18:01 +02:00
Marton Balint
26a0cd1b4b lavf: add V as a video stream specifier which is not an attached picture 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-09-02 21:35:21 +02:00
Michael Niedermayer
863522431f avcodec/mpeg12dec: Fix integer overflow 
Fixes: signal_sigabrt_7ffff6ac8cc9_686_cov_1897408623_microsoft_new_way_to_shove_mpeg2_in_asf.dvr_ms

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 21:11:07 +02:00
Michael Niedermayer
d9b56895b5 avcodec/mpegvideo: change bit_rate to 64bit 
32bit is not sufficient for all cases

Fixes: signal_sigabrt_7ffff6ac8cc9_686_cov_1897408623_microsoft_new_way_to_shove_mpeg2_in_asf.dvr_ms

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 21:10:36 +02:00
Michael Niedermayer
5b6a50e150 avcodec/mpegvideo_parser: Fix integer overflow 
Fixes: signal_sigabrt_7ffff6ac8cc9_686_cov_1897408623_microsoft_new_way_to_shove_mpeg2_in_asf.dvr_ms

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 20:55:09 +02:00
Michael Niedermayer
cf818be4f2 avcodec/truemotion1: Fix undefined behavior (left shift of negative value) 
Fixes: asan_heap-oob_26f6853_862_cov_585961513_sonic3dblast_intro-partial.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 20:45:07 +02:00
周晓勇
95010d49a2 avcodec: loongson optimize mpeg2 dct unquantize intra and denoise dct 
Change-Id: I2f391ae912a079fb32f0703841dca86358aac72a
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 16:53:32 +02:00
Vittorio Giovara
c4a0a326a1 lavfi/colormatrix: Add a bt601 alias 
Matches what av_get_colorspace_name() and av_color_space_name() report.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 16:35:21 +02:00
Carl Eugen Hoyos
a4188c9cd2 ffmpeg: Improve help text for -target. 
Fixes ticket #1057.
 2015-09-02 14:32:06 +02:00
Michael Niedermayer
933309a6ca avcodec/mips/aaccoder_mips: disable optimizatios which break fate-aac-pns-encode 
These should be re enabled once the issue is fixed

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 13:04:57 +02:00
Rostislav Pehlivanov
10d16647cc fate: increase fuzziness for the AAC encoder prediction test 
Fails on x86_64 using ICC 13.1.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2015-09-02 08:36:53 +01:00
Rostislav Pehlivanov
dcf72da841 fate: add fuzziness to the AAC Encode prediction test 
Fails on ppc64 architecture under Ubuntu.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2015-09-02 07:15:42 +01:00
Rostislav Pehlivanov
72adf24310 fate: update AAC encoder tests 
TNS had both IS and PNS switched on when it makes more sense
to have them both off.

Prediction had a redundant argument.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2015-09-02 06:39:59 +01:00
Rostislav Pehlivanov
20dc527139 aacenc: reorder coding tools 
This commit reorders the coding tools such that they're doing what
the decoder does in reverse order. The very first thing the decoder
does is to decode M/S stereo if that's signalled, then prediction,
IS, and finally TNS and PNS in another function.
adjust_frame_information()'s application of IS and M/S was taken
out into two separate functions since prediction doesn't expect
to get the raw coefficients but rathe the coefficients at that
part of the encoding process.

The results show a much better PSNR when any combination of
Intensity Stereo, Mid/Side stereo and Prediction is used, which
is a sign of an increased encoder efficiency as well as the fact
that the decoder gets what it expects.

Otherwise, with only IS, PNS or prediction there are neither
regressions nor improvements except in the case of IS, which
now by itself (or with PNS) is less prone to artifacts. Enabling
M/S (using stereo_mode) as well will also reduce stereo artifacts
induced by IS, so in the very near future M/S may be enabled
by default.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2015-09-02 06:26:45 +01:00
LiuQi
a4055d3e5d avformat/hlsenc: add a use_localtime option to expand the segment filename with localtime 
test examples:

./ffmpeg -re -i ~/Movies/objectC/facebook.mp4 -v verbose -c copy -f hls -hls_segment_filename test-%s.ts -use_localtime 1 -bsf:v h264_mp4toannexb aaa.m3u8

[StevenLiu@localhost ffmpeg]$ cat aaa.m3u8;ll test-*.ts
test-1441052221.ts
test-1441052231.ts
test-1441052235.ts
test-1441052243.ts
test-1441052249.ts
-rw-r--r--  1 StevenLiu  staff  1310736  9  1 04:15 test-1441052131.ts
-rw-r--r--  1 StevenLiu  staff   495192  9  1 04:15 test-1441052141.ts
-rw-r--r--  1 StevenLiu  staff  1310736  9  1 04:17 test-1441052212.ts
-rw-r--r--  1 StevenLiu  staff  1067840  9  1 04:17 test-1441052221.ts
-rw-r--r--  1 StevenLiu  staff   235564  9  1 04:17 test-1441052231.ts
-rw-r--r--  1 StevenLiu  staff  1187220  9  1 04:17 test-1441052235.ts
-rw-r--r--  1 StevenLiu  staff   694848  9  1 04:17 test-1441052243.ts
-rw-r--r--  1 StevenLiu  staff   526588  9  1 04:17 test-1441052249.ts
[StevenLiu@localhost ffmpeg]$

./ffmpeg -re -i ~/Movies/objectC/facebook.mp4 -v verbose -c copy -f hls -hls_segment_filename test-%s.ts -use_localtime 1 -bsf:v h264_mp4toannexb aaa.m3u8

[StevenLiu@localhost ffmpeg]$ cat aaa.m3u8;ll aaa-*.ts
aaa-1441052417.ts
aaa-1441052427.ts
aaa-1441052437.ts
aaa-1441052440.ts
aaa-1441052449.ts
-rw-r--r--  1 StevenLiu  staff  1310736  9  1 04:19 aaa-1441052382.ts
-rw-r--r--  1 StevenLiu  staff   277300  9  1 04:19 aaa-1441052392.ts
-rw-r--r--  1 StevenLiu  staff  1310736  9  1 04:20 aaa-1441052417.ts
-rw-r--r--  1 StevenLiu  staff  1067840  9  1 04:20 aaa-1441052427.ts
-rw-r--r--  1 StevenLiu  staff   235564  9  1 04:20 aaa-1441052437.ts
-rw-r--r--  1 StevenLiu  staff  1187220  9  1 04:20 aaa-1441052440.ts
-rw-r--r--  1 StevenLiu  staff   338776  9  1 04:20 aaa-1441052449.ts
[StevenLiu@localhost ffmpeg]$

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 04:31:32 +02:00
Rainer Hochecker
62bd8deef9 avcodec/hevc_parser: fix split function of parser 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 02:48:43 +02:00
Michael Niedermayer
b7baebb754 avcodec/ffv1dec: Print CRCs at picture debug level 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 02:11:43 +02:00
Michael Niedermayer
eac161451d avcodec/ffv1dec: Check that there is enough space for the CRC in the global header 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 02:10:31 +02:00
Michael Niedermayer
1376084dcb avcodec/h264_slice: replace assert by normal error check 
Fixes assertion failure
Fixes: c6075771557e4f3b7b74e63d2d24fb01/signal_sigabrt_7ffff6ac8cc9_133_cov_2853689970_CREDITS.FST

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 01:22:45 +02:00
Carl Eugen Hoyos
3eae98c1ac lavf/dv: Do not return EIO for every error (like EOF). 
Fixes ticket #4818.

Reviewed-by: Ronald S. Bultje
Reviewed-by: Paul B Mahol
 2015-09-02 00:59:10 +02:00
Ricardo Constantino
9dbc50b4cd avfilter/vf_subtitles: allow setting fonts directory 
This is mostly useful if libass was compiled with a font provider
other than fontconfig, but is still useful in that case.

Signed-off-by: Ricardo Constantino <wiiaboo@gmail.com>
 2015-09-02 00:47:52 +02:00
Michael Niedermayer
642d2f9d55 avcodec/version: Minor version bump due to 5d12d7de2c 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-01 23:02:15 +02:00
Michael Niedermayer
c7c207aecd avformat/mxg: Use memmove() 
Fixes undefined behavior
Fixes: 1700002963a49da13542e0726b7bb758/unknown_unknown_292_658_cov_2141972066_m1.mxg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-01 22:46:23 +02:00
Petri Hintukainen
5d12d7de2c mpegts: demux BluRay text subtitles 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-01 14:35:32 +02:00
Petri Hintukainen
757cb0f286 mpegts: fix demuxing PES private stream 2 
PES header size is 6 bytes (00 00 01 bf XX XX), not 0.
BluRay text subtitles use private stream 2.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-01 14:35:32 +02:00
Ganesh Ajjanagadde
d79c200000 avfilter/vf_spp: use the name 's' for the pointer to the private context 
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-09-01 12:02:56 +00:00
Andrew Stone
dc926ab518 rtmp: support the AMF_DATE tag 
Instead of returning EINVAL, which can cause a stream to fail to load, this
allows the tag to be passed through to the flv demuxer, where it's summarily
ignored.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-01 13:35:37 +02:00
Rostislav Pehlivanov
8ffe1cb4d7 aacenc: disable bandtype modifying extensions when coder != twoloop 
If the selected coder isn't twoloop, this commit temporarily
disables IS and PNS.
The problem is in the encode_window_bands_info() being confused
and setting invalid band_types for non-marked (normal) bands.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2015-09-01 12:07:00 +01:00
Paul B Mahol
c3cd1a7496 avfilter/vf_waveform: support envelope for all filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-01 08:43:34 +00:00
Paul B Mahol
97c7c39d25 avfilter/vf_waveform: simplify memory allocations 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-01 08:43:34 +00:00
Paul B Mahol
32f217edad avfilter/vf_waveform: implement various filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-01 08:43:34 +00:00
Rostislav Pehlivanov
b86532810d fate: adjust fuzz of AAC Encoder's TNS test 
Have to adjust it again, this time because of --enable-small on
gcc 4.5 in Linaro.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2015-09-01 09:08:31 +01:00
Carl Eugen Hoyos
670d8ecfae lavf: Remove probesize32 and max_analyze_duration32 on version bump. 
Add FF_API_PROBESIZE_32 to allow removing 32bit probesize and 32bit
max_analyze_duration after the next libavformat version bump.
 2015-09-01 09:19:49 +02:00
Carl Eugen Hoyos
0cb6c0ec48 lavfi/scale: Pass src_range and dst_range to libswscale. 
Fixes ticket #4812.
 2015-09-01 09:17:26 +02:00
Rostislav Pehlivanov
555f513769 fate: update AAC tests to the new defaults 
IS and PNS increase quality a ton so as a result the PSNR changed.
Disable the extensions and keep the tests separate such that there
will be no red herrings if one test fails.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2015-09-01 07:26:03 +01:00
Rostislav Pehlivanov
bc9927b854 aacenc: Enable Intensity Stereo by default 
Since the changes made a few week ago (which were done more than a
month ago) the quality and stability of intensity stereo has been
notably good. There were some requests and wishes to have in on by
default and therefore it has been enabled. Should any regressions
arise changes will be made to preferably keep it operating rather
than just disabling it by default again.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2015-09-01 07:15:23 +01:00