summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lavfi/testsrc2: fix hang with very small sizes.Nicolas George2017-10-311-2/+2
| | | | Move a subtraction to the other side of the equal to avoid overflows.
* Merge commit '126bc2c33b79c36bc23f43719d20f55b9b6771e9'James Almer2017-10-300-0/+0
|\ | | | | | | | | | | | | | | | | | | * commit '126bc2c33b79c36bc23f43719d20f55b9b6771e9': vp9_superframe_bsf: convert to the new bitstream reader This commit is a noop, see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html Merged-by: James Almer <[email protected]>
| * vp9_superframe_bsf: convert to the new bitstream readerAnton Khirnov2017-05-201-10/+12
| |
* | Merge commit '3daaa4417317ca732fb00476fdb3308d784f87e4'James Almer2017-10-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '3daaa4417317ca732fb00476fdb3308d784f87e4': hevc: Add names for reserved NAL unit types h264_sei: Add namespace prefix to all SEI values This commit is a noop, see 6eb102a616364d06a4cc994339b72910b3547e5f b264810ef7a3fcd7cfc8e232877cfb2fdf7954f6 Merged-by: James Almer <[email protected]>
| * hevc: Add names for reserved NAL unit typesMark Thompson2017-05-161-0/+16
| | | | | | | | | | While not yet used, these NAL units do already have some defined semantics and are referred to elsewhere.
| * h264_sei: Add namespace prefix to all SEI valuesMark Thompson2017-05-165-55/+56
| | | | | | | | | | This avoids confusion with equivalent H.265 SEI values when both are being used at the same time.
* | Merge commit '4d56f7ab8f627aa140c1ede1bb61305f01cefcdd'James Almer2017-10-301-3/+9
|\| | | | | | | | | | | | | * commit '4d56f7ab8f627aa140c1ede1bb61305f01cefcdd': avconv: Flush output BSFs when stream copy reaches EOF Merged-by: James Almer <[email protected]>
| * avconv: Flush output BSFs when stream copy reaches EOFMark Thompson2017-05-161-2/+8
| | | | | | | | | | Same as f64d1100a54d12c78ce436181bb64229c56da6b3, for stream copy rather than encode.
* | Merge commit '66aa9b94dae217a0fc5acfb704490707629d95ed'James Almer2017-10-300-0/+0
|\| | | | | | | | | | | | | | | | | * commit '66aa9b94dae217a0fc5acfb704490707629d95ed': doc: Document hwupload, hwdownload and hwmap filters This commit is a noop, see 5de38188f82ac21fc645009dbb6c593049eb773d Merged-by: James Almer <[email protected]>
| * doc: Document hwupload, hwdownload and hwmap filtersMark Thompson2017-05-161-0/+98
| |
* | Merge commit '7c35bee0251efc271c8f7900ce816fcb8ec25d19'James Almer2017-10-300-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '7c35bee0251efc271c8f7900ce816fcb8ec25d19': movenc-test: Add tests for negative cts offsets movenc: Don't write any edit list if the start offset is zero This commit is a noop, see 5455a44aa5077bcd33485f424e055807afcefeb5 Merged-by: James Almer <[email protected]>
| * movenc-test: Add tests for negative cts offsetsMartin Storsjö2017-05-152-0/+30
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
| * movenc: Don't write any edit list if the start offset is zeroMartin Storsjö2017-05-151-2/+1
| | | | | | | | | | | | In these cases, the CTTS flag is set, but no edit list is necessary. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'c380a0d7f7a2c7411aae60463e25d916541f0388'James Almer2017-10-300-0/+0
|\| | | | | | | | | | | | | | | | | * commit 'c380a0d7f7a2c7411aae60463e25d916541f0388': movenc: Add an option for enabling negative CTS offsets This commit is a noop, see 07e4be7ec94cbd8e674a260c939054f018d337eb Merged-by: James Almer <[email protected]>
| * movenc: Add an option for enabling negative CTS offsetsMartin Storsjö2017-05-152-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | This reduces the need for an edit list; streams that start with e.g. dts=-1, pts=0 can be encoded as dts=0, pts=0 (which is valid in mov/mp4) by shifting the dts values of all packets forward. This avoids the need for edit lists for such streams (while they still are needed for audio streams with encoder delay). This eases conformance with the DASH-IF interoperability guidelines. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'd05c9cde0e87c23ca42957646bea483dfc09d6bf'James Almer2017-10-301-1/+1
|\| | | | | | | | | | | | | * commit 'd05c9cde0e87c23ca42957646bea483dfc09d6bf': checkasm: aarch64: Specify alignment for the register_init const array Merged-by: James Almer <[email protected]>
| * checkasm: aarch64: Specify alignment for the register_init const arrayMartin Storsjö2017-05-151-1/+1
| | | | | | | | | | | | | | Loads from this strictly doesn't require alignment, but specify it just for consistency with the arm version. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'd7320ca3ed10f0d35b3740fa03341161e74275ea'James Almer2017-10-303-25/+5
|\| | | | | | | | | | | | | * commit 'd7320ca3ed10f0d35b3740fa03341161e74275ea': arm: Avoid using .dn register aliases Merged-by: James Almer <[email protected]>
| * arm: Avoid using .dn register aliasesMartin Storsjö2017-05-153-25/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clang now (in the upcoming 5.0 version) is capable of building our arm assembly without relying on gas-preprocessor, although clang/LLVM doesn't support .dn register aliases. The VC1 MC assembly was only built and used if the chosen assembler supported the .dn directives though. This was supported as long as gas-preprocessor was used. This means that VC1 decoding got a speed regression on clang 5.0, unless the user manually chose using gas-preprocessor again. By avoiding using the .dn register aliases, we can build the VC1 MC assembly with the latest clang version. Support for the .dn/.qn directives in clang/LLVM isn't actively planned, see https://bugs.llvm.org/show_bug.cgi?id=18199. This partially reverts 896a5bff64264f4d01ed98eacc97a67260c1e17e. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '6ccf76aec73b2cd598bb1e65d126d8a12540c411'James Almer2017-10-300-0/+0
|\| | | | | | | | | | | | | | | | | * commit '6ccf76aec73b2cd598bb1e65d126d8a12540c411': mpjpeg: Use proper CR/LF in multipart headers This commit is a noop, see 0d2f4eedc8a46892471c51cbc7a78cd9a489771a Merged-by: James Almer <[email protected]>
| * mpjpeg: Use proper CR/LF in multipart headersMartin Storsjö2017-05-111-4/+4
| | | | | | | | | | | | This is more correct. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'cb167f2947f1a2c446bd8db196d0e64ef4a6d06b'James Almer2017-10-301-0/+7
|\| | | | | | | | | | | | | * commit 'cb167f2947f1a2c446bd8db196d0e64ef4a6d06b': h264_refs: validate the SPS pointer in ff_h264_execute_ref_pic_marking() Merged-by: James Almer <[email protected]>
| * h264_refs: validate the SPS pointer in ff_h264_execute_ref_pic_marking()Sean McGovern2017-05-091-0/+7
| | | | | | | | | | Bug-Id: 1036 CC: [email protected]
* | Merge commit 'cfd25488bf35123bdd38ecbe1107a21df2e03c2f'James Almer2017-10-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'cfd25488bf35123bdd38ecbe1107a21df2e03c2f': hevcdec: move SEI message parsing into a separate header hevcdec: remove HEVCContext usage from hevc_sei This commit is a noop, see c4b08c8a4e54b752641d0792d9a73e16e62a0bbc a687fb997097ac1d1870b6de5160d45e5f57e871 Merged-by: James Almer <[email protected]>
| * hevcdec: move SEI message parsing into a separate headerJames Almer2017-05-093-61/+95
| | | | | | | | | | | | | | It doesn't depend on hevcdec anymore. Signed-off-by: James Almer <[email protected]> Signed-off-by: Luca Barbato <[email protected]>
| * hevcdec: remove HEVCContext usage from hevc_seiJames Almer2017-05-093-79/+86
| | | | | | | | | | | | | | | | | | | | Based on the H264 SEI implementation. This will be mainly useful once support for SEI messages that can be used by the hevc parser are implemented, like Picture Timing. Signed-off-by: James Almer <[email protected]> Signed-off-by: Luca Barbato <[email protected]>
* | Merge commit '59cee42d7d22530e66a155305389e29679b11f78'James Almer2017-10-302-0/+6
|\| | | | | | | | | | | | | * commit '59cee42d7d22530e66a155305389e29679b11f78': arm: Check for the .arch directive in configure Merged-by: James Almer <[email protected]>
| * arm: Check for the .arch directive in configureMartin Storsjö2017-05-082-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | When targeting windows, the .arch directive isn't available. So far, when building for windows, we've always used gas-preprocessor, both when using msvc's armasm and when using clang. Lately, clang/llvm has implemented the last missing piece (altmacro support) for building our assembly without gas-preprocessor. This means that we now build for arm/windows with clang without any extra compatibility layer. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'ce080f47b8b55ab3d41eb00487b138d9906d114d'James Almer2017-10-302-21/+294
|\| | | | | | | | | | | | | * commit 'ce080f47b8b55ab3d41eb00487b138d9906d114d': hevc: Add NEON 32x32 IDCT Merged-by: James Almer <[email protected]>
| * hevc: Add NEON 32x32 IDCTAlexandra Hájková2017-05-042-21/+294
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '118dd4a321a2d67f67c21b076abd0b4d939ab642'James Almer2017-10-301-8/+8
|\| | | | | | | | | | | | | * commit '118dd4a321a2d67f67c21b076abd0b4d939ab642': hevc: 16x16 NEON idct: Use the right element size for loads/stores Merged-by: James Almer <[email protected]>
| * hevc: 16x16 NEON idct: Use the right element size for loads/storesAlexandra Hájková2017-05-041-8/+8
| | | | | | | | | | | | | | This doesn't change the actual behaviour of the code but improves readability. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '504403ab28688588fb85817ad58964482f67f29f'James Almer2017-10-300-0/+0
|\| | | | | | | | | | | | | | | | | * commit '504403ab28688588fb85817ad58964482f67f29f': aacsbr: Turnoff in the event of over read. This commit is a noop, see 2c8a3aa985acc906ecab37357f2798da7cb9822d Merged-by: James Almer <[email protected]>
| * aacsbr: Turnoff in the event of over read.Alex Converse2017-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aliased compressed AAC bytes are almost certainly not meaningful SBR data. In the wild this causes harsh artifacts switching HE-AAC streams that don't have SBR headers aligned with segment boundaries. Turning off SBR falls back to a default set of upsampling parameters that can function as a sort of error concealment. This is consistent with how the decoder handles other sorts of errors. Bug-Id: 1047 CC: [email protected] Signed-off-by: Sean McGovern <[email protected]>
* | Merge commit 'b5f19f7478492307e4b4763aeac3180faf50e17f'James Almer2017-10-3014-52/+141
|\| | | | | | | | | | | | | * commit 'b5f19f7478492307e4b4763aeac3180faf50e17f': aac: Split function to parse ADTS header data into public and private part Merged-by: James Almer <[email protected]>
| * aac: Split function to parse ADTS header data into public and private partDiego Biurrun2017-05-0212-50/+139
| | | | | | | | | | | | This makes the currently semi-public avpriv_aac_parse_header() function private to libavcodec and adds a proper public API function to return the parts of the ADTS header required in libavformat.
* | Merge commit '0ac1fec1c3dacedabbf3dd4122ef4bf8523e688c'James Almer2017-10-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit '0ac1fec1c3dacedabbf3dd4122ef4bf8523e688c': bitstream: Move VLC reading functions into the vlc.h header vlc: Add header #include when the types are used This commit is a noop, see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html Merged-by: James Almer <[email protected]>
| * bitstream: Move VLC reading functions into the vlc.h headerLuca Barbato2017-05-022-73/+74
| | | | | | | | | | | | This makes the bitstream.h header leaner. Signed-off-by: Diego Biurrun <[email protected]>
| * vlc: Add header #include when the types are usedLuca Barbato2017-05-0229-0/+29
| | | | | | | | | | | | Do not rely on indirectly including it from bitstream.h. Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit 'edbf0fffb15dde7a1de70b05855529d5fc769f14'James Almer2017-10-302-0/+102
|\| | | | | | | | | | | | | * commit 'edbf0fffb15dde7a1de70b05855529d5fc769f14': hevc: Add NEON add_residual for bitdepth 10 Merged-by: James Almer <[email protected]>
| * hevc: Add NEON add_residual for bitdepth 10Alexandra Hájková2017-05-012-0/+102
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '81a4cb8e58636d4efd200c2b4fec786a7e948d8b'James Almer2017-10-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81a4cb8e58636d4efd200c2b4fec786a7e948d8b': vf_hwmap: Add reverse mapping for hardware frames vf_hwmap: Add device derivation hwcontext: Improve allocation in derived contexts hwcontext_qsv: Implement mapping frames to the child device type hwcontext_qsv: Implement mapping frames from the child device type hwcontext: Add frame context mapping for nontrivial contexts hwcontext_qsv: Support derivation from child devices avconv: Support setting the hardware device to use when filtering avconv_hw: Add implicit device creation with default parameters vp9_raw_reorder_bsf: Remove a redundant allocation This commit is a noop, see 49419925d33304ff907075289808226a695ff57b 06043cc0bc72b530db352a67776392cf61a54104 7ce47090ce36fbe72f807d1e35fea3a699adad17 045ff8d30a6942b72c8be064c3b8415b037dab02 ec3dbeae8139a8bbd8b0fa4514a3cf349de7f335 f82ace71c0d8dd6500daa7ccce5b1fece8a95341 a97fb14418fd621defec1ea5cd387953407b180d d59c6a3aebc20cc64cb7a46401cb55f02f4cbe09 b2ef1f42badd1c5731816a3959b6dbb62187dbcc d81be0a60a6dea2bc48ec29f9466eee63984ed34 Merged-by: James Almer <[email protected]>
| * vf_hwmap: Add reverse mapping for hardware framesMark Thompson2017-04-301-7/+61
| | | | | | | | | | | | | | | | | | This is something of a hack. It allocates a new hwframe context for the target format, then maps it back to the source link and overwrites the input link hw_frames_ctx so that the previous filter will receive the frames we want from ff_get_video_buffer(). It may fail if the previous filter imposes any additional constraints on the frames it wants to use as output.
| * vf_hwmap: Add device derivationMark Thompson2017-04-301-18/+49
| | | | | | | | | | Also refactor a little and improve error messages to make failure cases easier to understand.
| * hwcontext: Improve allocation in derived contextsMark Thompson2017-04-305-3/+26
| | | | | | | | | | | | | | Use the flags argument of av_hwframe_ctx_create_derived() to pass the mapping flags which will be used on allocation. Also, set the format and hardware context on the allocated frame automatically - the user should not be required to do this themselves.
| * hwcontext_qsv: Implement mapping frames to the child device typeMark Thompson2017-04-301-2/+86
| |
| * hwcontext_qsv: Implement mapping frames from the child device typeMark Thompson2017-04-301-32/+142
| | | | | | | | Factorises out existing surface initialisation code to reuse.
| * hwcontext: Add frame context mapping for nontrivial contextsMark Thompson2017-04-302-1/+13
| | | | | | | | | | | | | | Some frames contexts are not usable without additional format-specific state in hwctx. This change adds new functions frames_derive_from and frames_derive_to to initialise this state appropriately when deriving a frames context which will require it to be set.
| * hwcontext_qsv: Support derivation from child devicesMark Thompson2017-04-301-29/+84
| |
| * avconv: Support setting the hardware device to use when filteringMark Thompson2017-04-304-2/+40
| | | | | | | | | | | | This only supports one device globally, but more can be used by passing them with input streams in hw_frames_ctx or by deriving new devices inside a filter graph with hwmap.