ffmpeg.git
7 months agolibavformat/mxfenc: add missing dnxhr mxfcontainer essence ULs
Jason Stevens [Sat, 8 Sep 2018 13:26:31 +0000 (06:26 -0700)]
libavformat/mxfenc: add missing dnxhr mxfcontainer essence ULs

Add missing dnxhr mxf container essence ULs to the mxf encoder.

This fixes dnxhr mxf files being quarantined by Avid Media Composer.

Signed-off-by: Jason Stevens <jay@wizardofthenet.com>
Reviewed-by: Baptiste Coudurier
7 months agolibavcodec/dnxhd: change ff_dnxhd_get_hr_frame_size to avpriv_
Jason Stevens [Sat, 8 Sep 2018 05:42:13 +0000 (22:42 -0700)]
libavcodec/dnxhd: change ff_dnxhd_get_hr_frame_size to avpriv_

refactor ff_dnxhd_get_hr_frame_size to avpriv_dnxhd_get_hr_frame_size,
to allow cross library usage in libavformat/mxfenc this change makes
this function no longer be always inlined.

Signed-off-by: Jason Stevens <jay@wizardofthenet.com>
7 months agoavcodec/loco: switch to planar rgb format
Paul B Mahol [Mon, 10 Sep 2018 09:18:59 +0000 (11:18 +0200)]
avcodec/loco: switch to planar rgb format

Remove now unused step variable.

7 months agoavfilter: add nvidia NPP based transpose filter
Roman Arzumanyan [Wed, 29 Aug 2018 09:53:02 +0000 (12:53 +0300)]
avfilter: add nvidia NPP based transpose filter

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
7 months agotests/fate: fix lut hash for gray14
Paul B Mahol [Sun, 9 Sep 2018 20:49:54 +0000 (22:49 +0200)]
tests/fate: fix lut hash for gray14

7 months agoswscale/swscale_unscaled: add gbrap -> packed rgb path
Paul B Mahol [Sun, 9 Sep 2018 20:33:25 +0000 (22:33 +0200)]
swscale/swscale_unscaled: add gbrap -> packed rgb path

7 months agoavcodec/lagarith: set pict_type too
Paul B Mahol [Sun, 9 Sep 2018 19:52:43 +0000 (21:52 +0200)]
avcodec/lagarith: set pict_type too

7 months agoavcodec/lagarith: switch to planar rgb
Paul B Mahol [Sat, 8 Sep 2018 23:05:56 +0000 (01:05 +0200)]
avcodec/lagarith: switch to planar rgb

Speed goes from 363 fps to 428 fps for 640x480 video.

7 months agoavcodec/v210enc: Pass through Active Format Description (AFD) data
Devin Heitmueller [Fri, 7 Sep 2018 19:40:27 +0000 (15:40 -0400)]
avcodec/v210enc: Pass through Active Format Description (AFD) data

When encoding to V210, make sure the AFD side data makes it through
in the resulting AVPacket.  This is needed so the decklink output
module can put out AFD when in 10-bit mode.

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
7 months agoavcodec: add AV_PKT_DATA_AFD to allow AFD data to be embedded in AVPacket
Devin Heitmueller [Fri, 7 Sep 2018 19:40:26 +0000 (15:40 -0400)]
avcodec: add AV_PKT_DATA_AFD to allow AFD data to be embedded in AVPacket

Create a new AVPacket side data type for Active Format Description,
which mirrors the side data type found in AVFrame.  The primary
use case for this is ensuring AFD gets preserved in the V210
encoder, so that the decklink libavdevice can output AFD.

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
7 months agoavdevice/decklink: Add support for EIA-708 output over SDI
Devin Heitmueller [Fri, 7 Sep 2018 19:40:25 +0000 (15:40 -0400)]
avdevice/decklink: Add support for EIA-708 output over SDI

Hook in libklvanc and use it for output of EIA-708 captions over
SDI.  The bulk of this patch is just general support for ancillary
data for the Decklink SDI module - the real work for construction
of the EIA-708 CDP and VANC line construction is done by libklvanc.

Libklvanc can be found at: https://github.com/stoth68000/libklvanc

Updated to reflect feedback from Marton Balint <cus@passwd.hu>,
Carl Eugen Hoyos <ceffmpeg@gmail.com>, Aaron Levinson
<alevinsn_dev@levland.net>, and Moritz Barsnick <barsnick@gmx.net>

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
7 months agoavcodec/v210enc: Pass through A53 CC data
Devin Heitmueller [Fri, 7 Sep 2018 19:40:24 +0000 (15:40 -0400)]
avcodec/v210enc: Pass through A53 CC data

When encoding to V210, make sure the CC side data makes it through
in the resulting AVPacket.  This is needed so the decklink output
module can put out captions when in 10-bit mode.

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
7 months agoavformat/movenc: remove experimental checks for AV1 streams
James Almer [Sun, 9 Sep 2018 20:26:09 +0000 (17:26 -0300)]
avformat/movenc: remove experimental checks for AV1 streams

The spec has been finalized.

Signed-off-by: James Almer <jamrial@gmail.com>
7 months agoavfilter/vf_framerate: switch to activate
Marton Balint [Sun, 26 Aug 2018 22:51:52 +0000 (00:51 +0200)]
avfilter/vf_framerate: switch to activate

Signed-off-by: Marton Balint <cus@passwd.hu>
7 months agoavfilter/f_cue: add cue and acue filters
Marton Balint [Thu, 28 Jun 2018 22:03:04 +0000 (00:03 +0200)]
avfilter/f_cue: add cue and acue filters

To delay filtering until a given wallclock timestamp.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 months agoavutil/file: allow mapping 0 byte files with av_file_map
Marton Balint [Thu, 6 Sep 2018 18:46:16 +0000 (20:46 +0200)]
avutil/file: allow mapping 0 byte files with av_file_map

Signed-off-by: Marton Balint <cus@passwd.hu>
7 months agoavdevice/decklink_enc: add support for setting duplex mode
Marton Balint [Thu, 6 Sep 2018 20:46:18 +0000 (22:46 +0200)]
avdevice/decklink_enc: add support for setting duplex mode

Signed-off-by: Marton Balint <cus@passwd.hu>
7 months agoAdd FATE test for QT format audio descriptors in MP4
Derek Buitenhuis [Thu, 6 Sep 2018 15:30:37 +0000 (16:30 +0100)]
Add FATE test for QT format audio descriptors in MP4

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 months agoUse QT format for audio sample descriptors depending on stsd version.
Justin Ruggles [Wed, 5 Sep 2018 21:54:57 +0000 (17:54 -0400)]
Use QT format for audio sample descriptors depending on stsd version.

ISOBMFF does not allow AudioSampleEntryV1 in stsd version 0, so
assume the descriptor format is QTFF SoundDescriptionV1. ISOBMFF does
not define a version 2.

This fixes audio decoding for some MP4 files generated with Apple
tools. The additional fields present in SoundDescriptionV1/V2 need to
be read in order to correctly read additional boxes that contain
information required for decoding the stream.

Fixes #7376.

Also see: https://github.com/HandBrake/HandBrake/issues/1555

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 months agoavfilter/vf_remap: add slice threading
Daniel Oberhoff [Tue, 14 Feb 2017 19:43:34 +0000 (20:43 +0100)]
avfilter/vf_remap: add slice threading

Signed-off-by: Daniel Oberhoff <daniel@danieloberhoff.de>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 months agoavfilter: add support for gray14 format
Paul B Mahol [Sun, 9 Sep 2018 17:05:56 +0000 (19:05 +0200)]
avfilter: add support for gray14 format

7 months agoavfilter/vf_premultiply: add gray14 format
Paul B Mahol [Sun, 9 Sep 2018 16:36:41 +0000 (18:36 +0200)]
avfilter/vf_premultiply: add gray14 format

7 months agoavfilter/vf_extractplanes: define higher depth formats with macro
Paul B Mahol [Sun, 9 Sep 2018 16:13:13 +0000 (18:13 +0200)]
avfilter/vf_extractplanes: define higher depth formats with macro

7 months agoavfilter/vf_extractplanes: define common 8-bit pixel formats
Paul B Mahol [Sun, 9 Sep 2018 16:06:22 +0000 (18:06 +0200)]
avfilter/vf_extractplanes: define common 8-bit pixel formats

7 months agoavfilter/vf_extractplanes: fix 14bit format extraction
Paul B Mahol [Sun, 9 Sep 2018 15:56:43 +0000 (17:56 +0200)]
avfilter/vf_extractplanes: fix 14bit format extraction

7 months agoavcodec/scpr: stop checking for overread twice
Paul B Mahol [Sun, 9 Sep 2018 12:06:57 +0000 (14:06 +0200)]
avcodec/scpr: stop checking for overread twice

7 months agoavutil/mips: [loongson] simplify macro TRANSPOSE_4H and TRANSPOSE_8B
Shiyou Yin [Thu, 6 Sep 2018 08:10:53 +0000 (16:10 +0800)]
avutil/mips: [loongson] simplify macro TRANSPOSE_4H and TRANSPOSE_8B

Simplify macro TRANSPOSE_4H in mmiutils.h and add TRANSPOSE_8B as a common macro.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavcodec/mips: [loongson] optimize vp8 decoding in vp8dsp.
gxw [Wed, 5 Sep 2018 10:31:06 +0000 (18:31 +0800)]
avcodec/mips: [loongson] optimize vp8 decoding in vp8dsp.

Optimize vp8 loop filter with mmi, four functions optimized:
1. ff_vp8_h_loop_filter8uv_mmi.
2. ff_vp8_v_loop_filter8uv_mmi.
3. ff_vp8_h_loop_filter16_mmi.
4. ff_vp8_v_loop_filter16_mmi.

Vp8 decoding speed improved about 50%(from 73fps to 110fps, Tested on loongson 3A3000).

Signed-off-by: Shiyou Yin <yinshiyou-hf@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavformat/utils: Don't calculate duration using AV_NOPTS_VALUE for start_time.
Dale Curtis [Fri, 7 Sep 2018 22:37:09 +0000 (15:37 -0700)]
avformat/utils: Don't calculate duration using AV_NOPTS_VALUE for start_time.

Found by ClusterFuzz, https://crbug.com/879852

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavcodec/aacenc: report channel layout by name
Moritz Barsnick [Fri, 6 Jul 2018 21:49:50 +0000 (23:49 +0200)]
avcodec/aacenc: report channel layout by name

Possibly useful in the error case.

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavcodec/tiff: check ff_lzw_decode_open() for failure
Paul B Mahol [Sun, 9 Sep 2018 09:38:33 +0000 (11:38 +0200)]
avcodec/tiff: check ff_lzw_decode_open() for failure

7 months agoavcodec/gifdec: set .caps_internal
Paul B Mahol [Sun, 9 Sep 2018 09:35:14 +0000 (11:35 +0200)]
avcodec/gifdec: set .caps_internal

7 months agoavcodec/gifdec: check ff_lzw_decode_open() for failure
Paul B Mahol [Sun, 9 Sep 2018 09:33:17 +0000 (11:33 +0200)]
avcodec/gifdec: check ff_lzw_decode_open() for failure

7 months agolavf/movenc: Fail when codec tag is invalid for format
John Stebbins [Mon, 27 Aug 2018 21:11:14 +0000 (14:11 -0700)]
lavf/movenc: Fail when codec tag is invalid for format

Fixes ticket #6897

Signed-off-by: James Almer <jamrial@gmail.com>
7 months agolavf/movenc: Add GoPro metadata to permitted mp4 "codecs"
John Stebbins [Mon, 27 Aug 2018 19:57:08 +0000 (12:57 -0700)]
lavf/movenc: Add GoPro metadata to permitted mp4 "codecs"

Signed-off-by: James Almer <jamrial@gmail.com>
7 months agolavf/mov: factor out setting codec_id
John Stebbins [Fri, 31 Aug 2018 16:00:39 +0000 (09:00 -0700)]
lavf/mov: factor out setting codec_id

Since it is performed in all cases now.

Signed-off-by: James Almer <jamrial@gmail.com>
7 months agolavf/mov: add AVCodecTag entry for GoPro metadata
John Stebbins [Mon, 27 Aug 2018 19:57:07 +0000 (12:57 -0700)]
lavf/mov: add AVCodecTag entry for GoPro metadata

This allows for validation of the track type

Signed-off-by: James Almer <jamrial@gmail.com>
7 months agoavcodec/zmbv: decoder supports init_cleanup capability
Paul B Mahol [Sat, 8 Sep 2018 19:30:54 +0000 (21:30 +0200)]
avcodec/zmbv: decoder supports init_cleanup capability

7 months agoavcodec/ulti: fix minor style issue
Paul B Mahol [Sat, 8 Sep 2018 19:21:50 +0000 (21:21 +0200)]
avcodec/ulti: fix minor style issue

7 months agoavcodec/tscc: decoder supports init_cleanup capability
Paul B Mahol [Sat, 8 Sep 2018 19:18:47 +0000 (21:18 +0200)]
avcodec/tscc: decoder supports init_cleanup capability

7 months agoavcodec/tscc: check av_frame_alloc() for failure
Paul B Mahol [Sat, 8 Sep 2018 19:17:26 +0000 (21:17 +0200)]
avcodec/tscc: check av_frame_alloc() for failure

7 months agoavcodec/on2avc: decoder supports init_cleanup capability
Paul B Mahol [Sat, 8 Sep 2018 19:00:55 +0000 (21:00 +0200)]
avcodec/on2avc: decoder supports init_cleanup capability

7 months agoavcodec/mscc: decoders supports init_cleanup capability
Paul B Mahol [Sat, 8 Sep 2018 18:55:59 +0000 (20:55 +0200)]
avcodec/mscc: decoders supports init_cleanup capability

7 months agoavcodec/interplayacm: decoder supports init_cleanup capability
Paul B Mahol [Sat, 8 Sep 2018 18:44:22 +0000 (20:44 +0200)]
avcodec/interplayacm: decoder supports init_cleanup capability

7 months agoavcodec/fmvc: use correct pixel format on big-endian for 16 bpp
Paul B Mahol [Sat, 8 Sep 2018 18:33:15 +0000 (20:33 +0200)]
avcodec/fmvc: use correct pixel format on big-endian for 16 bpp

7 months agoavcodec/flashsv: check return value of flashsv_decode_init()
Paul B Mahol [Sat, 8 Sep 2018 18:29:34 +0000 (20:29 +0200)]
avcodec/flashsv: check return value of flashsv_decode_init()

7 months agoavcodec/fic: change class name to more correct one
Paul B Mahol [Sat, 8 Sep 2018 18:25:47 +0000 (20:25 +0200)]
avcodec/fic: change class name to more correct one

7 months agoavcodec/dsicinvideo: decoder supports init_cleanup capability
Paul B Mahol [Sat, 8 Sep 2018 18:14:58 +0000 (20:14 +0200)]
avcodec/dsicinvideo: decoder supports init_cleanup capability

7 months agoavcodecc/cscd: fix some obvious style issues
Paul B Mahol [Sat, 8 Sep 2018 18:09:27 +0000 (20:09 +0200)]
avcodecc/cscd: fix some obvious style issues

7 months agoavcodec/cscd: decoder supports init_cleanup capability
Paul B Mahol [Sat, 8 Sep 2018 18:06:19 +0000 (20:06 +0200)]
avcodec/cscd: decoder supports init_cleanup capability

7 months agoavcodec/cook: decoder supports init_cleanup capability
Paul B Mahol [Sat, 8 Sep 2018 18:02:41 +0000 (20:02 +0200)]
avcodec/cook: decoder supports init_cleanup capability

7 months agoavcodec/rscc: fix decoding of some iscc files
Paul B Mahol [Sat, 8 Sep 2018 15:27:40 +0000 (17:27 +0200)]
avcodec/rscc: fix decoding of some iscc files

7 months agoavcodec: add RemotelyAnywhere Screen Capture decoder
Paul B Mahol [Sun, 2 Sep 2018 09:18:33 +0000 (11:18 +0200)]
avcodec: add RemotelyAnywhere Screen Capture decoder

7 months agoavcodec/wcmv: fix output on big-endian with rgb565 format
Paul B Mahol [Sat, 8 Sep 2018 13:48:53 +0000 (15:48 +0200)]
avcodec/wcmv: fix output on big-endian with rgb565 format

7 months agoavcodec/qdmc: check return code of ff_fft_init()
Paul B Mahol [Sat, 8 Sep 2018 13:43:46 +0000 (15:43 +0200)]
avcodec/qdmc: check return code of ff_fft_init()

7 months agoavfilter: add lut1d filter
Paul B Mahol [Thu, 23 Aug 2018 07:34:44 +0000 (09:34 +0200)]
avfilter: add lut1d filter

7 months agoavcodec/h264dec: remove unnecessary checks in h264_decode_frame
Zhao Zhili [Thu, 6 Sep 2018 09:01:49 +0000 (17:01 +0800)]
avcodec/h264dec: remove unnecessary checks in h264_decode_frame

These conditions are checked again in is_extra(). This patch makes no
functional changes.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavcodec/h264dec: check number of SPS in is_extra
Zhao Zhili [Thu, 6 Sep 2018 09:15:11 +0000 (17:15 +0800)]
avcodec/h264dec: check number of SPS in is_extra

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavcodec/mips: [loongson] fix improper use of register constraints.
Shiyou Yin [Thu, 6 Sep 2018 08:10:52 +0000 (16:10 +0800)]
avcodec/mips: [loongson] fix improper use of register constraints.

Constraint "g" means compiler can store variable in memory or register.
When we use constraint "g" for a variable and this variable was operated by
instruction which only support register operands may lead "invalid operands" error.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavfilter/vf_interlace: fix numerical options
Thomas Mundt [Thu, 23 Aug 2018 21:37:10 +0000 (23:37 +0200)]
avfilter/vf_interlace: fix numerical options

Regression since 9c01cdb94e24aaf50f867a0a5c42b097c17c42b1

Signed-off-by: Thomas Mundt <tmundt75@gmail.com>
7 months agoavcodec/scpr: make sure count and min are valid
Paul B Mahol [Fri, 7 Sep 2018 13:09:40 +0000 (15:09 +0200)]
avcodec/scpr: make sure count and min are valid

7 months agofate: fix hapqa-extract-nosnappy tests on small builds
James Almer [Thu, 6 Sep 2018 22:24:14 +0000 (19:24 -0300)]
fate: fix hapqa-extract-nosnappy tests on small builds

Fixes ticket #7324

Signed-off-by: James Almer <jamrial@gmail.com>
7 months agoavcodec/dnxhdenc: interlaced is not supported in DNxHR
Paul B Mahol [Thu, 6 Sep 2018 11:43:20 +0000 (13:43 +0200)]
avcodec/dnxhdenc: interlaced is not supported in DNxHR

Fixes #7263.

7 months agoavcodec/dnxhddec: ask for samples with alpha
Paul B Mahol [Thu, 6 Sep 2018 11:39:22 +0000 (13:39 +0200)]
avcodec/dnxhddec: ask for samples with alpha

7 months agoavformat/dashdec: minus minBufferTime when there have value
Steven Liu [Thu, 6 Sep 2018 05:40:56 +0000 (13:40 +0800)]
avformat/dashdec: minus minBufferTime when there have value

fix ticket 7382

7 months agoavformat/mxfdec: do not use sound essence descriptor quantization bits for bits_per_c...
Marton Balint [Sun, 26 Aug 2018 19:23:02 +0000 (21:23 +0200)]
avformat/mxfdec: do not use sound essence descriptor quantization bits for bits_per_coded_sample

It refers to the uncompressed quantization, therefore is not correct for AAC.

Also change mxf_set_pts to work based on current edit unit if
bits_per_coded_sample is not available.

Fixes error messages in the sample of ticket #7366.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 months agoavcodec/mips: [loongson] reoptimize put and add pixels clamped functions.
Shiyou Yin [Wed, 5 Sep 2018 10:31:05 +0000 (18:31 +0800)]
avcodec/mips: [loongson] reoptimize put and add pixels clamped functions.

Simplify the usage of intermediate variable addr and remove unused variable all64
in following functions:
1. ff_put_pixels_clamped_mmi
2. ff_put_signed_pixels_clamped_mmi
3. ff_add_pixels_clamped_mmi

This optimization speed up mpeg4 decode about 2% on loongson platform(tested with 3A3000).

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoffplay: add option to allow custom seek interval
Gyan Doshi [Sat, 1 Sep 2018 06:03:17 +0000 (11:33 +0530)]
ffplay: add option to allow custom seek interval

At present, left and right keys are hardcoded to seek by 10 seconds.

7 months agoavformat/dashdec: refine compute current fragment for presentation_timeoffset mode
Steven Liu [Wed, 5 Sep 2018 06:33:53 +0000 (14:33 +0800)]
avformat/dashdec: refine compute current fragment for presentation_timeoffset mode

fix ticket id: #7369 #7382.
use ((wallclock - availability_start_time) * timescale -presentation_timeoffset) / duration

Signed-off-by: Steven Liu <lq@onvideo.cn>
7 months agoavformat/dashdec: reindent code for previous commit
Steven Liu [Wed, 5 Sep 2018 06:21:33 +0000 (14:21 +0800)]
avformat/dashdec: reindent code for previous commit

Signed-off-by: Steven Liu <lq@onvideo.cn>
7 months agoavformat/dashdec: add min_buffer_time process logic
Steven Liu [Wed, 5 Sep 2018 06:20:52 +0000 (14:20 +0800)]
avformat/dashdec: add min_buffer_time process logic

if there have min_buffer_time in playlist, use the min_buffer_time
value for realtime.

Signed-off-by: Steven Liu <lq@onvideo.cn>
7 months agoavformat/dashdec: add trace message for get the logic output message
Steven Liu [Wed, 5 Sep 2018 06:19:43 +0000 (14:19 +0800)]
avformat/dashdec: add trace message for get the logic output message

Signed-off-by: Steven Liu <lq@onvideo.cn>
7 months agoavformat/dashdec: reindent code for previous commit
Steven Liu [Wed, 5 Sep 2018 06:17:03 +0000 (14:17 +0800)]
avformat/dashdec: reindent code for previous commit

Signed-off-by: Steven Liu <lq@onvideo.cn>
7 months agoavformat/dashdec: remove redundant code
Steven Liu [Wed, 5 Sep 2018 06:16:29 +0000 (14:16 +0800)]
avformat/dashdec: remove redundant code

Signed-off-by: Steven Liu <lq@onvideo.cn>
7 months agoavformat/dashdec: refine adaptionset attribute members
Steven Liu [Wed, 5 Sep 2018 06:15:47 +0000 (14:15 +0800)]
avformat/dashdec: refine adaptionset attribute members

Signed-off-by: Steven Liu <lq@onvideo.cn>
7 months agoavformat/dashdec: refine mpd element of attribute name availabilityEndTime
Steven Liu [Wed, 5 Sep 2018 06:13:56 +0000 (14:13 +0800)]
avformat/dashdec: refine mpd element of attribute name availabilityEndTime

Signed-off-by: Steven Liu <lq@onvideo.cn>
7 months agoavformat/hlsenc: rename option from use_localtime to strftime
Steven Liu [Mon, 3 Sep 2018 03:10:35 +0000 (11:10 +0800)]
avformat/hlsenc: rename option from use_localtime to strftime

fix ticket: 7393
indent option name to segment

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
7 months agoavcodec/mips: [loongson] simplify the usage of intermediate variable addr.
Shiyou Yin [Tue, 4 Sep 2018 08:05:33 +0000 (16:05 +0800)]
avcodec/mips: [loongson] simplify the usage of intermediate variable addr.

Simplify the usage of intermediate variable addr in following functions:
1. ff_put_pixels4_8_mmi
2. ff_put_pixels8_8_mmi
3. ff_put_pixels16_8_mmi
4. ff_avg_pixels16_8_mmi.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavcodec: [loongson] fix bug of mss2-wmv failed in fate test.
Shiyou Yin [Mon, 3 Sep 2018 03:31:46 +0000 (11:31 +0800)]
avcodec: [loongson] fix bug of mss2-wmv failed in fate test.

Failed case: mss2-wmv
In following functions, pmullh was used to multiply two 16-bit data, this will cause data overflow.
1. ff_vc1_inv_trans_8x8_dc_mmi
2. ff_vc1_inv_trans_8x8_mmi
3. ff_vc1_inv_trans_8x4_mmi
4. ff_vc1_inv_trans_4x8_mmi
5. ff_vc1_inv_trans_4x4_mmi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavformat/libsrt: fix merge of payload_size option
Marton Balint [Sun, 2 Sep 2018 23:52:22 +0000 (01:52 +0200)]
avformat/libsrt: fix merge of payload_size option

Fixes a compile error and re-adds pkt_size as a url?option as well.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 months agoavformat/av1: zero initialize the seq_params struct
James Almer [Mon, 3 Sep 2018 02:27:51 +0000 (23:27 -0300)]
avformat/av1: zero initialize the seq_params struct

Signed-off-by: James Almer <jamrial@gmail.com>
7 months agoMerge commit 'e1e3a12242347dd11174b2fb9ddac8dc8df16224'
James Almer [Sun, 2 Sep 2018 22:26:00 +0000 (19:26 -0300)]
Merge commit 'e1e3a12242347dd11174b2fb9ddac8dc8df16224'

* commit 'e1e3a12242347dd11174b2fb9ddac8dc8df16224':
  libopenh264: Add support for decoding of b-frames

Merged-by: James Almer <jamrial@gmail.com>
7 months agoMerge commit 'c011beda2611acfeb6f67d4fdf30d1eceed9e62f'
James Almer [Sun, 2 Sep 2018 22:25:16 +0000 (19:25 -0300)]
Merge commit 'c011beda2611acfeb6f67d4fdf30d1eceed9e62f'

* commit 'c011beda2611acfeb6f67d4fdf30d1eceed9e62f':
  avconv: make sure packets put into the muxing FIFO are refcounted

This commit is a noop, see 33580a8625c77591919b6155a48da04dccc8d398

Merged-by: James Almer <jamrial@gmail.com>
7 months agoMerge commit 'c1bcd321ea2c2ae1765a1e64f03278712221d726'
James Almer [Sun, 2 Sep 2018 22:23:26 +0000 (19:23 -0300)]
Merge commit 'c1bcd321ea2c2ae1765a1e64f03278712221d726'

* commit 'c1bcd321ea2c2ae1765a1e64f03278712221d726':
  avcodec/qsv: fix async support

Merged-by: James Almer <jamrial@gmail.com>
7 months agoMerge commit 'f25117a4286505b38c12466ef04459471de3c1b0'
James Almer [Sun, 2 Sep 2018 22:21:35 +0000 (19:21 -0300)]
Merge commit 'f25117a4286505b38c12466ef04459471de3c1b0'

* commit 'f25117a4286505b38c12466ef04459471de3c1b0':
  libsrt: Pass the correct pointer for the passphrase

Merged-by: James Almer <jamrial@gmail.com>
7 months agoMerge commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d'
James Almer [Sun, 2 Sep 2018 22:20:36 +0000 (19:20 -0300)]
Merge commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d'

* commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d':
  libfdk-aac: Use enum names instead of literal numbers for the output format

Merged-by: James Almer <jamrial@gmail.com>
7 months agoMerge commit '52fd2afce8436c59c05765f3a6e95f9adb6f9f2f'
James Almer [Sun, 2 Sep 2018 22:19:23 +0000 (19:19 -0300)]
Merge commit '52fd2afce8436c59c05765f3a6e95f9adb6f9f2f'

* commit '52fd2afce8436c59c05765f3a6e95f9adb6f9f2f':
  configure: fix inline asm checks

This commit is a noop, see ad94f1c8abe68a2b38536cc96a31327c6be7b105

Merged-by: James Almer <jamrial@gmail.com>
7 months agoMerge commit '4ce701b4e640d4723a4005d664f31f8342fac40e'
James Almer [Sun, 2 Sep 2018 22:12:52 +0000 (19:12 -0300)]
Merge commit '4ce701b4e640d4723a4005d664f31f8342fac40e'

* commit '4ce701b4e640d4723a4005d664f31f8342fac40e':
  qsvenc: remove vcm option on Linux

Merged-by: James Almer <jamrial@gmail.com>
7 months agoMerge commit 'f8060865f3e1a16c62e0d337ef0979b6ee4ba457'
James Almer [Sun, 2 Sep 2018 22:12:18 +0000 (19:12 -0300)]
Merge commit 'f8060865f3e1a16c62e0d337ef0979b6ee4ba457'

* commit 'f8060865f3e1a16c62e0d337ef0979b6ee4ba457':
  qsvenc: use the compression_level to replace private option

Merged-by: James Almer <jamrial@gmail.com>
7 months agoMerge commit 'a507af97eef468238d545ff954a39d7432832e54'
James Almer [Sun, 2 Sep 2018 22:11:45 +0000 (19:11 -0300)]
Merge commit 'a507af97eef468238d545ff954a39d7432832e54'

* commit 'a507af97eef468238d545ff954a39d7432832e54':
  avformat/libsrt: add latency options and deprecate tspbdelay

Merged-by: James Almer <jamrial@gmail.com>
7 months agoMerge commit 'ea8ae27a5e112d06fd5625f640e40849e6313f0c'
James Almer [Sun, 2 Sep 2018 22:11:23 +0000 (19:11 -0300)]
Merge commit 'ea8ae27a5e112d06fd5625f640e40849e6313f0c'

* commit 'ea8ae27a5e112d06fd5625f640e40849e6313f0c':
  avformat/libsrt: add payload size option

Merged-by: James Almer <jamrial@gmail.com>
7 months agoMerge commit '35ed7f93dbc72d733e454ae464b1324f38af62a0'
James Almer [Sun, 2 Sep 2018 22:10:49 +0000 (19:10 -0300)]
Merge commit '35ed7f93dbc72d733e454ae464b1324f38af62a0'

* commit '35ed7f93dbc72d733e454ae464b1324f38af62a0':
  qsvenc: Add an option to disable MFE mode

Merged-by: James Almer <jamrial@gmail.com>
7 months agoMerge commit 'e368b0cbfa3fdc627c331e34556f8e39296d04d5'
James Almer [Sun, 2 Sep 2018 22:10:14 +0000 (19:10 -0300)]
Merge commit 'e368b0cbfa3fdc627c331e34556f8e39296d04d5'

* commit 'e368b0cbfa3fdc627c331e34556f8e39296d04d5':
  tls_mbedtls: Use non-deprecated header file

Merged-by: James Almer <jamrial@gmail.com>
7 months agoavcodec/h264_refs: Document last if() in ff_h264_execute_ref_pic_marking()
Michael Niedermayer [Fri, 17 Aug 2018 00:06:27 +0000 (02:06 +0200)]
avcodec/h264_refs: Document last if() in ff_h264_execute_ref_pic_marking()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavcodec/h264_refs: Detect more random access points which are not marked
Michael Niedermayer [Tue, 14 Aug 2018 15:12:50 +0000 (17:12 +0200)]
avcodec/h264_refs: Detect more random access points which are not marked

Fixes: nature_360-7501616eb5eafca5-1111.mp4

Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoiavcodec/zmbv: Avoid reallocating cur/prev buffers if they are large enough
Michael Niedermayer [Sun, 26 Aug 2018 22:49:00 +0000 (00:49 +0200)]
iavcodec/zmbv: Avoid reallocating cur/prev buffers if they are large enough

Fixes: Timeout
Fixes: 9721/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ZMBV_fuzzer-5650321660444672

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavcodec/zmbv: remove useless zero check on dimensions
Michael Niedermayer [Sun, 26 Aug 2018 22:46:54 +0000 (00:46 +0200)]
avcodec/zmbv: remove useless zero check on dimensions

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavcodec/ffv1dec_template: do not ignore the return code of decode_line()
Michael Niedermayer [Sun, 26 Aug 2018 21:09:37 +0000 (23:09 +0200)]
avcodec/ffv1dec_template: do not ignore the return code of decode_line()

Fixes: Timeout
Fixes: 9710/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-4918894635515904

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavcodec/wmv2dec: skip frames that have only skiped MBs
Michael Niedermayer [Sun, 26 Aug 2018 13:57:54 +0000 (15:57 +0200)]
avcodec/wmv2dec: skip frames that have only skiped MBs

This requires us to pre-parse the skip data, as we want to
detect this before allocating all the arrays

Fixes: Timeout
Fixes: 9708/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-5729709861109760

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 months agoavcodec/ra144: Fix undefined integer overflow in add_wav()
Michael Niedermayer [Sun, 26 Aug 2018 00:26:24 +0000 (02:26 +0200)]
avcodec/ra144: Fix undefined integer overflow in add_wav()

Fixes: signed integer overflow: -26884 * 91439 cannot be represented in type 'int'
Fixes: 9687/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RA_144_fuzzer-4995588121690112

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>