summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * qsv{enc,dec}: extend the internal frame allocatorAnton Khirnov2016-11-07
| | | | | | | | | | | | | | Handle the internal frame requests, which is required by the HEVC encoding plugin. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit '00aeedd84105a17f414185bd33ecadebeddb3a27'Mark Thompson2017-03-30
|\| | | | | | | | | | | | | * commit '00aeedd84105a17f414185bd33ecadebeddb3a27': qsv{dec,enc}: use a struct as a memory id with internal memory allocator Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv{dec,enc}: use a struct as a memory id with internal memory allocatorAnton Khirnov2016-11-07
| | | | | | | | | | | | | | This will allow implementing the allocator more fully, which is needed by the HEVC encoder plugin with video memory input. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c'Mark Thompson2017-03-30
|\| | | | | | | | | | | | | | | | | * commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c': qsv{dec,enc}: always use an internal mfxFrameSurface1 Minor fixups for differences in the QSV encoder because of a53cc. Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv{dec,enc}: always use an internal mfxFrameSurface1Anton Khirnov2016-11-07
| | | | | | | | | | | | | | | | For encoding, this avoids modifying the input surface, which we are not allowed to do. This will also be useful in the following commits. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6'Mark Thompson2017-03-30
|\| | | | | | | | | | | | | * commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6': hwcontext_qsv: support frame mapping Merged-by: Mark Thompson <sw@jkqxz.net>
| * hwcontext_qsv: support frame mappingAnton Khirnov2016-11-07
| | | | | | | | Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | avfilter/vf_minterpolate: Use dx and dyMichael Niedermayer2017-03-30
| | | | | | | | | | | | Fixes CID1396283 and CID1396284 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/deshake_opencl: Remove redundant returnMichael Niedermayer2017-03-30
| | | | | | | | | | | | Fixes: CID1396846 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/af_sofalizer: Fix bad shiftMichael Niedermayer2017-03-30
| | | | | | | | | | | | Fixes CID1396835 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d'Mark Thompson2017-03-30
|\| | | | | | | | | | | | | * commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d': hwcontext_qsv: transfer data through the child context when VPP fails Merged-by: Mark Thompson <sw@jkqxz.net>
| * hwcontext_qsv: transfer data through the child context when VPP failsAnton Khirnov2016-11-07
| | | | | | | | | | | | | | | | Uploading/downloading data through VPP may not work for some formats, in that case we can still try to call av_hwframe_transfer_data() on the child context. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68'Mark Thompson2017-03-30
|\| | | | | | | | | | | | | * commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68': hwcontext_qsv: do not fail when download/upload VPP session creation fails Merged-by: Mark Thompson <sw@jkqxz.net>
| * hwcontext_qsv: do not fail when download/upload VPP session creation failsAnton Khirnov2016-11-07
| | | | | | | | | | | | | | Certain pixel formats (e.g. P8) might not be supported for download/upload through VPP operations, but can still be used otherwise. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit 'b115a35ea62b8f479b48d99a601f0e157517301e'Mark Thompson2017-03-30
|\| | | | | | | | | | | | | * commit 'b115a35ea62b8f479b48d99a601f0e157517301e': hwcontext_qsv: add support for the P8 format Merged-by: Mark Thompson <sw@jkqxz.net>
| * hwcontext_qsv: add support for the P8 formatAnton Khirnov2016-11-07
| | | | | | | | | | | | | | | | | | | | | | | | When using GPU surfaces with QSV, one needs to supply a frame allocator, which will be invoked to pass surface pools to libmfx. For encoding, this allocator gets invoked not only for the pool of input frames, but also for a separate pool of (apparently) reconstructed frames and another pool of MFX_FOURCC_P8, which on Windows needs to return D3DFMT_P8 D3D surfaces. Those are probably used to store the encoded bitstream on the GPU. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | avcodec/atrac3: Check init_get_bits8() for failureMichael Niedermayer2017-03-30
| | | | | | | | | | | | | | | | This is more for correctness than actually fixing a missing error path Fixes CID1399967 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/avf_abitscope: Correct range for framerateGyan Doshi2017-03-30
| | | | | | | | | | Signed-off-by: Gyan Doshi <gyandoshi@gmail.com> Signed-off-by: Paul B Mahol <onemda@gmail.com> (via IRC)
* | doc/examples/encode_audio: Favor a sample rate close to 44khz instead of the ↵Michael Niedermayer2017-03-30
| | | | | | | | | | | | | | | | | | | | maximum sample rate This is an example, people will copy and use this. The maximum supported is quite unreasonable as a default choice Reviewed-by: Steven Liu <lingjiujianke@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Fix avframe memleakMichael Niedermayer2017-03-30
| | | | | | | | | | | | Fixes CID1401674 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mux: Check return code of av_packet_split_side_data()Michael Niedermayer2017-03-30
| | | | | | | | | | | | Fixes CID1403225 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/examples/filtering_audio: switch to new decoding APIMatthieu Bouron2017-03-30
| |
* | doc/examples/filtering_video: switch to new decoding APIMatthieu Bouron2017-03-30
| |
* | doc/codecs: add jedec-p22Clément Bœsch2017-03-30
| |
* | avformat/nut: Add HEVC and Opus supportLeo Izen2017-03-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '10065d9324c2e35ce7040b6a2b9ebf6079bcbf42'Hendrik Leppkes2017-03-30
|\| | | | | | | | | | | | | * commit '10065d9324c2e35ce7040b6a2b9ebf6079bcbf42': hwcontext_dxva2: add support for the P8 format Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * hwcontext_dxva2: add support for the P8 formatAnton Khirnov2016-11-07
| | | | | | | | | | | | | | This format is used internally by the QSV encoder to store the encoded bitstream. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit '910973765417f06a4a9ccbd006e4df74c32ecb01'Hendrik Leppkes2017-03-30
|\| | | | | | | | | | | | | * commit '910973765417f06a4a9ccbd006e4df74c32ecb01': hwcontext_dxva2: frame mapping support Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * hwcontext_dxva2: frame mapping supportAnton Khirnov2016-11-07
| | | | | | | | Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit 'fabfbfe5710050812147f93a351a53fdda56ff8c'Clément Bœsch2017-03-30
|\| | | | | | | | | | | | | | | | | * commit 'fabfbfe5710050812147f93a351a53fdda56ff8c': dxva2: fix surface selection when compiled with both d3d11va and dxva2 This commit is a noop, see 153b36fc62849e0e1540a43829794e0503994ebb Merged-by: Clément Bœsch <cboesch@gopro.com>
| * dxva2: fix surface selection when compiled with both d3d11va and dxva2Hendrik Leppkes2016-11-07
| | | | | | | | | | | | | | Fixes a regression introduced in be630b1e08ebe8f766b1798accd6b8e5e096f5aa Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'db0b3dccb3842de134721e8d5c275f56d384340d'Clément Bœsch2017-03-30
|\| | | | | | | | | | | | | | | | | * commit 'db0b3dccb3842de134721e8d5c275f56d384340d': libx265: Add option to force IDR frames This commit is a noop, see 8a8902f2213b28a8dab1520bd42e88e5073f1f59 Merged-by: Clément Bœsch <cboesch@gopro.com>
| * libx265: Add option to force IDR framesDerek Buitenhuis2016-11-07
| | | | | | | | | | | | | | This is in the same the same vein as 380146924ecad2e05e9dcc5c3c2e1b5ba47c51e8. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3cba09e5228c889d63814dc43bc68f15c9dbac77'Clément Bœsch2017-03-30
|\| | | | | | | | | | | | | | | | | * commit '3cba09e5228c889d63814dc43bc68f15c9dbac77': x86: Drop stray semicolons after function definitions This commit is a noop, they are already fixed in FFmpeg. Merged-by: Clément Bœsch <cboesch@gopro.com>
| * x86: Drop stray semicolons after function definitionsDiego Biurrun2016-11-05
| | | | | | | | | | libavcodec/x86/rv40dsp_init.c:97:2: warning: ISO C does not allow extra ‘;’ outside of a function [-Wpedantic] libavcodec/x86/vp9dsp_init.c:94:40: warning: ISO C does not allow extra ‘;’ outside of a function [-Wpedantic]
* | Merge commit 'd1ef1b9eaa45043ea5df5a004fb37243e05da61d'Clément Bœsch2017-03-30
|\| | | | | | | | | | | | | * commit 'd1ef1b9eaa45043ea5df5a004fb37243e05da61d': configure: Silence lld-link when getting the version number Merged-by: Clément Bœsch <cboesch@gopro.com>
| * configure: Silence lld-link when getting the version numberMartin Storsjö2016-11-04
| | | | | | | | | | | | | | | | | | | | | | | | In recent lld-link versions, this command prints the version to stdout, but also prints an error to stderr: $ lld-link -flavor gnu --version LLD 4.0.0 (trunk 285641) lld-link: error: no input files lld-link: error: target emulation unknown: -m or at least one .o file required Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '392caa65df3efa8b2d48a80f08a6af4892c61c08'Clément Bœsch2017-03-30
|\| | | | | | | | | | | | | | | | | * commit '392caa65df3efa8b2d48a80f08a6af4892c61c08': arm: vp9mc: Insert a literal pool at the middle of the file This commit is a noop, see 68caef9d48c4f1540b1b3181ebe7062a3417c62a Merged-by: Clément Bœsch <cboesch@gopro.com>
| * arm: vp9mc: Insert a literal pool at the middle of the fileMartin Storsjö2016-11-04
| | | | | | | | | | | | | | | | | | This fixes errors like this when building non-pic binaries with armv6 as baseline: Error: invalid literal constant: pool needs to be closer Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8ad9f9d675eab139aa2208722009eeed981460dd'Clément Bœsch2017-03-30
|\| | | | | | | | | | | | | * commit '8ad9f9d675eab139aa2208722009eeed981460dd': hwcontext_vaapi: Frame mapping support Merged-by: Clément Bœsch <cboesch@gopro.com>
| * hwcontext_vaapi: Frame mapping supportMark Thompson2016-11-03
| | | | | | | | | | Can map to any supported software format (using a GPU copy if it doesn't actually match the surface format underneath).
* | Merge commit '124e26971e69bb25f38c6c7cb3fa20c77cf10966'Clément Bœsch2017-03-30
|\| | | | | | | | | | | | | * commit '124e26971e69bb25f38c6c7cb3fa20c77cf10966': lavfi: Hardware map filter Merged-by: Clément Bœsch <cboesch@gopro.com>
| * lavfi: Hardware map filterMark Thompson2016-11-03
| | | | | | | | | | | | | | | | | | | | | | | | Takes a frame associated with a hardware context as input and maps it to something else (another hardware frame or normal memory) for other processing. If the frame to map was originally in the target format (but mapped to something else), the original frame is output. Also supports mapping backwards, where only the output has a hardware context. The link immediately before will be supplied with mapped hardware frames which it can write directly into, and this filter then unmaps them back to the actual hardware frames.
* | Merge commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0'Clément Bœsch2017-03-30
|\| | | | | | | | | | | | | * commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0': hwcontext: Hardware frame mapping Merged-by: Clément Bœsch <cboesch@gopro.com>
| * hwcontext: Hardware frame mappingMark Thompson2016-11-03
| | | | | | | | | | | | | | | | | | | | Adds the new av_hwframe_map() function, which allows mapping between hardware frames and normal memory, along with internal support for implementing it. Also adds av_hwframe_ctx_create_derived(), for creating a hardware frames context associated with one device using frames mapped from another by some hardware-specific means.
* | Merge commit '67351924fa91dea4339109100a4c0689f006581f'Clément Bœsch2017-03-30
|\| | | | | | | | | | | | | * commit '67351924fa91dea4339109100a4c0689f006581f': Drop unreachable break and return statements Merged-by: Clément Bœsch <cboesch@gopro.com>
| * Drop unreachable break and return statementsDiego Biurrun2016-11-03
| |
* | Merge commit '99434f4df81b6801b2b535d5b9143305595784f6'Clément Bœsch2017-03-30
|\| | | | | | | | | | | | | * commit '99434f4df81b6801b2b535d5b9143305595784f6': float_dsp: Have implementation match function pointer prototype Merged-by: Clément Bœsch <cboesch@gopro.com>
| * float_dsp: Have implementation match function pointer prototypeDiego Biurrun2016-11-03
| | | | | | | | | | libavutil/x86/float_dsp_init.c(144) : warning C4028: formal parameter 1 different from declaration libavutil/x86/float_dsp_init.c(144) : warning C4028: formal parameter 2 different from declaration
* | Merge commit '6354957a95022864746180525680cca872ab0e0a'Clément Bœsch2017-03-30
|\| | | | | | | | | | | | | * commit '6354957a95022864746180525680cca872ab0e0a': dnxhdenc: Have function pointer prototype match implementation Merged-by: Clément Bœsch <cboesch@gopro.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 11:45:16 +0000