aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump minor versions after release/4.0 branchingn4.1-devMichael Niedermayer2018-04-168-8/+8
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Bump minor versions for branching release/4.0Michael Niedermayer2018-04-168-11/+11
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/APIchanges: Add 4.0 cut pointMichael Niedermayer2018-04-161-0/+2
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/APIchanges: Fill in missing stuffMichael Niedermayer2018-04-161-33/+33
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/showvolume : cosmetic move bracket after func declaration to a new lineMartin Vignali2018-04-161-1/+2
|
* avfilter/showvolume : add persistent max displayMartin Vignali2018-04-162-0/+62
| | | | draw a color line for the max level in the given duration
* avfilter/showvolume : add display scale optionMartin Vignali2018-04-162-3/+29
| | | | linear (current behaviour) or log display (more close to classic audio meter)
* avfilter/af_headphone: fix type=time with hrir=multichPaul B Mahol2018-04-161-2/+2
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/hlsenc: avformat/hlsenc: add error message for encrypt fmp4 modeSteven Liu2018-04-161-1/+6
| | | | | | | and refine the warning message when use both hls_key_info_file and hls_enc Reviewed-by: Gyan Doshi <ffmpeg@gyani.pro> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* amfenc: Remove spurious initialisationsMark Thompson2018-04-151-47/+29
| | | | Also minor cosmetics.
* amfenc: Add DXVA2 hardware frame input supportAlexander Kravchenko2018-04-151-0/+79
| | | | | | | Adds support for AMF initialisation from a DXVA2 (Direct3D9) device, and then allows passing DXVA2 surfaces into an AMF encoder. Signed-off-by: Mark Thompson <sw@jkqxz.net>
* amfenc: Ensure that the software format of hardware frames is validAlexander Kravchenko2018-04-151-3/+9
| | | | Signed-off-by: Mark Thompson <sw@jkqxz.net>
* amfenc: Do not automatically download/upload unknown hardware input framesMark Thompson2018-04-151-53/+35
| | | | | | | | Supplying a hardware input frame which is not in the input hardware frames context is not allowed by the API, so additional code to handle it is not necessary. Further, handling it automatically results in very low performance - it is more appropriate to fail immediately so that the user can fix their incorrect setup.
* amfenc: Fail to open if the user-supplied device is not usableMark Thompson2018-04-151-49/+81
| | | | | | | | If the user supplies a device or frames context then it is an error not to use it; this is consistent with other hardware components. Also factorise out the D3D11 initialisation and improve error messages.
* configure: fix clang-cl detectionAlexander Bilyak2018-04-151-2/+2
| | | | | | | | | When using clang-cl it expects parameters passed in MSVC-style, so appropriate toolchain should be selected. As soon as both clang and clang-cl report themselfs as "clang" with -v option the only chance to detect clang-cl is passing -? option to both which is valid for clang-cl.exe and not for clang.exe. Reviewed-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/af_headphone: add single hrir multichannel stream modePaul B Mahol2018-04-152-54/+150
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/nvdec: correctly set intra_pic_flag for h264/hevcTimo Rothenpieler2018-04-152-2/+8
|
* avcodec/aac_ac3_parser: account for data already in the parsing bufferHendrik Leppkes2018-04-151-0/+3
| | | | | | | | | | | If a frame starts very close to a packet boundary, the start code may already have been added to the parsing buffer, indicated by a small negative value of "i", while the header is still being tracked in the "state" variable. Reduce the remaining size accordingly, otherwise trying to find the next frame could skip over the frame header and lump two frames together as one.
* avcodec/dxv: add support for "high" quality modePaul B Mahol2018-04-151-35/+780
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avutil/random_seed: use bcrypt instead of the old wincrypt APISteve Lhomme2018-04-142-12/+13
| | | | | | | | Remove the wincrypt API calls since we don't support XP anymore and bcrypt is available since Vista, even on Windows Store builds. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avfilter/af_headphone: fix memory leak and overreadPaul B Mahol2018-04-141-3/+7
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/af_headphone: do not output invalid samples when flushingPaul B Mahol2018-04-141-4/+12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/af_headphone: fix flushingPaul B Mahol2018-04-141-1/+14
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/af_headphone: improve performance and reduce latencyPaul B Mahol2018-04-142-12/+6
| | | | | | Remove not needed code. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* tests/checkasm/checkasm: Provide verbose failure information on ↵Michael Niedermayer2018-04-141-1/+5
| | | | | | | | float_near_abs_eps() failures This will make understanding failures and adjusting EPS easier Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/utils: use the existing packet reference when parsing complete framesJames Almer2018-04-131-3/+20
| | | | | | | | | | | | If the parser returns full frames, then the output pointer retured by av_parser_parse2() is guaranteed to point to data contained in the input packet's buffer. Create a new reference to said buffer in that case, to avoid unnecessary data copy when queueing the packet later in the function. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* Merge commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce'James Almer2018-04-137-37/+8
|\ | | | | | | | | | | | | * commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce': Drop Windows XP support remnants Merged-by: James Almer <jamrial@gmail.com>
| * Drop Windows XP support remnantsDiego Biurrun2018-04-096-32/+6
| |
* | Merge commit 'c7ab6aff66cba2f265f656ce8d56aa428d4ada76'James Almer2018-04-130-0/+0
|\| | | | | | | | | | | | | | | | | * commit 'c7ab6aff66cba2f265f656ce8d56aa428d4ada76': w32pthreads: always use Vista+ API, drop XP support This commit is a noop, see 9b121dfc32810250938021952aab4172a988cb56 Merged-by: James Almer <jamrial@gmail.com>
| * w32pthreads: always use Vista+ API, drop XP supportwm42018-04-096-279/+23
| | | | | | | | | | | | | | | | | | | | | | | | This removes the XP compatibility code, and switches entirely to SRW locks, which are available starting at Windows Vista. This removes CRITICAL_SECTION use, which allows us to add PTHREAD_MUTEX_INITIALIZER, which will be useful later. Windows XP is hereby not a supported build target anymore. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'c31f6b1d61759436ef50c094e7f4c8005e97614a'James Almer2018-04-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c31f6b1d61759436ef50c094e7f4c8005e97614a': avprobe: Print a user-friendly version of the display matrix avprobe: Support printing strings with empty keys This commit is a noop. ffprobe is considerably different than avprobe and is already printing display matrix values in a user readable way. Merged-by: James Almer <jamrial@gmail.com>
| * avprobe: Print a user-friendly version of the display matrixVittorio Giovara2018-04-091-0/+10
| | | | | | | | Shift fixed point numbers to be actual decimal numbers.
| * avprobe: Support printing strings with empty keysVittorio Giovara2018-04-091-12/+26
| |
* | Merge commit 'cc06f7bd10c236539b4f6f87b795c459dd873770'James Almer2018-04-131-0/+11
|\| | | | | | | | | | | | | * commit 'cc06f7bd10c236539b4f6f87b795c459dd873770': libx265: Support tiny video sizes Merged-by: James Almer <jamrial@gmail.com>
| * libx265: Support tiny video sizesVittorio Giovara2018-04-091-0/+11
| | | | | | | | | | | | Where tiny is less than the default CTU size. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '54307b35311e9a871b3d8ecb2b2eecfc16de0163'James Almer2018-04-131-1/+3
|\| | | | | | | | | | | | | * commit '54307b35311e9a871b3d8ecb2b2eecfc16de0163': lavc/qsvdec: set complete_frame flags for progressive picture Merged-by: James Almer <jamrial@gmail.com>
| * lavc/qsvdec: set complete_frame flags for progressive pictureZhong Li2018-04-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the flag MFX_BITSTREAM_COMPLETE_FRAME when it is a progressive picture. This can fix vc1 decoding segment fault issues because can't set the start code correctly. See: ./avconv -hwaccel qsv -c:v vc1_qsv -i /fate-suite/vc1/SA00040.vc1 -vf "hwdownload, format=nv12" -f rawvideo /dev/null v2: fix some h264 interlaced clips regression a. field_order of some h264 interlaced video (e.g: cama3_vtc_b.avc) is marked as AV_FIELD_UNKNOWN in h264_parser.c. This is not a completed frames. So only set the MFX_BITSTREAM_COMPLETE_FRAME when it is progressive. b. some clips have both progressive and interlaced frames (e.g.CAPAMA3_Sand_F.264), the parsed field_order maybe changed druing the decoding progress. This patch has been verified for other codecs(mpeg2/hevc/vp8). Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
* | Merge commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42'James Almer2018-04-1310-9/+72
|\| | | | | | | | | | | | | * commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42': qsv: adding Multi Frame Encode support Merged-by: James Almer <jamrial@gmail.com>
| * qsv: adding Multi Frame Encode supportMaxym Dmytrychenko2018-04-0810-10/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting from API 1.25 helps to improve performance of the simultaneous encode, 1:N scenario, like: ./avconv -y -hwaccel qsv -c:v h264_qsv -r 30000/1001 -i ~/bbb_sunflower_1080p_60fps_normal.mp4 -vframes 600 -an \ -filter_complex "split=2[s1][s2]; [s1]scale_qsv=1280:720[o1]; [s2]scale_qsv=960:540[o2]" \ -map [o1] -c:v h264_qsv -b:v 3200k -minrate 3200k -maxrate 3200k -f rawvideo /tmp/3200a.264 \ -map [o2] -c:v h264_qsv -b:v 1750k -minrate 1750k -maxrate 1750k -f rawvideo /tmp/1750a.264 Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
* | Merge commit '29a8ed766354c45c9be4b8512c5b2eb25a450cdc'James Almer2018-04-131-3/+25
|\| | | | | | | | | | | | | * commit '29a8ed766354c45c9be4b8512c5b2eb25a450cdc': lavf/qsvvpp: bypass vpp if not needed. Merged-by: James Almer <jamrial@gmail.com>
| * lavf/qsvvpp: bypass vpp if not needed.Zhong Li2018-04-081-3/+25
| | | | | | | | | | | | | | | | | | | | Currently vpp pipeline is always created, even for the unnecessary cases such as setting the option "vpp_qsv=w=1280:h=720" for an input with native resolution 1280x720. Thus introduces unnecessary performance dropping, so bypass vpp if not needed. Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
* | Merge commit '52ed83fa1a7f5170447eff6fad0b6c57119596e9'James Almer2018-04-133-0/+36
|\| | | | | | | | | | | | | * commit '52ed83fa1a7f5170447eff6fad0b6c57119596e9': lavc/qsvdec: expose frame pic_type and key_frame Merged-by: James Almer <jamrial@gmail.com>
| * lavc/qsvdec: expose frame pic_type and key_frameZhong Li2018-04-083-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently pict_type and key_frame are unset. Add an extra param to fetch the picture type from qsv decoder The judgement “key frame is equal to IDR frame” only suitable for H264. For HEVC, all IRAP frames are key frames, and other codecs have no IDR frame. Signed-off-by: ChaoX A Liu <chaox.a.liu@intel.com> Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
* | Merge commit 'b0958698ea2b976063cb1d683becc213040c709b'James Almer2018-04-130-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'b0958698ea2b976063cb1d683becc213040c709b': libaom: remove references to RGB pixfmts libaom: remove references to yuv440p pixfmt This commit is a noop, see d039d7d4a4a56861e210761902bcf0617e0800fa Merged-by: James Almer <jamrial@gmail.com>
| * libaom: remove references to RGB pixfmtsJames Almer2018-04-041-44/+0
| | | | | | | | | | | | | | | | | | | | | | Support for it was apparently never in the codebase, and the enum values were recently removed from the public headers [1] Fixes build with latest libaom build. [1] https://aomedia.googlesource.com/aom/+/3f29cc20e3a4c348cb41a797c68de856ddb84e12 Signed-off-by: James Almer <jamrial@gmail.com>
| * libaom: remove references to yuv440p pixfmtJames Almer2018-04-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | Support for it was apparently never in the codebase, and the enum values were recently removed from the public headers [1] Fixes build with latest libaom build. [1] https://aomedia.googlesource.com/aom/+/2e3cd5c5c30fa02134681cda900c32486807af3f Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/utils: Check cur_dts in update_initial_timestamps() moreMichael Niedermayer2018-04-131-0/+1
| | | | | | | | | | | | | | | | | | Fixes: runtime error: signed integer overflow: 18133149658382192 - -9223090561878065151 cannot be represented in type 'long long' Fixes: crbug 831552 Reported-by: Matt Wolenetz <wolenetz@google.com> Reviewed-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/utils: Enforce minimum width also for VP5/6Michael Niedermayer2018-04-131-1/+4
| | | | | | | | | | | | | | | | | | Fixes: out of array access Fixes: poc_0411 Found-by: GwanYeong Kim <gy741.kim@gmail.com> Tested-by: GwanYeong Kim <gy741.kim@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/truemotion2: Propagate out of bounds error from GET_TOK()Michael Niedermayer2018-04-131-0/+6
| | | | | | | | | | | | | | | | Fixes: Timeout Fixes: 6389/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5695918121680896 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/utils: Fix integer overflow in end time calculation in ↵Michael Niedermayer2018-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | update_stream_timings() Fixes: crbug 829153 Reported-by: Matt Wolenetz <wolenetz@google.com> Reviewed-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>