summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* compat/cuda: add dynamic loaderTimo Rothenpieler2016-11-22
|
* avformat/flvenc: add no_metadata to flvflagsSteven Liu2016-11-22
| | | | | | | some flv have no metadata, ffmpeg will same with the source flv stream. Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
* avformat/utils: add missing brackets around arguments in av_realloc() callJames Almer2016-11-21
| | | | | Found-by: Neil Birkbeck <neil.birkbeck@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* vaapi_encode: Fix format specifier for bitrate loggingMark Thompson2016-11-21
| | | | | Same as e0df56f25d09b14f5315799338be246806c46806. This was accidentally reintroduced while merging c8241e730f116f1c9cfc0b34110aa7f052e05332.
* lavc/vaapi_encode_h264: fix poc incorrect issue after meeting idr frame.Jun Zhao2016-11-21
| | | | | | | | | | | when meeting IDR frame, vaapi_encode_h264 poc number don't reset, now fix this issue based on h264 spec. Some decoder don't care this case, but this fix will enhance the encoder action. Before this fix, poc number is negative in some case. Reviewed-by: Jun Zhao <jun.zhao@intel.com> Signed-off-by: Wang, Yi A <yi.a.wang@intel.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>
* vaapi_h265: Fix buffering parametersMark Thompson2016-11-21
| | | | | | | A decoder may need this to be set correctly to output frames in the right order. (cherry picked from commit b8cac1e83066aa87e8402c146c81b77a11b5eec3)
* vaapi_h265: Fix slice header writingMark Thompson2016-11-21
| | | | | | | | | | | | | This was not observed earlier because the only syntax element which it normally misses with the current setup is slice_qp_delta, but that is always going to be zero (in IDR frames QP isn't varied on the slice) which will always exp-golomb code as a single 1 bit. The immediately following part is the byte alignment, which is always a 1 bit followed by 0s which are ignored, so as long as the bitstream is never aligned at that point we will never notice because the only difference is that an ignored bit is a 1 instead of a 0. (cherry picked from commit fc30a90898e419cee7c7cb496976da6337d0bf3e)
* vaapi_h264: Write bitstream restriction fieldsMark Thompson2016-11-21
| | | | (cherry picked from commit ec17ab381ede4f31c4bdd2767d8f62d24aaf430a)
* vaapi_h264: Fix CFR mode with frame_rate set in AVCodecContextMark Thompson2016-11-21
| | | | (cherry picked from commit 17a0f9481cf07af0feb3838ca315b970117e8000)
* vaapi_encode: Decide on GOP setup before initialising sequence parametersMark Thompson2016-11-21
| | | | | | | This was always too late; several fields related to it have been incorrectly zero since the encoder was added. (cherry picked from commit 314b421dd8910ebed7a8d419a0dbea239a00044e)
* vaapi_h264: Set max_num_ref_frames to 1 when not using B framesMark Thompson2016-11-21
| | | | (cherry picked from commit 956a54129db522998a5abae869568dae2c9774cb)
* vaapi_encode: Sync to input surface rather than outputMark Thompson2016-11-21
| | | | | | | | | | | While outwardly bizarre, this change makes the behaviour consistent with other VAAPI encoders which sync to the encode /input/ picture in order to wait for /output/ from the encoder. It is not harmful on i965 (because synchronisation already happens in vaRenderPicture(), so it has no effect there), and it allows the encoder to work on mesa/gallium which assumes this behaviour. (cherry picked from commit 086e4b58b59ea3993107aa24d92bb962ec69667c)
* vaapi_encode: Check packed header capabilitiesMark Thompson2016-11-21
| | | | | | | This improves behaviour with drivers which do not support packed headers, such as AMD VCE on mesa/gallium. (cherry picked from commit 892bbbcdc171ff0d08d69636a240ffb95f54243c)
* vaapi_encode: Refactor initialisationMark Thompson2016-11-21
| | | | | | | | | | This allows better checking of capabilities and will make it easier to add more functionality later. It also commonises some duplicated code around rate control setup and adds more comments explaining the internals. (cherry picked from commit 80a5d05108cb218e8cd2e25c6621a3bfef0a832e)
* vaapi_h264: Fix HRD bit_rate/cpb_size scalingMark Thompson2016-11-21
| | | | | | | There should be an extra offset of 6 on bit_rate_scale and of 4 on cpb_size_scale which were not accounted for here. (cherry picked from commit 3a9662af6c741f8354b1ca97642f78f5c02e2e8f)
* avformat/movenc: Restrict experimental VP9 support to MODE_MP4.Matthew Gregan2016-11-21
| | | | | Signed-off-by: Matthew Gregan <kinetik@flim.org> Signed-off-by: James Almer <jamrial@gmail.com>
* Add experimental demuxing support for FLAC in ISO BMFF (MP4).Matthew Gregan2016-11-21
| | | | | | | Based on the draft spec at https://git.xiph.org/?p=flac.git;a=blob;f=doc/isoflac.txt Signed-off-by: Matthew Gregan <kinetik@flim.org> Signed-off-by: James Almer <jamrial@gmail.com>
* Add experimental muxing support for FLAC in ISO BMFF (MP4).Matthew Gregan2016-11-21
| | | | | | | | | Based on the draft spec at https://git.xiph.org/?p=flac.git;a=blob;f=doc/isoflac.txt '-strict experimental' is required to create files in this format. Signed-off-by: Matthew Gregan <kinetik@flim.org> Signed-off-by: James Almer <jamrial@gmail.com>
* MAINTAINERS: add myself as an API tests maintainerLudmila Glinskih2016-11-21
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffplay: allow fallback to software rendererMarton Balint2016-11-20
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: add support for negative RGBA linesizeMarton Balint2016-11-20
| | | | | | This fixes the crash reported in ticket #5947. Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/matroskaenc: write updated STREAMINFO metadata for FLAC streams if ↵James Almer2016-11-20
| | | | | | | | | | | available FLAC streams originating from the FLAC encoder send updated and more complete STREAMINFO metadata as part of the last packet, so write that to CodecPrivate instead of the incomplete one available in extradata during init. Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/matroskaenc: postpone writing the Tracks masterJames Almer2016-11-20
| | | | | | | This will allow us to write updated stream information not available during write_header(). Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/opt: Fix setting int64 to its maximumMichael Niedermayer2016-11-20
| | | | | | Found-by: Andreas Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc/ffv1: Support YUV4xxP12 and GRAY12.Carl Eugen Hoyos2016-11-20
|
* ffmdec: validate codec parametersAndreas Cadhalpun2016-11-20
| | | | | | | | A negative extradata size for example gets passed to memcpy in avcodec_parameters_from_context causing a segmentation fault. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* swscale/options: Use AV_OPT_TYPE_PIXEL_FMTMichael Niedermayer2016-11-20
| | | | | Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/avpacket: fix leak on realloc in av_packet_add_side_data()James Almer2016-11-19
| | | | | | | | | If realloc fails, the pointer is overwritten and the previously allocated buffer is leaked, which goes against the expected behavior of keeping the packet unchanged in case of error. Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/utils: check for overflow before reallocating side dataJames Almer2016-11-19
| | | | | | | This makes av_stream_add_side_data() consistent with av_packet_add_side_data(). Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/matroska: use av_stream_add_side_data() for stereo3d side dataJames Almer2016-11-19
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/mov: reuse existing err variableJames Almer2016-11-19
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/mov: use av_stream_add_side_data() for displaymatrix side dataJames Almer2016-11-18
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/utils: add av_stream_add_side_data()James Almer2016-11-18
| | | | | | | | Functionally similar to av_packet_add_side_data(). Allows the use of an already allocated buffer as stream side data. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/flvdec: add debug message to list keyframes index metadataSteven Liu2016-11-19
| | | | | | | when parsing keyframe index metadata, list the message by trace log Signed-off-by: Steven Liu <lq@chinaffmpeg.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* options_table: limit codec parameters to sane valuesAndreas Cadhalpun2016-11-18
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* x86/vp9itxfm: add missing AVX2 guardsJames Almer2016-11-18
| | | | | | Fixes compilation with Yasm 1.1.0 and older. Signed-off-by: James Almer <jamrial@gmail.com>
* ffmpeg: factor out sending frame to filtersClément Bœsch2016-11-18
| | | | | Video doesn't exit ffmpeg on error anymore, and audio now prints an error.
* ffmpeg: remove dead code out of the video filter loopClément Bœsch2016-11-18
| | | | | | It makes no sense for this code to be inside the video filter loop, and the frame sample aspect ratio is even set unconditionally a few lines above.
* avcodec/ffv1dec: Set packed_at_lsb for 16bit YUVMichael Niedermayer2016-11-18
| | | | | | This avoids unneeded computations Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ffv1dec: Support gray 10/12/16 explicitly avoid shiftsMichael Niedermayer2016-11-18
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/apngenc: use the stream parameters extradata if availableJames Almer2016-11-18
| | | | | | | Fixes remuxing apng streams coming from the apng demuxer, which sends extradata during init. Signed-off-by: James Almer <jamrial@gmail.com>
* Revert "apngdec: use side data to pass extradata to the decoder"James Almer2016-11-18
| | | | | | | | | | | | | This reverts commit e0c6b32046f4bab7d34be77dd2f03b2a80c86d39. Said commit changed the behavior of the demuxer and decoder in a non backwards compatible way. Demuxers should make extradata available at init if possible, and send new extradata as side data within a packet if needed. A better fix for the remuxing crash will follow. Signed-off-by: James Almer <jamrial@gmail.com>
* Merge commit '8d07e941b04d63fc4443dd986e3dc7b69cdcca43'Hendrik Leppkes2016-11-18
|\ | | | | | | | | | | | | | | | | | | * commit '8d07e941b04d63fc4443dd986e3dc7b69cdcca43': FATE: add a test of H.264 SEI recovery in an intra refresh stream Our H264 decoder drops 3 frames from the beginning of the stream, but all frames after those match, hence the difference in the fate test. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * FATE: add a test of H.264 SEI recovery in an intra refresh streamAnton Khirnov2016-07-15
| |
* | Merge commit '46278ec90ac5ad1dab5e85991f176afe49003fee'Hendrik Leppkes2016-11-18
|\| | | | | | | | | | | | | | | | | * commit '46278ec90ac5ad1dab5e85991f176afe49003fee': mp3enc: write trailing padding Noop, we have our own implementation for mp3 gapless. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mp3enc: write trailing paddingAnton Khirnov2016-07-15
| |
* | Merge commit 'd60c2d5216930ef98c7d4d6837d6229b37e0dcb3'Hendrik Leppkes2016-11-18
|\| | | | | | | | | | | | | | | | | * commit 'd60c2d5216930ef98c7d4d6837d6229b37e0dcb3': mp3dec: read the initial/trailing padding from the LAME tag Noop, we have our own implementation for mp3 gapless tags. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mp3dec: read the initial/trailing padding from the LAME tagAnton Khirnov2016-07-15
| |
* | Merge commit '7a76371437f9562c3414f985523f883489e3936a'Hendrik Leppkes2016-11-18
|\| | | | | | | | | | | | | * commit '7a76371437f9562c3414f985523f883489e3936a': libopenh264enc: Simplify init by setting FF_CODEC_CAP_INIT_CLEANUP Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libopenh264enc: Simplify init by setting FF_CODEC_CAP_INIT_CLEANUPMartin Storsjö2016-07-15
| | | | | | | | | | | | Also set FF_CODEC_CAP_INIT_THREADSAFE while adding internal capabilities. Signed-off-by: Martin Storsjö <martin@martin.st>