ffmpeg.git
3 years agoavformat/oggenc: add vp8 muxing support
James Almer [Thu, 21 Jul 2016 01:29:54 +0000 (22:29 -0300)]
avformat/oggenc: add vp8 muxing support

Addresses ticket #5687

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat: add an Ogg Video muxer
James Almer [Thu, 21 Jul 2016 00:55:12 +0000 (21:55 -0300)]
avformat: add an Ogg Video muxer

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoChangelog: move a misplaced entry to the correct section
James Almer [Thu, 21 Jul 2016 00:45:20 +0000 (21:45 -0300)]
Changelog: move a misplaced entry to the correct section

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/mux: Fix some codecpar non uses
Michael Niedermayer [Sun, 17 Jul 2016 02:10:38 +0000 (04:10 +0200)]
avformat/mux: Fix some codecpar non uses

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: add test for earwax filter
Petru Rares Sincraian [Wed, 20 Jul 2016 16:41:58 +0000 (18:41 +0200)]
fate: add test for earwax filter

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: add test for dcshift filter
Petru Rares Sincraian [Wed, 20 Jul 2016 16:32:04 +0000 (18:32 +0200)]
fate: add test for dcshift filter

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agox86/diracdsp: make ff_put_signed_rect_clamped_10_sse4 work on x86_32
James Almer [Wed, 20 Jul 2016 01:37:04 +0000 (22:37 -0300)]
x86/diracdsp: make ff_put_signed_rect_clamped_10_sse4 work on x86_32

Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agolibavcodec/dnxhd: add dnxhr profiles
Mark Reid [Sun, 17 Jul 2016 02:37:37 +0000 (19:37 -0700)]
libavcodec/dnxhd: add dnxhr profiles

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffmpeg_opt: Delete duplicate “hwaccel_output_format” option.
Jun Zhao [Fri, 24 Jun 2016 07:06:08 +0000 (15:06 +0800)]
ffmpeg_opt: Delete duplicate “hwaccel_output_format” option.

Delete duplicate “hwaccel_output_format” option.

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibavcodec/libvpx: Add VPx alpha decode support
Vignesh Venkatasubramanian [Thu, 14 Jul 2016 19:15:57 +0000 (12:15 -0700)]
libavcodec/libvpx: Add VPx alpha decode support

VPx (VP8/VP9) alpha encoding has been part of FFmpeg. Now, add the
ability to decode such files with alpha channel.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
3 years agofate: add test for chorus filter
Petru Rares Sincraian [Tue, 19 Jul 2016 19:18:08 +0000 (21:18 +0200)]
fate: add test for chorus filter

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/avlanguage: make av_convert_lang_to() internal
James Almer [Fri, 13 May 2016 21:03:28 +0000 (18:03 -0300)]
avformat/avlanguage: make av_convert_lang_to() internal

The header was never installed and the function is only used in libavformat

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/oggenc: fix page duration calculation when granule differs from timestamp
James Almer [Fri, 8 Jul 2016 01:41:55 +0000 (22:41 -0300)]
avformat/oggenc: fix page duration calculation when granule differs from timestamp

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/oggparsevp8: fix pts calculation on pages ending with an invisible frame
James Almer [Tue, 12 Jul 2016 20:05:42 +0000 (17:05 -0300)]
avformat/oggparsevp8: fix pts calculation on pages ending with an invisible frame

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoconfigure: add support for new CPUs
James Almer [Sun, 17 Jul 2016 22:14:12 +0000 (19:14 -0300)]
configure: add support for new CPUs

Add new -march values for Intel and AMD CPUs introduced with GCC 5 and 6, and
improve SunCC flags accordingly.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/h264_slice: Move h264_init_ps() call into h264_field_start()
Michael Niedermayer [Tue, 19 Jul 2016 20:31:56 +0000 (22:31 +0200)]
avcodec/h264_slice: Move h264_init_ps() call into h264_field_start()

This was missing from f512e4a39037ef798ec78170f734c7733abe3231

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/h264: remove list_count and ref_count clearing
Michael Niedermayer [Tue, 19 Jul 2016 20:31:57 +0000 (22:31 +0200)]
avcodec/h264: remove list_count and ref_count clearing

The code conflicts with moving the h264_init_ps() call point

Without this, ff_h264_parse_ref_count() fills ref and list count and
h264_init_ps() subsequently wipes them out on a "success" path.
Subsequently things crash as the wiped fields are used.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: add test for avfft
Petru Rares Sincraian [Mon, 4 Jul 2016 15:23:14 +0000 (17:23 +0200)]
fate: add test for avfft

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat: Add tee protocol
Michael Niedermayer [Mon, 18 Jul 2016 12:42:22 +0000 (14:42 +0200)]
avformat: Add tee protocol

Option passing support will be submitted seperately to the ML

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/h264: fix spacing before comment
Clément Bœsch [Tue, 19 Jul 2016 13:34:03 +0000 (15:34 +0200)]
lavc/h264: fix spacing before comment

3 years agoavutil/mem: fix wrong comment
Zhao Zhili [Mon, 18 Jul 2016 16:03:19 +0000 (00:03 +0800)]
avutil/mem: fix wrong comment

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMAINTAINERS: add myself for libopenmpt
Josh de Kock [Sun, 17 Jul 2016 15:59:03 +0000 (16:59 +0100)]
MAINTAINERS: add myself for libopenmpt

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/ccaption_dec: default rollup to row 10
Aman Gupta [Tue, 14 Jun 2016 18:57:45 +0000 (11:57 -0700)]
avcodec/ccaption_dec: default rollup to row 10

This ensures that captions are written towards the bottom of the screen
when tuning into mid-stream. The row will be reset on the receipt of the
next PAC command. Row 10 was chosen as it corresponds to the value of
"0" in a PAC (see row_map in handle_pac()).

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/ccaption_dec: implement positioning for closed captions
Aman Gupta [Tue, 14 Jun 2016 18:57:43 +0000 (11:57 -0700)]
avcodec/ccaption_dec: implement positioning for closed captions

Positioning math is based on the guidelines in https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-608

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotools/patcheck: add a couple more common typos
James Almer [Sun, 17 Jul 2016 21:38:14 +0000 (18:38 -0300)]
tools/patcheck: add a couple more common typos

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/ccaption_dec: change write_char() to void as return value is unused
Aman Gupta [Tue, 14 Jun 2016 18:57:41 +0000 (11:57 -0700)]
avcodec/ccaption_dec: change write_char() to void as return value is unused

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMAINTAINERS: Add Aman Gupta for ccaption_dec
Michael Niedermayer [Sat, 16 Jul 2016 12:58:20 +0000 (14:58 +0200)]
MAINTAINERS: Add Aman Gupta for ccaption_dec

Anshul appears to have no time currently as he has not reacted to patches or mails
and Aman agreed to take over maintaince or help

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agocosmetics: fix some misspelled words
James Almer [Sun, 17 Jul 2016 16:10:27 +0000 (13:10 -0300)]
cosmetics: fix some misspelled words

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agolibavformat/libopenmpt: Fix memory leak in error path in read_header_openmpt().
Jörn Heusipp [Sun, 17 Jul 2016 13:37:12 +0000 (15:37 +0200)]
libavformat/libopenmpt: Fix memory leak in error path in read_header_openmpt().

Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/dnxhddata: replace % by &
Michael Niedermayer [Sat, 16 Jul 2016 14:15:33 +0000 (16:15 +0200)]
avcodec/dnxhddata: replace % by &

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: fix apng tests dependencies
James Almer [Sat, 16 Jul 2016 18:29:43 +0000 (15:29 -0300)]
fate: fix apng tests dependencies

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoconfigure: add missing loongson dependencies
James Almer [Sat, 16 Jul 2016 18:18:58 +0000 (15:18 -0300)]
configure: add missing loongson dependencies

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agolibavcodec/dnxhd: add support more dnxhr header prefixes
Mark Reid [Tue, 12 Jul 2016 02:07:21 +0000 (19:07 -0700)]
libavcodec/dnxhd: add support more dnxhr header prefixes

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/tee: Use ff_format_output_open() function
Jan Sebechlebsky [Mon, 4 Jul 2016 14:45:14 +0000 (16:45 +0200)]
avformat/tee: Use ff_format_output_open() function

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavformat/utils: Add ff_format_output_open() function
Jan Sebechlebsky [Mon, 4 Jul 2016 14:45:13 +0000 (16:45 +0200)]
avformat/utils: Add ff_format_output_open() function

Add ff_format_output_open utility function to wrap
io_open callback of AVFormatContext structure.

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavformat/tee: Support flushing by writing NULL pkt
Jan Sebechlebsky [Mon, 11 Jul 2016 21:27:51 +0000 (23:27 +0200)]
avformat/tee: Support flushing by writing NULL pkt

This will add support for flushing by writing NULL
packet to the tee muxer, which propagates the action
to slave muxers as expected.

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavformat/tee: Use ff_stream_encode_params_copy()
Jan Sebechlebsky [Mon, 4 Jul 2016 14:45:10 +0000 (16:45 +0200)]
avformat/tee: Use ff_stream_encode_params_copy()

Use ff_stream_encode_params_copy() to copy encoding-related
fields (parameters) of stream.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavformat/utils: Add ff_stream_encode_params_copy()
Jan Sebechlebsky [Wed, 13 Jul 2016 15:00:11 +0000 (17:00 +0200)]
avformat/utils: Add ff_stream_encode_params_copy()

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agolavf: add libopenmpt demuxer
Josh de Kock [Thu, 14 Jul 2016 17:30:27 +0000 (18:30 +0100)]
lavf: add libopenmpt demuxer

Fixes ticket #5623

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agorefine the method option describe of hlsenc doc
Steven Liu [Wed, 13 Jul 2016 07:15:06 +0000 (15:15 +0800)]
refine the method option describe of hlsenc doc

Signed-off-by: LiuQi <liuqi@gosun.com>
Reviewed-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoRestore compatibility with powerpc-apple-darwin9-gcc-4.2.1
Pavel Koshevoy [Fri, 15 Jul 2016 04:06:07 +0000 (22:06 -0600)]
Restore compatibility with powerpc-apple-darwin9-gcc-4.2.1

... and attempt to preserve compatibility with clang that was
introduced in 311a953c76081fca99b872629d248f9d69ebc0c3 (untested)

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavf/vplayerdec: Improve auto-detection.
Clément Bœsch [Fri, 15 Jul 2016 08:29:14 +0000 (10:29 +0200)]
lavf/vplayerdec: Improve auto-detection.

Fixes the incorrect detection of 16_selma_OneFrame_QP39.yuv (gray16le
rawvideo) as vplayer format.

3 years agolavf/img2dec: Also auto-detect (unusual) uncompressed pcx.
Carl Eugen Hoyos [Fri, 15 Jul 2016 08:26:27 +0000 (10:26 +0200)]
lavf/img2dec: Also auto-detect (unusual) uncompressed pcx.

3 years agolavf/img2: Remove ffv1-img.
Carl Eugen Hoyos [Fri, 15 Jul 2016 08:25:02 +0000 (10:25 +0200)]
lavf/img2: Remove ffv1-img.

The ffv1 format currently needs a container.

3 years agoaf_hdcd: detect and report encoding errors and oddities
Burt P [Tue, 12 Jul 2016 17:54:10 +0000 (12:54 -0500)]
af_hdcd: detect and report encoding errors and oddities

Count and report when a code is signaled but fails to match a known pattern.
For example try Līve - Secret Samadhi.

Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoaf_hdcd: only hdcd_update_info() when something changes
Burt P [Tue, 12 Jul 2016 17:54:08 +0000 (12:54 -0500)]
af_hdcd: only hdcd_update_info() when something changes

Only call hdcd_update_info() when the control code changes
instead of every frame, so the counters are more meaningful.

Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoaf_hdcd: fewer false positives by ignoring code_counterC in HDCD detection
Burt P [Tue, 12 Jul 2016 17:54:07 +0000 (12:54 -0500)]
af_hdcd: fewer false positives by ignoring code_counterC in HDCD detection

Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/segment: remove the check_bitstream from segment
Steven Liu [Wed, 13 Jul 2016 22:37:02 +0000 (06:37 +0800)]
avformat/segment: remove the check_bitstream from segment

because the BSF logic was re-factored into a shareable
function and both av_write_frame and av_interleaved_write_frame use it it

Signed-off-by: LiuQi <liuqi@gosun.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc'
Clément Bœsch [Thu, 14 Jul 2016 17:41:37 +0000 (19:41 +0200)]
Merge commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc'

* commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc':
  h264: pass a H2645NAL to slice header decoding

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '523c4c5b70994f5cd1f192b68d07cf24b292ca05'
Clément Bœsch [Thu, 14 Jul 2016 17:37:14 +0000 (19:37 +0200)]
Merge commit '523c4c5b70994f5cd1f192b68d07cf24b292ca05'

* commit '523c4c5b70994f5cd1f192b68d07cf24b292ca05':
  fate: Add TrueMotion 2 RT tests

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '906ffed9b1b8b06979eb656989aecacb1ae75a3a'
Clément Bœsch [Thu, 14 Jul 2016 17:33:20 +0000 (19:33 +0200)]
Merge commit '906ffed9b1b8b06979eb656989aecacb1ae75a3a'

* commit '906ffed9b1b8b06979eb656989aecacb1ae75a3a':
  fate: Move Duck Truemotion 1 and 2 tests to vpx.mak

Merged-by: Clément Bœsch <u@pkh.me>
3 years agolavc/truemotion2rt: mark AVPacket* as const
Clément Bœsch [Thu, 14 Jul 2016 17:29:43 +0000 (19:29 +0200)]
lavc/truemotion2rt: mark AVPacket* as const

3 years agoMerge commit '470cd0c5fe6337b6cb5276b3f84400999450fc1b'
Clément Bœsch [Thu, 14 Jul 2016 17:17:09 +0000 (19:17 +0200)]
Merge commit '470cd0c5fe6337b6cb5276b3f84400999450fc1b'

* commit '470cd0c5fe6337b6cb5276b3f84400999450fc1b':
  Add TrueMotion 2.0 Real Time decoder

Merged-by: Clément Bœsch <u@pkh.me>
3 years agolavc/codec_desc: move a few codecs out of the image codecs list
Clément Bœsch [Thu, 14 Jul 2016 17:10:00 +0000 (19:10 +0200)]
lavc/codec_desc: move a few codecs out of the image codecs list

Also shuffle them a little to simplify next Libav merge.

3 years agofate/video: use FATE_VIDEO instead of FATE_SAMPLES_AVCONV
Clément Bœsch [Thu, 14 Jul 2016 17:01:51 +0000 (19:01 +0200)]
fate/video: use FATE_VIDEO instead of FATE_SAMPLES_AVCONV

Consistent with the rest of the rules

3 years agoMerge commit 'cc58656aca95b5ab517989a9524b9a2b1c5653cf'
Clément Bœsch [Thu, 14 Jul 2016 16:57:37 +0000 (18:57 +0200)]
Merge commit 'cc58656aca95b5ab517989a9524b9a2b1c5653cf'

* commit 'cc58656aca95b5ab517989a9524b9a2b1c5653cf':
  fate: Add tests for MagicYUV

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit 'd78fd2fa21cde28465e40dd0be4446b1387d22a6'
Clément Bœsch [Thu, 14 Jul 2016 16:39:46 +0000 (18:39 +0200)]
Merge commit 'd78fd2fa21cde28465e40dd0be4446b1387d22a6'

* commit 'd78fd2fa21cde28465e40dd0be4446b1387d22a6':
  Add MagicYUV decoder

Changes observed from Libav:
- many cosmetics (function renames/move, spacing, line breaks)
- MagicYUVContext.slices_size is now unsigned
- use of pixdesc (include fixed in FFmpeg)
- mention of "Lossless" in the long name dropped (also removed from
  general.texi in FFmpeg)
- addition of the FF_CODEC_CAP_INIT_THREADSAFE caps
- use of qsort() instead of AV_QSORT() (NOT MERGED)
- use of AVCodecContext.{width,height} instead of AVCodecContext.coded_{width,height} (NOT MERGED)

See also 77f9c4b7aa9eb793b3019025e177245896821816

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoavformat/mux: Apply auto bsfs in av_write_frame() too
Michael Niedermayer [Wed, 13 Jul 2016 17:08:45 +0000 (19:08 +0200)]
avformat/mux: Apply auto bsfs in av_write_frame() too

Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/mux: Factor do_packet_auto_bsf() out
Michael Niedermayer [Wed, 13 Jul 2016 17:08:44 +0000 (19:08 +0200)]
avformat/mux: Factor do_packet_auto_bsf() out

Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavf/mov: fix stream extradata_size allocation
Matthieu Bouron [Wed, 13 Jul 2016 20:46:44 +0000 (22:46 +0200)]
lavf/mov: fix stream extradata_size allocation

Fixes CID 1363963.

3 years agodirac_vlc: prevent shifting a 0 by 64 bits when zeroing residue
Rostislav Pehlivanov [Thu, 14 Jul 2016 00:26:51 +0000 (01:26 +0100)]
dirac_vlc: prevent shifting a 0 by 64 bits when zeroing residue

Adding a check for bits == 0 would still make Coverity misdetect this,
so just revert to the normal way of setting the residue to 0.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agodirac_vlc: add a SET_RESIDUE macro and fix recent regression
Rostislav Pehlivanov [Thu, 14 Jul 2016 00:00:59 +0000 (01:00 +0100)]
dirac_vlc: add a SET_RESIDUE macro and fix recent regression

Can also be used in future cleanups since 99% of the time the leftover
appending will just append to an already empty residue.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agodiracdec: fix unchecked byte length
Rostislav Pehlivanov [Wed, 13 Jul 2016 22:53:05 +0000 (23:53 +0100)]
diracdec: fix unchecked byte length

Also drops the start variable since it's redundant.
Found by Coverity, fixes CID1363964

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agodiracdec: fix maximum quantization index checks
Rostislav Pehlivanov [Wed, 13 Jul 2016 22:40:06 +0000 (23:40 +0100)]
diracdec: fix maximum quantization index checks

Found by Coverity, fixes CID1363961 and CID1363962

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agodirac_vlc: remove redundant macro declaration
Rostislav Pehlivanov [Wed, 13 Jul 2016 22:38:10 +0000 (23:38 +0100)]
dirac_vlc: remove redundant macro declaration

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agodirac_vlc: fix undefined shifts
Rostislav Pehlivanov [Wed, 13 Jul 2016 22:35:03 +0000 (23:35 +0100)]
dirac_vlc: fix undefined shifts

Shifting by more than 63 bits is undefined behavior, athough any
compiler not returning 0 after shifting by any amount would be insane.

Found by Coverity, fixes CID1363959 and CID1363960

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoavfilter/vf_uspp: Check for encoding failure
Michael Niedermayer [Wed, 13 Jul 2016 18:16:27 +0000 (20:16 +0200)]
avfilter/vf_uspp: Check for encoding failure

Fixes CID1363015

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'ec9f04423b82afa323e90f5b2c677be74302c1fd'
Matthieu Bouron [Wed, 13 Jul 2016 15:39:47 +0000 (17:39 +0200)]
Merge commit 'ec9f04423b82afa323e90f5b2c677be74302c1fd'

* commit 'ec9f04423b82afa323e90f5b2c677be74302c1fd':
  ffv1: Error out on unsupported format

This commit is a noop, the feature is already present in FFmpeg.

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
3 years agofate: fix fate-vp8 dependencies
James Almer [Tue, 12 Jul 2016 19:50:30 +0000 (16:50 -0300)]
fate: fix fate-vp8 dependencies

Fix the demuxer dependencies in some of the tests and remove the vp8 decoder
dependency for the stream copy tests

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '105998fb5ca3c343f5c8cb39ce3197f87a5e4d36'
Matthieu Bouron [Wed, 13 Jul 2016 15:16:14 +0000 (17:16 +0200)]
Merge commit '105998fb5ca3c343f5c8cb39ce3197f87a5e4d36'

* commit '105998fb5ca3c343f5c8cb39ce3197f87a5e4d36':
  checkasm: Add tests for h264 idct

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
3 years agotests/checkasm: reduce cosmetic diff with libav
Matthieu Bouron [Wed, 13 Jul 2016 15:11:58 +0000 (17:11 +0200)]
tests/checkasm: reduce cosmetic diff with libav

Chunk was not merged in ca5ec2bf51d8c4f8bb0a829d0a65c70c968888a3.

3 years agoMerge commit '846a3e78a535f05ee61bb23a160f3378f041f751'
Matthieu Bouron [Wed, 13 Jul 2016 14:56:20 +0000 (16:56 +0200)]
Merge commit '846a3e78a535f05ee61bb23a160f3378f041f751'

* commit '846a3e78a535f05ee61bb23a160f3378f041f751':
  mov: Support prores with multiple stsd

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
3 years agoMerge commit '76729970049fe95659346503f7401a5d869f9959'
Matthieu Bouron [Wed, 13 Jul 2016 14:34:39 +0000 (16:34 +0200)]
Merge commit '76729970049fe95659346503f7401a5d869f9959'

* commit '76729970049fe95659346503f7401a5d869f9959':
  mov: Implement support for multiple sample description tables

Notes:
  * The sc->stsc_data[index].id checks have been moved from the mov_read_stsc
  to mov_read_packet before the value is used in mov_change_extradata to
  not break playback of samples with broken stsc entries (see sample of
  ticket #1918).

  * sc->stsc_index is now checked against sc->stsc_count - 1 before it
  is incremented so it remains lesser than sc->stsc_count. Fixes a crash
  with:

  ./ffmpeg -i matrixbench_mpeg2.mpg -t 1 -frag_duration 200k test.mov
  ./ffprobe -show_packets test.mov

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
3 years agolibavcodec/exr : cosmetics, rename variable in b44_uncompress func
Martin Vignali [Sun, 26 Jun 2016 20:27:37 +0000 (22:27 +0200)]
libavcodec/exr : cosmetics, rename variable in b44_uncompress func

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibvpx: Enable vp9 alpha encoding
Vignesh Venkatasubramanian [Thu, 30 Jun 2016 23:16:31 +0000 (16:16 -0700)]
libvpx: Enable vp9 alpha encoding

Chrome canary now supports decoding of VP9 streams with alpha
channel [1]. Add support to ffmpeg for creating such files.

[1] https://codereview.chromium.org/2096813002/

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
3 years agoaf_hdcd: don't log full HDCD stats if HDCD was not detected
Burt P [Tue, 12 Jul 2016 17:54:09 +0000 (12:54 -0500)]
af_hdcd: don't log full HDCD stats if HDCD was not detected

Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoaf_hdcd: integrate() renamed hdcd_integrate() to be consistent with the other functio...
Burt P [Tue, 12 Jul 2016 17:54:06 +0000 (12:54 -0500)]
af_hdcd: integrate() renamed hdcd_integrate() to be consistent with the other function names

Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/dirac_vlc: Fix avutil.h include
Michael Niedermayer [Tue, 12 Jul 2016 11:53:08 +0000 (13:53 +0200)]
avcodec/dirac_vlc: Fix avutil.h include

Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/oggenc: always use the time base stored in the theora header
James Almer [Tue, 12 Jul 2016 01:09:34 +0000 (22:09 -0300)]
avformat/oggenc: always use the time base stored in the theora header

Fixes ticket #5704

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/dirac_vlc: Fix mixed declaration and statements
Michael Niedermayer [Tue, 12 Jul 2016 10:48:54 +0000 (12:48 +0200)]
avcodec/dirac_vlc: Fix mixed declaration and statements

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodiracdec: fix #coeffs -> byte conversion
Rostislav Pehlivanov [Tue, 12 Jul 2016 09:44:24 +0000 (10:44 +0100)]
diracdec: fix #coeffs -> byte conversion

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agodiracdsp_init: add missing ARCH_X86_64 check
Rostislav Pehlivanov [Mon, 11 Jul 2016 23:39:12 +0000 (00:39 +0100)]
diracdsp_init: add missing ARCH_X86_64 check

That SIMD is still x86_64 only for now.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agodiracdec: do not memset the entire coefficient buffer for HQ pictures
Rostislav Pehlivanov [Thu, 23 Jun 2016 17:07:04 +0000 (18:07 +0100)]
diracdec: do not memset the entire coefficient buffer for HQ pictures

This is now handled by the slice decoding function.

Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv>
3 years agodiracdec: do not allocate and free slice parameters every frame
Rostislav Pehlivanov [Thu, 23 Jun 2016 17:07:02 +0000 (18:07 +0100)]
diracdec: do not allocate and free slice parameters every frame

Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv>
3 years agodiracdec: implement a LUT-based Golomb code parser
Rostislav Pehlivanov [Thu, 23 Jun 2016 17:07:01 +0000 (18:07 +0100)]
diracdec: implement a LUT-based Golomb code parser

Still much left to optimize, but it provides a significant performance
improvement - 10% for 300Mbps (1080p30), 25% for 1.5Gbps (4k 60fps) in
comparison with the default implementation.

Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv>
3 years agodiracdec: rewrite HQ slice decoding
Rostislav Pehlivanov [Thu, 23 Jun 2016 17:07:00 +0000 (18:07 +0100)]
diracdec: rewrite HQ slice decoding

Now coefficients are written to a buffer and are then dequantized by the
new SIMD dequantization functions. For the lower bands without enough
coefficients to fill a register (and hence they overwrite) the C version
of the dequantization function is used.

The buffer is per-thread and will be realloc'd if anything changes.
This prevents regressions and having to limit slice size.

Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv>
3 years agodiractab: expose the maximum quantization index as a macro
Rostislav Pehlivanov [Thu, 23 Jun 2016 17:06:59 +0000 (18:06 +0100)]
diractab: expose the maximum quantization index as a macro

Prevents having to have random magic values in the decoder and a
separate macro in the encoder.

Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv>
3 years agodiracdec: decode HQ profile slices in rows
Rostislav Pehlivanov [Thu, 23 Jun 2016 17:06:58 +0000 (18:06 +0100)]
diracdec: decode HQ profile slices in rows

Siginificantly improves the performance.

Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv>
3 years agodiracdec: simplify golomb parsing and dequantization
Rostislav Pehlivanov [Thu, 23 Jun 2016 17:06:57 +0000 (18:06 +0100)]
diracdec: simplify golomb parsing and dequantization

In preparation for the following commits, this commit simplifies the
coefficient parsing and dequantization function. It was needlessly
inlined without much performance gain.

Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv>
3 years agodiracdsp: add SIMD for the 10 bit version of put_signed_rect_clamped
Rostislav Pehlivanov [Thu, 23 Jun 2016 17:06:55 +0000 (18:06 +0100)]
diracdsp: add SIMD for the 10 bit version of put_signed_rect_clamped

Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv>
3 years agodiracdsp: add dequantization SIMD
Rostislav Pehlivanov [Thu, 23 Jun 2016 17:06:56 +0000 (18:06 +0100)]
diracdsp: add dequantization SIMD

Currently unused, to be used in the following commits.

Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv>
3 years agolavc/Makefile: Fix standalone compilation of the lame encoder.
Carl Eugen Hoyos [Mon, 11 Jul 2016 21:21:19 +0000 (23:21 +0200)]
lavc/Makefile: Fix standalone compilation of the lame encoder.

Also fix a possible issue with the mpegaudio audiotoolbox decoders.
Fixes ticket #5703.

3 years agoavformat/oggenc: make flac the default for oga muxer
James Almer [Wed, 6 Jul 2016 17:14:39 +0000 (14:14 -0300)]
avformat/oggenc: make flac the default for oga muxer

This allows simpler selection of flac in ogg from the command line,
while following the RFC 5334 recommendation[1] for the oga extension.

[1] https://tools.ietf.org/html/rfc5334#section-10.3

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoRevert "PPC64: Add versions of functions in libswscale/input.c optimized for POWER8...
Ronald S. Bultje [Mon, 11 Jul 2016 14:03:41 +0000 (10:03 -0400)]
Revert "PPC64: Add versions of functions in libswscale/input.c optimized for POWER8 VSX SIMD."

This reverts commit 1df908f33f658979b32599489ca6f1a39821013c. The expected
performance improvements are essentially non-existent.

3 years agovp9: add 16x16 idct avx2 (8-bit).
Ronald S. Bultje [Fri, 8 Jul 2016 21:51:56 +0000 (17:51 -0400)]
vp9: add 16x16 idct avx2 (8-bit).

checkasm --bench, 10k runs, for *_add_${bpc}_${sub_idct}_${opt}, shows
that it's about 1.65x as fast as the AVX version for the full IDCT, and
similar speedups for the sub-IDCTs:

nop: 24.6
vp9_inv_dct_dct_16x16_add_8_1_c: 6444.8
vp9_inv_dct_dct_16x16_add_8_1_sse2: 638.6
vp9_inv_dct_dct_16x16_add_8_1_ssse3: 484.4
vp9_inv_dct_dct_16x16_add_8_1_avx: 661.2
vp9_inv_dct_dct_16x16_add_8_1_avx2: 311.5
vp9_inv_dct_dct_16x16_add_8_2_c: 6665.7
vp9_inv_dct_dct_16x16_add_8_2_sse2: 646.9
vp9_inv_dct_dct_16x16_add_8_2_ssse3: 455.2
vp9_inv_dct_dct_16x16_add_8_2_avx: 521.9
vp9_inv_dct_dct_16x16_add_8_2_avx2: 304.3
vp9_inv_dct_dct_16x16_add_8_4_c: 7022.7
vp9_inv_dct_dct_16x16_add_8_4_sse2: 647.4
vp9_inv_dct_dct_16x16_add_8_4_ssse3: 467.1
vp9_inv_dct_dct_16x16_add_8_4_avx: 446.1
vp9_inv_dct_dct_16x16_add_8_4_avx2: 297.0
vp9_inv_dct_dct_16x16_add_8_8_c: 6800.4
vp9_inv_dct_dct_16x16_add_8_8_sse2: 598.6
vp9_inv_dct_dct_16x16_add_8_8_ssse3: 465.7
vp9_inv_dct_dct_16x16_add_8_8_avx: 440.9
vp9_inv_dct_dct_16x16_add_8_8_avx2: 290.2
vp9_inv_dct_dct_16x16_add_8_16_c: 6626.6
vp9_inv_dct_dct_16x16_add_8_16_sse2: 599.5
vp9_inv_dct_dct_16x16_add_8_16_ssse3: 475.0
vp9_inv_dct_dct_16x16_add_8_16_avx: 469.9
vp9_inv_dct_dct_16x16_add_8_16_avx2: 286.4

3 years agoavcodec/iff: Check that there are enough bytes in dgb before reading
Michael Niedermayer [Mon, 11 Jul 2016 12:48:03 +0000 (14:48 +0200)]
avcodec/iff: Check that there are enough bytes in dgb before reading

Fixes CID1361959

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/iff: remove useless ()
Michael Niedermayer [Mon, 11 Jul 2016 12:44:27 +0000 (14:44 +0200)]
avcodec/iff: remove useless ()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/mediacodecdec_h264: Fix occured typo
Michael Niedermayer [Mon, 11 Jul 2016 11:00:04 +0000 (13:00 +0200)]
avcodec/mediacodecdec_h264: Fix occured typo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/muxers: Fix Thisimproves typo
Michael Niedermayer [Mon, 11 Jul 2016 10:55:09 +0000 (12:55 +0200)]
doc/muxers: Fix Thisimproves typo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoadd split_by_time flag for support splite mpegts segment at non-keyframe
Steven Liu [Wed, 6 Jul 2016 22:51:20 +0000 (06:51 +0800)]
add split_by_time flag for support splite mpegts segment at non-keyframe

support split hls segment at duration set by hls_time

Signed-off-by: LiuQi <liuqi@gosun.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>