ffmpeg.git
13 months agofftools/ffmpeg: fix mixed code and declarations
James Almer [Mon, 30 Apr 2018 16:19:29 +0000 (13:19 -0300)]
fftools/ffmpeg: fix mixed code and declarations

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
13 months agoavdevice/decklink_dec: unref packets on avpacket_queue_put error
Marton Balint [Sun, 22 Apr 2018 21:09:05 +0000 (23:09 +0200)]
avdevice/decklink_dec: unref packets on avpacket_queue_put error

Signed-off-by: Marton Balint <cus@passwd.hu>
13 months agoavdevice/decklink_dec: do not copy video data
Marton Balint [Sun, 22 Apr 2018 20:29:09 +0000 (22:29 +0200)]
avdevice/decklink_dec: do not copy video data

Create a buffer from the data instead and use the buffer destructor to free the
DeckLink frame. This avoids a memcpy of the frame data.

Signed-off-by: Marton Balint <cus@passwd.hu>
13 months agoUse AV_PIX_FMT_FLAG_ALPHA for detecting transparency where nb_components was used
Marton Balint [Thu, 19 Apr 2018 21:14:24 +0000 (23:14 +0200)]
Use AV_PIX_FMT_FLAG_ALPHA for detecting transparency where nb_components was used

Temporarily keep the old method for ffmpeg_filters.c choose_pix_fmt and
avfiltergraph.c pick_format() until a paletted pixel format without alpha is
introduced.

Signed-off-by: Marton Balint <cus@passwd.hu>
13 months agoavutil/pixdesc: add AV_PIX_FMT_FLAG_ALPHA to AV_PIX_FMT_PAL8
Marton Balint [Thu, 19 Apr 2018 21:00:47 +0000 (23:00 +0200)]
avutil/pixdesc: add AV_PIX_FMT_FLAG_ALPHA to AV_PIX_FMT_PAL8

Signed-off-by: Marton Balint <cus@passwd.hu>
13 months agoavcodec/hnm4video: fix palette alpha
Marton Balint [Mon, 23 Apr 2018 18:46:49 +0000 (20:46 +0200)]
avcodec/hnm4video: fix palette alpha

Signed-off-by: Marton Balint <cus@passwd.hu>
13 months agoavcodec/anm: fix palette alpha
Marton Balint [Mon, 23 Apr 2018 18:46:25 +0000 (20:46 +0200)]
avcodec/anm: fix palette alpha

Signed-off-by: Marton Balint <cus@passwd.hu>
13 months agoavformat/qtpalette: parse color table according to the QuickTime file format specs
Marton Balint [Thu, 19 Apr 2018 18:11:02 +0000 (20:11 +0200)]
avformat/qtpalette: parse color table according to the QuickTime file format specs

The specs says that the the first color component in the color array is
not alpha, but simply 0.

Fixes 0 alpha of fate-suite/cvid/catfight-cvid-pal8-partial.mov

Signed-off-by: Marton Balint <cus@passwd.hu>
13 months agoavfilter/vf_mix: initialize last to silence possible warning
Paul B Mahol [Mon, 30 Apr 2018 18:42:17 +0000 (20:42 +0200)]
avfilter/vf_mix: initialize last to silence possible warning

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavcodec/mpeg4video_parser: Avoid litteral 0x1B6, use named constant instead
Michael Niedermayer [Mon, 30 Apr 2018 16:17:20 +0000 (18:17 +0200)]
avcodec/mpeg4video_parser: Avoid litteral 0x1B6, use named constant instead

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
13 months agoavcodec/mpeg4video_parser: Fix incorrect spliting of MPEG-4 studio frames
Michael Niedermayer [Sun, 29 Apr 2018 21:56:15 +0000 (23:56 +0200)]
avcodec/mpeg4video_parser: Fix incorrect spliting of MPEG-4 studio frames

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
13 months agoavformat/m4vdec: Use the same constant names as libavcodec
Michael Niedermayer [Mon, 30 Apr 2018 16:09:41 +0000 (18:09 +0200)]
avformat/m4vdec: Use the same constant names as libavcodec

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
13 months agoavformat/m4vdec: Fix detection of raw MPEG-4 ES Studio
Michael Niedermayer [Sun, 29 Apr 2018 21:56:14 +0000 (23:56 +0200)]
avformat/m4vdec: Fix detection of raw MPEG-4 ES Studio

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
13 months agoconfigure: add missing pthreads dependency to v4l2_m2m
James Almer [Sun, 29 Apr 2018 18:04:10 +0000 (15:04 -0300)]
configure: add missing pthreads dependency to v4l2_m2m

Signed-off-by: James Almer <jamrial@gmail.com>
13 months agodoc/filters: add tmix examples
Paul B Mahol [Sun, 29 Apr 2018 17:36:25 +0000 (19:36 +0200)]
doc/filters: add tmix examples

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavfilter/vf_mix: make setting weights more user friendly
Paul B Mahol [Sun, 29 Apr 2018 17:27:15 +0000 (19:27 +0200)]
avfilter/vf_mix: make setting weights more user friendly

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavcodec/wavpack: Fix integer overflow in DEC_MED() / INC_MED()
Michael Niedermayer [Fri, 27 Apr 2018 19:44:07 +0000 (21:44 +0200)]
avcodec/wavpack: Fix integer overflow in DEC_MED() / INC_MED()

Fixes: runtime error: signed integer overflow: 2147483637 + 128 cannot be represented in type 'int'
Fixes: 6701/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-5358324934508544

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
13 months agoavcodec/wavpack: Fix integer overflow in wv_unpack_stereo()
Michael Niedermayer [Fri, 27 Apr 2018 19:44:06 +0000 (21:44 +0200)]
avcodec/wavpack: Fix integer overflow in wv_unpack_stereo()

Fixes: runtime error: signed integer overflow: 2147483531 + 16384 cannot be represented in type 'int'
Fixes: 6615/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-5165715515506688

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
13 months agoavfilter/vf_fieldmatch: add support for >8 bit depth in ppsrc
Paul B Mahol [Sat, 28 Apr 2018 22:11:13 +0000 (00:11 +0200)]
avfilter/vf_fieldmatch: add support for >8 bit depth in ppsrc

Also fix leaks while here.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavfilter/vf_fieldmatch: switch to activate
Paul B Mahol [Sun, 29 Apr 2018 12:57:53 +0000 (14:57 +0200)]
avfilter/vf_fieldmatch: switch to activate

Unbreaks ppsrc filtering.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavfilter: add amplify filter
Paul B Mahol [Fri, 27 Apr 2018 16:13:38 +0000 (18:13 +0200)]
avfilter: add amplify filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavfilter/vf_overlay: use slice_end in alpha_composite()
Paul B Mahol [Sun, 29 Apr 2018 08:02:57 +0000 (10:02 +0200)]
avfilter/vf_overlay: use slice_end in alpha_composite()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavcodec/vc1: fix mquant calculation
Jerome Borsboom [Sat, 28 Apr 2018 15:15:32 +0000 (17:15 +0200)]
avcodec/vc1: fix mquant calculation

In vc1_decode_i_blocks_adv mquant needs to be reset to its default value for
each macroblock, instead of once at the beginning of the slice.

DQPROFILE specifies which macroblocks can have an alternative quantizer step
size. When DQPROFILE specifies edges, the selection is applicable to the edges
of the picture. Slice edges are not selected by DQPROFILE.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
13 months agoavfilter/vf_fieldmatch: use correct subsamplings for y0a, y1a and startx
Paul B Mahol [Sat, 28 Apr 2018 19:01:27 +0000 (21:01 +0200)]
avfilter/vf_fieldmatch: use correct subsamplings for y0a, y1a and startx

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agodoc/ffmpeg - update benchmark option readout details
Gyan Doshi [Sat, 28 Apr 2018 17:21:04 +0000 (22:51 +0530)]
doc/ffmpeg - update benchmark option readout details

-benchmark and -benchmark_all now show real, system and user time

13 months agoavfilter/vf_overlay: add slice threading
Paul B Mahol [Fri, 27 Apr 2018 11:51:47 +0000 (13:51 +0200)]
avfilter/vf_overlay: add slice threading

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agofftools/ffmpeg: change fps progress log message to show two decimal digits
André Camargo [Fri, 27 Apr 2018 23:00:33 +0000 (20:00 -0300)]
fftools/ffmpeg: change fps progress log message to show two decimal digits

Useful when transcoding videos at 29.97 fps because delivers a more accurate result for monitoring.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
13 months agoswresample/arm: rename labels to fix xcode build error
Rahul Chaudhry [Fri, 27 Apr 2018 20:49:52 +0000 (13:49 -0700)]
swresample/arm: rename labels to fix xcode build error

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
13 months agofftools/ffmpeg: Add system time and real time to benchmarking.
Mark Wachsler [Fri, 27 Apr 2018 17:31:59 +0000 (13:31 -0400)]
fftools/ffmpeg: Add system time and real time to benchmarking.

The -benchmark and -benchmark_all options now show user, system, and real time,
instead of just user time.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
13 months agodoc/libav-merge: remove resolved item
Paul B Mahol [Sat, 28 Apr 2018 12:15:41 +0000 (14:15 +0200)]
doc/libav-merge: remove resolved item

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavcodec/proresdec2: add missing frame color metadata
Paul B Mahol [Sat, 28 Apr 2018 11:58:05 +0000 (13:58 +0200)]
avcodec/proresdec2: add missing frame color metadata

Stolen from removed decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavcodec/proresdec2: make long name more descriptive
Paul B Mahol [Sat, 28 Apr 2018 10:45:04 +0000 (12:45 +0200)]
avcodec/proresdec2: make long name more descriptive

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavcodec: remove duplicate prores decoder
Paul B Mahol [Thu, 26 Apr 2018 13:01:05 +0000 (15:01 +0200)]
avcodec: remove duplicate prores decoder

Removed slower one, couldn't figure out why it is slower.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavfilter/vf_convolution: make rdiv set to 0 more useful
Paul B Mahol [Sat, 28 Apr 2018 09:25:43 +0000 (11:25 +0200)]
avfilter/vf_convolution: make rdiv set to 0 more useful

Use 0 for signaling that rdiv will be calculated from sum
of all matrix elements.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agohwcontext_vaapi: Fix compilation with libva versions < 1.4.0
Mark Thompson [Fri, 27 Apr 2018 12:41:56 +0000 (13:41 +0100)]
hwcontext_vaapi: Fix compilation with libva versions < 1.4.0

The BufferHandle API was added in libva 1.4.0 / VAAPI 0.36.0.

13 months agoavfilter/vf_mix: use correct linesizes
Paul B Mahol [Fri, 27 Apr 2018 17:15:55 +0000 (19:15 +0200)]
avfilter/vf_mix: use correct linesizes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavfilter/vf_shuffleplanes: add support for timeline
Paul B Mahol [Fri, 27 Apr 2018 15:18:22 +0000 (17:18 +0200)]
avfilter/vf_shuffleplanes: add support for timeline

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavfilter/vf_premultiply: add slice threading
Paul B Mahol [Fri, 27 Apr 2018 10:25:32 +0000 (12:25 +0200)]
avfilter/vf_premultiply: add slice threading

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavfilter/vf_maskedclamp: silence warning
Paul B Mahol [Fri, 27 Apr 2018 09:35:18 +0000 (11:35 +0200)]
avfilter/vf_maskedclamp: silence warning

Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 months agoavfilter/vf_mix: add slice threading
Paul B Mahol [Fri, 27 Apr 2018 09:32:50 +0000 (11:32 +0200)]
avfilter/vf_mix: add slice threading

Signed-off-by: Paul B Mahol <onemda@gmail.com>
14 months agoavformat/mpegts: set AV_DISPOSITION_DESCRIPTIONS for OIPF cases
Łukasz Krzciuk [Fri, 13 Apr 2018 12:57:57 +0000 (14:57 +0200)]
avformat/mpegts: set AV_DISPOSITION_DESCRIPTIONS for OIPF cases

1. an audio component with an ISO_639_language_descriptor in the PMT with the
audio_type field set to 0x03
2. a supplementary_audio_descriptor with the editorial_classification field set
to 0x01
3. an ac-3_descriptor or an enhanced_ac-3_descriptor with a component_type field
with the service_type flags set to Visually Impaired

Tested-by: Łukasz Krzciuk <lkrzciuk@vewd.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
14 months agoavcodec/cbs_mpeg2: use existing buffer reference when splitting fragments
James Almer [Wed, 25 Apr 2018 22:35:46 +0000 (19:35 -0300)]
avcodec/cbs_mpeg2: use existing buffer reference when splitting fragments

Reviewed-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: James Almer <jamrial@gmail.com>
14 months agoavcodec/cbs: create reference counted fragments in ff_cbs_read_extradata()
James Almer [Wed, 25 Apr 2018 22:27:04 +0000 (19:27 -0300)]
avcodec/cbs: create reference counted fragments in ff_cbs_read_extradata()

This way, every CodedBitstreamType->split_fragment() function can
safely assume the fragment passed to them will be reference counted,
potentially simplifying code.

Reviewed-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: James Almer <jamrial@gmail.com>
14 months agoavfilter/vf_maskedclamp: add slice threading
Paul B Mahol [Thu, 26 Apr 2018 21:35:42 +0000 (23:35 +0200)]
avfilter/vf_maskedclamp: add slice threading

Signed-off-by: Paul B Mahol <onemda@gmail.com>
14 months agoavfilter/vf_atadenoise: do not abort if user specified invalid size
Paul B Mahol [Thu, 26 Apr 2018 15:57:20 +0000 (17:57 +0200)]
avfilter/vf_atadenoise: do not abort if user specified invalid size

Update documentation with new size default.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
14 months agolavf/http: use AV_OPT_FLAG_DEPRECATED for user-agent option
Clément Bœsch [Sun, 22 Apr 2018 14:31:04 +0000 (16:31 +0200)]
lavf/http: use AV_OPT_FLAG_DEPRECATED for user-agent option

14 months agolavu/opt: add AV_OPT_FLAG_DEPRECATED
Clément Bœsch [Sun, 22 Apr 2018 14:30:19 +0000 (16:30 +0200)]
lavu/opt: add AV_OPT_FLAG_DEPRECATED

14 months agolavu/threadmessage: add av_thread_message_queue_nb_elems()
Clément Bœsch [Sat, 21 Apr 2018 19:42:19 +0000 (21:42 +0200)]
lavu/threadmessage: add av_thread_message_queue_nb_elems()

14 months agoavcodec/vc1: fix out of bounds access of overlap filter
Jerome Borsboom [Thu, 26 Apr 2018 14:49:04 +0000 (16:49 +0200)]
avcodec/vc1: fix out of bounds access of overlap filter

Overlap filtering of the first row and first column must be guarded
for out of bounds access of v->over_flags_plane.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavfilter/vf_mix: clip output pixel values
Paul B Mahol [Wed, 25 Apr 2018 11:07:34 +0000 (13:07 +0200)]
avfilter/vf_mix: clip output pixel values

Signed-off-by: Paul B Mahol <onemda@gmail.com>
14 months agoavfilter/vf_mix: add scale option
Paul B Mahol [Tue, 24 Apr 2018 12:45:19 +0000 (14:45 +0200)]
avfilter/vf_mix: add scale option

Signed-off-by: Paul B Mahol <onemda@gmail.com>
14 months agoavfilter: add tmix filter
Paul B Mahol [Tue, 24 Apr 2018 11:45:13 +0000 (13:45 +0200)]
avfilter: add tmix filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
14 months agomov: Properly abide by the track's media duration
Derek Buitenhuis [Mon, 23 Apr 2018 15:46:55 +0000 (16:46 +0100)]
mov: Properly abide by the track's media duration

The track's media duration from the mdhd atom takes precedence
over both the stts and elst atom for calculating and setting
the track's total duraion.

Technically, we shouldn't be using the stts atom at all for
calculating stream durations.

This fixes incorrect stream and final packet durations on files
with edit lists that are longer than the media duration.

The FATE changes are expected, and output is more correct (the
AAC frame is not 1028 samples).

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
14 months agolavf/rtmpcrypt: Add a cast to silence an unavoidable warning.
Carl Eugen Hoyos [Sun, 15 Apr 2018 22:14:24 +0000 (00:14 +0200)]
lavf/rtmpcrypt: Add a cast to silence an unavoidable warning.

The av_rc4_crypt() documentation allows src == dst.

Silences the following warning:
libavformat/rtmpcrypt.c:304:36: warning: passing argument 2 of 'av_rc4_crypt' discards 'const' qualifier from pointer target type

Reported-by: Reino Wijnsma
14 months agoavformat/dashenc: Set mp4 as the default format for VP9
Karthick Jeyapal [Mon, 23 Apr 2018 06:10:33 +0000 (11:40 +0530)]
avformat/dashenc: Set mp4 as the default format for VP9

There is a separate muxer(webmdashenc.c) for supporting VP9+webm output in DASH.
Hence in this muxer we will focus on supporting VP9 in MP4
Have verified playout support of VP9+MP4 in Chrome and Firefox.

14 months agoavformat/dashenc: Set VP9 codec string with profile, level and bitdepth
Karthick Jeyapal [Mon, 23 Apr 2018 06:10:32 +0000 (11:40 +0530)]
avformat/dashenc: Set VP9 codec string with profile, level and bitdepth

Otherwise some versions of chrome browser returns "codec not supported" error

14 months agoavformat/vpcc: Calculate VP9 level from Luma's Sample rate and Picture size
Karthick Jeyapal [Mon, 23 Apr 2018 06:10:31 +0000 (11:40 +0530)]
avformat/vpcc: Calculate VP9 level from Luma's Sample rate and Picture size

14 months agoavformat/dashdec: fix compling warning "filename is deprecated"
Steven Liu [Thu, 26 Apr 2018 08:17:15 +0000 (16:17 +0800)]
avformat/dashdec: fix compling warning "filename is deprecated"

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
14 months agofix memory leak of parsing dash MPD
guikunzhi [Thu, 26 Apr 2018 04:40:52 +0000 (12:40 +0800)]
fix memory leak of parsing dash MPD

Signed-off-by: guikunzhi <guikunzhi@163.com>
14 months agoavcodec/error_resilience: Fix integer overflow in filter181()
Michael Niedermayer [Sun, 22 Apr 2018 19:46:05 +0000 (21:46 +0200)]
avcodec/error_resilience: Fix integer overflow in filter181()

Fixes: runtime error: signed integer overflow: 197710 * 10923 cannot be represented in type 'int'
Fixes: 7010/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5667127596941312

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
14 months agoavcodec/h263dec: Check slice_ret in mspeg4 slice loop
Michael Niedermayer [Sun, 22 Apr 2018 19:07:45 +0000 (21:07 +0200)]
avcodec/h263dec: Check slice_ret in mspeg4 slice loop

Fixes infinite loop
Fixes: 6858/clusterfuzz-testcase-ffmpeg_AV_CODEC_ID_MSMPEG4V3_fuzzer-4681563766784000
Fixes: 6890/clusterfuzz-testcase-ffmpeg_AV_CODEC_ID_WMV1_fuzzer-4756103142309888

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
14 months agoavcodec/h2645_parse: Replace RNXYA by RNXY in ff_h2645_extract_rbsp()
Michael Niedermayer [Sat, 10 Mar 2018 20:32:51 +0000 (21:32 +0100)]
avcodec/h2645_parse: Replace RNXYA by RNXY in ff_h2645_extract_rbsp()

Fixes misaligned accesses
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
14 months agoavcodec/elsdec: Fix memleaks
Michael Niedermayer [Tue, 24 Apr 2018 23:54:17 +0000 (01:54 +0200)]
avcodec/elsdec: Fix memleaks

Fixes: 6798/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-5135899701542912

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
14 months agoavcodec/vc1: more corrections for AC inverse quantization scaling
Jerome Borsboom [Wed, 25 Apr 2018 18:07:53 +0000 (20:07 +0200)]
avcodec/vc1: more corrections for AC inverse quantization scaling

HALFQP should only be added to the inverse quantizer when the block is
coded with PQUANT. When PQUANT is equal to ALTPQUANT, the original test
for the addition of HALFQP fails. A negative value for mquant indicates
that the value was derived from VOPDQUANT.

Fixes #4372

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: correct forgotten v->blocks_off
Jerome Borsboom [Mon, 23 Apr 2018 19:00:33 +0000 (21:00 +0200)]
avcodec/vc1: correct forgotten v->blocks_off

correct forgotten v->blocks_off

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: correct AC inverse quantization scaling
Jerome Borsboom [Mon, 23 Apr 2018 19:00:15 +0000 (21:00 +0200)]
avcodec/vc1: correct AC inverse quantization scaling

HALFQP should only be added to the inverse quantizer when the block is
coded with PQUANT. See 8.1.3.8 in VC-1 spec.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: correct mspel for field-interlace B frames
Jerome Borsboom [Mon, 23 Apr 2018 19:00:08 +0000 (21:00 +0200)]
avcodec/vc1: correct mspel for field-interlace B frames

mspel indicates the use of bicubic interpolation. The check wrongly included
MVMODE MV_PMODE_1MV_HPEL as using bilinear interpolation.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: remove unused overlap smooting and loop filter
Jerome Borsboom [Mon, 23 Apr 2018 19:00:02 +0000 (21:00 +0200)]
avcodec/vc1: remove unused overlap smooting and loop filter

remove unused overlap smooting and loop filter

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: add overlap smooting and loop filter for frame/field-interlace
Jerome Borsboom [Mon, 23 Apr 2018 18:59:55 +0000 (20:59 +0200)]
avcodec/vc1: add overlap smooting and loop filter for frame/field-interlace

Add previously omitted overlap smooting and loop filtering for
frame/field-interlace pictures. For progressive pictures switch to the
re-implemented versions of overlap smooting and loop filtering.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: re-implement vc1_put_signed_blocks_clamped
Jerome Borsboom [Mon, 23 Apr 2018 18:59:49 +0000 (20:59 +0200)]
avcodec/vc1: re-implement vc1_put_signed_blocks_clamped

The existing implementation only used vc1_put_signed_blocks_clamped for I and
BI frames. This rewritten version is also applicable to P frame both
progressive and frame/field-interlace.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: implement interlaced out-of-bounds reference pixel replication
Jerome Borsboom [Mon, 23 Apr 2018 18:59:41 +0000 (20:59 +0200)]
avcodec/vc1: implement interlaced out-of-bounds reference pixel replication

The existing implementation did out-of-bounds reference pixel replication for
progressive reference frames. In interlaced reference frames both the even and
odd line on the horizontal edges need to be replicated.

Fixes #3262.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: correct ff_vc1_dqscale
Jerome Borsboom [Mon, 23 Apr 2018 18:59:28 +0000 (20:59 +0200)]
avcodec/vc1: correct ff_vc1_dqscale

According to VC-1 spec table 74, the last value in ff_vc1_dqscale should be
0x1041 instead of 0x1000.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: correct ff_vc1_mbmode_intfrp
Jerome Borsboom [Mon, 23 Apr 2018 18:59:20 +0000 (20:59 +0200)]
avcodec/vc1: correct ff_vc1_mbmode_intfrp

According to VC-1 spec 10.7.3.4, FIELDTX shall be set to the same type as the
motion vector for zero-coded blocks.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: store color-difference reference field type
Jerome Borsboom [Mon, 23 Apr 2018 18:59:13 +0000 (20:59 +0200)]
avcodec/vc1: store color-difference reference field type

The loop filter for P interlace field pictures needs the reference field type.
For luma, the reference field type was already available. Store the reference
field type for color-difference as well.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: store additional bitstream elements during MB decoding
Jerome Borsboom [Mon, 23 Apr 2018 18:58:59 +0000 (20:58 +0200)]
avcodec/vc1: store additional bitstream elements during MB decoding

The new loop filter needs additional MB properties to make its filtering
decisions.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: re-implement and expand VC-1 loop filtering
Jerome Borsboom [Mon, 23 Apr 2018 18:58:52 +0000 (20:58 +0200)]
avcodec/vc1: re-implement and expand VC-1 loop filtering

The existing implementation did loop filtering for progressive
frames only. This rewritten version implements loop filtering for
all applicable frame types for both progessive and
frame/field-interlace.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: change to using v->block instead of s->block for P frames
Jerome Borsboom [Mon, 23 Apr 2018 18:58:41 +0000 (20:58 +0200)]
avcodec/vc1: change to using v->block instead of s->block for P frames

The new overlap smooting filter smoothes image pixels stored in v->block.
Switch to v->block instead of s->block for storing decoded image pixels for P
frames. Additionally, we must take incrementing *_blk_idx out of the
vc1_put_signed_blocks_clamped function.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: re-implement and expand VC-1 overlap smoothing
Jerome Borsboom [Mon, 23 Apr 2018 18:58:31 +0000 (20:58 +0200)]
avcodec/vc1: re-implement and expand VC-1 overlap smoothing

The existing implementation did overlap smoothing for progressive
frames only. This rewritten version implements overlap smoothing
for all applicable frame types for both progessive and
frame/field-interlace.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/cbs_mpeg2: use memcpy when assembling fragments
James Almer [Tue, 24 Apr 2018 02:39:54 +0000 (23:39 -0300)]
avcodec/cbs_mpeg2: use memcpy when assembling fragments

before:
419022 decicycles in assemble_fragment,    2047 runs,      1 skips

after:
104621 decicycles in assemble_fragment,    2045 runs,      3 skips

Benched with a 2 minutes long 720x480 DVD mpeg2 sample.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
14 months agoavcodec/mpeg4_unpack_bframes: cache input packets directly
James Almer [Wed, 21 Mar 2018 00:59:10 +0000 (21:59 -0300)]
avcodec/mpeg4_unpack_bframes: cache input packets directly

Avoids unnecessary allocs+copies and makes the code slightly simpler.

Signed-off-by: James Almer <jamrial@gmail.com>
14 months agoavcodec/mediacodecdec: refactor pts handling
Aman Gupta [Tue, 24 Apr 2018 20:51:15 +0000 (13:51 -0700)]
avcodec/mediacodecdec: refactor pts handling

Also fixes a bug where EOS buffer was sent with incorrect
pts when not using surface generation.

Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Aman Gupta <aman@tmm1.net>
14 months agoavcodec/mediacodecdec: use AV_TIME_BASE_Q
Aman Gupta [Tue, 24 Apr 2018 20:45:30 +0000 (13:45 -0700)]
avcodec/mediacodecdec: use AV_TIME_BASE_Q

Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Jan Ekström <jeebjp@gmail.com>
Signed-off-by: Aman Gupta <aman@tmm1.net>
14 months agoavcodec/mediacodecdec: clarify delay_flush specific code
Aman Gupta [Tue, 24 Apr 2018 02:21:19 +0000 (19:21 -0700)]
avcodec/mediacodecdec: clarify delay_flush specific code

As of 2a0eb8685, ff_mediacodec_dec_is_flushing() only returns
true in delay_flush mode. Make this more obvious by adding
delay_flush to the if statement.

Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Aman Gupta <aman@tmm1.net>
14 months agoavformat/yuv4mpegdec: fix seeking backwards
Paul B Mahol [Wed, 25 Apr 2018 16:30:46 +0000 (18:30 +0200)]
avformat/yuv4mpegdec: fix seeking backwards

Signed-off-by: Paul B Mahol <onemda@gmail.com>
14 months agoavfiler/vf_mix: fix crash with >8 bit depth
Paul B Mahol [Wed, 25 Apr 2018 12:08:21 +0000 (14:08 +0200)]
avfiler/vf_mix: fix crash with >8 bit depth

Signed-off-by: Paul B Mahol <onemda@gmail.com>
14 months agomake swresample optional for ffmpeg
Paul B Mahol [Thu, 12 Apr 2018 20:15:05 +0000 (22:15 +0200)]
make swresample optional for ffmpeg

Signed-off-by: Paul B Mahol <onemda@gmail.com>
14 months agoavcodec/vc1_block: simplify ac_val computation
Michael Niedermayer [Mon, 23 Apr 2018 00:08:10 +0000 (02:08 +0200)]
avcodec/vc1_block: simplify ac_val computation

also fixes: runtime error: index 1456 out of bounds for type 'int16_t [16]'

Found-by: durandal_1707
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
14 months agoavcodec/clearvideo: display warning if decoder overreads input
Paul B Mahol [Tue, 24 Apr 2018 15:20:26 +0000 (17:20 +0200)]
avcodec/clearvideo: display warning if decoder overreads input

Signed-off-by: Paul B Mahol <onemda@gmail.com>
14 months agoavcodec/clearvideo: do not try to return frame when it is same as previous one
Paul B Mahol [Tue, 24 Apr 2018 15:10:26 +0000 (17:10 +0200)]
avcodec/clearvideo: do not try to return frame when it is same as previous one

Signed-off-by: Paul B Mahol <onemda@gmail.com>
14 months agoavcodec/ffv1enc: Check that the crc + version combination is supported
Michael Niedermayer [Sat, 21 Apr 2018 20:19:31 +0000 (22:19 +0200)]
avcodec/ffv1enc: Check that the crc + version combination is supported

The crc flag is only stored since version 3 thus before this crcs do not
work. We increase the version as needed same as we do with pix_fmts

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
14 months agoavcodec/vaapi: do not parse MVMODE for VC-1 interlaced frame pictures
Jerome Borsboom [Thu, 29 Mar 2018 11:43:34 +0000 (13:43 +0200)]
avcodec/vaapi: do not parse MVMODE for VC-1 interlaced frame pictures

Interlaced frame pictures do not contain the MVMODE or MVMODE2 bitstream
element. Trying to parse this element and passing a nonzero value to the
hardware decoder results in small inaccuracies in the decoded picture.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
14 months agoavcodec/vc1: check return value of bitplane_decoding()
Paul B Mahol [Sun, 22 Apr 2018 22:05:20 +0000 (00:05 +0200)]
avcodec/vc1: check return value of bitplane_decoding()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
14 months agoavfilter/vf_interlace: remove duplicate code with same funcionality
Vasile Toncu [Tue, 17 Apr 2018 10:48:28 +0000 (13:48 +0300)]
avfilter/vf_interlace: remove duplicate code with same funcionality

14 months agoRevert "libavformat: add mbedTLS based TLS"
Rostislav Pehlivanov [Mon, 23 Apr 2018 19:28:50 +0000 (20:28 +0100)]
Revert "libavformat: add mbedTLS based TLS"

This reverts commit 62f5c9d68bf6e0f2c1a47cf002629a70a82274fc,
which was pushed a bit prematurely.

14 months agolibavformat: add mbedTLS based TLS
Thomas Volkert [Sat, 21 Apr 2018 13:53:31 +0000 (15:53 +0200)]
libavformat: add mbedTLS based TLS

14 months agolavf/os_support: Only compile inet_aton() if getaddrinfo() is needed.
Carl Eugen Hoyos [Sun, 15 Apr 2018 23:28:47 +0000 (01:28 +0200)]
lavf/os_support: Only compile inet_aton() if getaddrinfo() is needed.

Silences a warning:
libavformat/os_support.c:49:12: warning: 'inet_aton' defined but not used

Reported-by: Reino Wijnsma
14 months agoavformat/vpcc: add ff_isom_get_vpcc_features()
James Almer [Sat, 13 Jan 2018 19:04:55 +0000 (16:04 -0300)]
avformat/vpcc: add ff_isom_get_vpcc_features()

Should be useful for muxers that require values as defined in the
vpcc atom but don't need to write the atom itself.

Signed-off-by: James Almer <jamrial@gmail.com>
14 months agoswscale/swscale_unscaled : add X86_64 (SSE2 and AVX) for uyvyto422
Martin Vignali [Sun, 22 Apr 2018 17:14:23 +0000 (19:14 +0200)]
swscale/swscale_unscaled : add X86_64 (SSE2 and AVX) for uyvyto422

and checkasm test

14 months agoavcodec/prores_ks : use official quant_matrix (for proxy and xq codec luma and chroma...
Martin Vignali [Fri, 13 Apr 2018 18:50:18 +0000 (20:50 +0200)]
avcodec/prores_ks : use official quant_matrix (for proxy and xq codec luma and chroma quant matrix is not the same)

disable the use of the official luma xq matrix for now (output
appear to be desaturate)

14 months agoavformat/dsfdec: fix calculation of size of data chunk
Paul B Mahol [Sun, 22 Apr 2018 11:14:26 +0000 (13:14 +0200)]
avformat/dsfdec: fix calculation of size of data chunk

Ignore extra 12 bytes that belong to tag and size.

Signed-off-by: Paul B Mahol <onemda@gmail.com>