OSDN Git Service

android-x86/external-ffmpeg.git
8 years agoMerge commit '9f4d99138df434a73b097c997fb4cafc65f4ff54'
Derek Buitenhuis [Sat, 7 May 2016 20:23:46 +0000 (21:23 +0100)]
Merge commit '9f4d99138df434a73b097c997fb4cafc65f4ff54'

* commit '9f4d99138df434a73b097c997fb4cafc65f4ff54':
  fate: Add test for WMV2 with jframes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoh265_parse: skip zero sized NAL units
Hendrik Leppkes [Sat, 7 May 2016 14:28:39 +0000 (16:28 +0200)]
h265_parse: skip zero sized NAL units

Avoids extra error checks later on and/or invalid reads.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoh264: do not return an error when NAL parsing of extradata failed
Hendrik Leppkes [Sat, 7 May 2016 11:28:31 +0000 (13:28 +0200)]
h264: do not return an error when NAL parsing of extradata failed

Fixes AnnexB samples with broken extradata, but proper in-band parameter sets

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoMerge commit 'ca2f19b9cc37be509d85f05c8f902860475905f8'
Hendrik Leppkes [Sat, 7 May 2016 08:31:13 +0000 (10:31 +0200)]
Merge commit 'ca2f19b9cc37be509d85f05c8f902860475905f8'

* commit 'ca2f19b9cc37be509d85f05c8f902860475905f8':
  h264: switch to h2645_parse for NAL parsing

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoh2645_parse: allow partial escaping
Hendrik Leppkes [Fri, 6 May 2016 14:20:13 +0000 (16:20 +0200)]
h2645_parse: allow partial escaping

This ports the fix from 033a533 to the new parser module in prepartion
of using it for the h264 decoder.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoh2645_parse: initialize the GetBitContext to the proper size
Hendrik Leppkes [Fri, 6 May 2016 16:31:05 +0000 (18:31 +0200)]
h2645_parse: initialize the GetBitContext to the proper size

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agohevc: fix size condition in ptl parsing
Hendrik Leppkes [Fri, 6 May 2016 17:09:04 +0000 (19:09 +0200)]
hevc: fix size condition in ptl parsing

When only one sublayer is present, no information is coded. Only when at least two
are present, all 8 sublayers are written.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoavformat/tee: Use ref instead copy in write_packet
Jan Sebechlebsky [Sun, 1 May 2016 22:34:46 +0000 (01:34 +0300)]
avformat/tee: Use ref instead copy in write_packet

Replace av_copy_packet and deprecated av_dup_packet by
creating reference using av_packet_ref.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoavformat/tee: Fix TeeSlave.bsfs pointer array size
Jan Sebechlebsky [Tue, 3 May 2016 13:21:20 +0000 (16:21 +0300)]
avformat/tee: Fix TeeSlave.bsfs pointer array size

TeeSlave.bsfs is array of pointers to AVBitStreamFilterContext,
so element size should be really size of a pointer, not size
of TeeSlave structure.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoffplay: force setting alsa buffer size
Marton Balint [Wed, 20 Apr 2016 21:50:38 +0000 (23:50 +0200)]
ffplay: force setting alsa buffer size

Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoriff: add comment for g721,g723 codec tags
compn [Sat, 7 May 2016 10:56:43 +0000 (06:56 -0400)]
riff: add comment for g721,g723 codec tags

Signed-off-by: Piotr Bandurski <ami_stuff@o2.pl>
8 years agoavformat/riff: add M102 FourCC
Piotr Bandurski [Fri, 6 May 2016 20:43:00 +0000 (22:43 +0200)]
avformat/riff: add M102 FourCC

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/m101: simplify 8bit code
Michael Niedermayer [Sat, 7 May 2016 01:43:17 +0000 (03:43 +0200)]
avcodec/m101: simplify 8bit code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/m101: remove unneeded zeroing of priv_data_size
Michael Niedermayer [Sat, 7 May 2016 01:41:03 +0000 (03:41 +0200)]
avcodec/m101: remove unneeded zeroing of priv_data_size

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/m101: Simplify if() condition
Michael Niedermayer [Sat, 7 May 2016 01:38:13 +0000 (03:38 +0200)]
avcodec/m101: Simplify if() condition

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agofate: fix dcadec test dependencies
James Almer [Fri, 6 May 2016 21:52:27 +0000 (18:52 -0300)]
fate: fix dcadec test dependencies

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoconfigure: Only utvideo <= 15.3.0 is supported.
Carl Eugen Hoyos [Fri, 6 May 2016 17:42:35 +0000 (19:42 +0200)]
configure: Only utvideo <= 15.3.0 is supported.

Fixes ticket #5511.

8 years agoavcodec/avcodec: Move AV_CODEC_ID_M101 to the 2nd group of video codecs
Michael Niedermayer [Fri, 6 May 2016 13:52:46 +0000 (15:52 +0200)]
avcodec/avcodec: Move AV_CODEC_ID_M101 to the 2nd group of video codecs

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavformat/riff: add M101
Michael Niedermayer [Thu, 5 May 2016 16:49:37 +0000 (18:49 +0200)]
avformat/riff: add M101

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec: add M101 decoder
Michael Niedermayer [Thu, 5 May 2016 16:09:24 +0000 (18:09 +0200)]
avcodec: add M101 decoder

Fixes Ticket 2611

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/nvenc: don't set profile in lossless mode
Timo Rothenpieler [Thu, 5 May 2016 16:05:05 +0000 (18:05 +0200)]
avcodec/nvenc: don't set profile in lossless mode

8 years agoavcodec/dcadsp: use LOCAL_ALIGNED_32 instead of LOCAL_ALIGNED(32, ...)
James Almer [Fri, 6 May 2016 03:47:55 +0000 (00:47 -0300)]
avcodec/dcadsp: use LOCAL_ALIGNED_32 instead of LOCAL_ALIGNED(32, ...)

8 years agoavcodec: Add "sar" alias to "aspect" option of video encoders
Andrey Utkin [Thu, 5 May 2016 12:37:49 +0000 (15:37 +0300)]
avcodec: Add "sar" alias to "aspect" option of video encoders

It is impossible to pass "aspect" parameter to encoder from ffmpeg CLI
because option from lavc/options_table.h is eclipsed by option with same
name in ffmpeg_opt.c, which has different meaning (DAR, not SAR).

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavfilter/graphparser: add '\r' as whitespace
Muhammad Faiz [Fri, 6 May 2016 00:37:12 +0000 (07:37 +0700)]
avfilter/graphparser: add '\r' as whitespace

for compatibility with platforms that treat it
as newline

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
8 years agoavutil/parsing: add '\r' as whitespace
Muhammad Faiz [Fri, 6 May 2016 00:35:45 +0000 (07:35 +0700)]
avutil/parsing: add '\r' as whitespace

for compatibility with platforms that treat it
as newline

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
8 years agovc2enc: prevent random data
Christophe Gisquet [Thu, 5 May 2016 09:06:08 +0000 (11:06 +0200)]
vc2enc: prevent random data

The slice prefix is 0 in the reference encoder and the decoder ignores it.
Writing 0 there seems like the best temporary solution.

The padding could have contained uninitialized data, but reference VC2
encoders put 0xFF there, hence the memset value.

Overall this allows producing bistreams with no random data for use by fate.

8 years agofate: Add test for vorbis encoder
Petru Rares Sincraian [Thu, 5 May 2016 16:56:38 +0000 (18:56 +0200)]
fate: Add test for vorbis encoder

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/alac: fix 20-bit support
Paul B Mahol [Thu, 5 May 2016 16:13:28 +0000 (18:13 +0200)]
avcodec/alac: fix 20-bit support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavd/avfoundation: use AVCodecParameters
Rick Kern [Thu, 5 May 2016 13:08:02 +0000 (09:08 -0400)]
lavd/avfoundation: use AVCodecParameters

Fixes "Could not find codec parameters for stream" error (#5494)

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agoavfilter/vf_waveform: fix order of graticule scale items
Paul B Mahol [Thu, 5 May 2016 08:34:13 +0000 (10:34 +0200)]
avfilter/vf_waveform: fix order of graticule scale items

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavfilter/avf_showcqt: add .
Muhammad Faiz [Thu, 5 May 2016 07:03:32 +0000 (14:03 +0700)]
avfilter/avf_showcqt: add .

8 years agofate: Add test for broken SPS (Ticket 2580)
Michael Niedermayer [Tue, 3 May 2016 14:30:03 +0000 (16:30 +0200)]
fate: Add test for broken SPS (Ticket 2580)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agovc2enc: do not print the lavc version if the bitexact flag is enabled
Rostislav Pehlivanov [Wed, 4 May 2016 23:18:03 +0000 (00:18 +0100)]
vc2enc: do not print the lavc version if the bitexact flag is enabled

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
8 years agoavformat/dtsdec: reduce the scope of crctab
James Almer [Wed, 4 May 2016 22:23:23 +0000 (19:23 -0300)]
avformat/dtsdec: reduce the scope of crctab

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoavformat/dtsdec: detect core-less streams
foo86 [Tue, 3 May 2016 13:06:41 +0000 (16:06 +0300)]
avformat/dtsdec: detect core-less streams

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoavformat/mpegtsenc: fix usage of AVStream.codec
James Almer [Wed, 4 May 2016 21:39:27 +0000 (18:39 -0300)]
avformat/mpegtsenc: fix usage of AVStream.codec

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoavcodec/hevc_parser: fix packet_split function name
James Almer [Wed, 4 May 2016 21:26:06 +0000 (18:26 -0300)]
avcodec/hevc_parser: fix packet_split function name

Fixes compilation of hevc_parser without hevc_decoder

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoavformat/h264dec: Avoid get_ue_golomb_31( ) due to ff_ prefixed table from golomb.c
Michael Niedermayer [Wed, 4 May 2016 20:43:01 +0000 (22:43 +0200)]
avformat/h264dec: Avoid get_ue_golomb_31( ) due to ff_ prefixed table from golomb.c

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavformat/utils: Do not detect video codecs when audio is expected
Michael Niedermayer [Wed, 4 May 2016 19:31:18 +0000 (21:31 +0200)]
avformat/utils: Do not detect video codecs when audio is expected

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavformat/h264dec: Check pps_id/sps_id fields from parameter sets
Michael Niedermayer [Wed, 4 May 2016 19:20:15 +0000 (21:20 +0200)]
avformat/h264dec: Check pps_id/sps_id fields from parameter sets

Fixes a misdetection in wav.detected.as.h264.error.wav

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agolavc/videotoolboxenc: Set colorimetry values
Rick Kern [Wed, 27 Apr 2016 14:53:15 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Set colorimetry values

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agolavc/videotoolboxenc: Support pixel aspect ratio
Rick Kern [Wed, 27 Apr 2016 14:53:14 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Support pixel aspect ratio

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agolavc/videotoolboxenc: Support for forced I-frames
Rick Kern [Wed, 27 Apr 2016 14:53:13 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Support for forced I-frames

Setting AVFrame.pic_type to AV_PICTURE_TYPE_I will force an I-frame.

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agolavc/videotoolboxenc: add concatentation properties
Rick Kern [Wed, 27 Apr 2016 14:53:12 +0000 (10:53 -0400)]
lavc/videotoolboxenc: add concatentation properties

Add frames_before and frames_after as hints that there will be frames before
or after the frames produced in this session. This may help with
concatenation issues like bit rate spikes.

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agolavc/videotoolboxenc: Add realtime encoding property
Rick Kern [Wed, 27 Apr 2016 14:53:11 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Add realtime encoding property

Hint to the encoder that encoding should be done in real-time, even at the
expense of quality.

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agolavc/videotoolboxenc: Handle out-of-memory and fix memory leak
Rick Kern [Wed, 27 Apr 2016 14:53:10 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Handle out-of-memory and fix memory leak

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agolavc/videotoolboxenc: Fix DTS
Rick Kern [Wed, 27 Apr 2016 14:53:09 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Fix DTS

Some devices output an invalid DTS when B-frames aren't used. Using PTS for
the DTS in this case.

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agolavc/videotoolboxenc: Fix AVCodecContext.has_b_frames usage.
Rick Kern [Wed, 27 Apr 2016 14:53:08 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Fix AVCodecContext.has_b_frames usage.

Now set by the encoder, not used as an input parameter.

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agolavc/videotoolboxenc: Add entropy setting
Rick Kern [Wed, 27 Apr 2016 14:53:07 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Add entropy setting

Add an entropy setting to choose between CAVLC and CABAC.

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agolavc/videotoolboxenc: Require hardware encoding
Rick Kern [Wed, 27 Apr 2016 14:53:06 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Require hardware encoding

Software encoding can be allowed by setting allow_sw to 1.

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agolavc/videotoolboxenc: Handle hwaccel format as input
Rick Kern [Wed, 27 Apr 2016 14:53:05 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Handle hwaccel format as input

Handle AV_PIX_FMT_VIDEOTOOLBOX.
This results in better energy usage and faster encoding, especially on iOS.
When the buffer comes from the media server, no memcpy's are needed.

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agolavc/videotoolboxenc: Use shared pixel buffer pool
Rick Kern [Wed, 27 Apr 2016 14:53:04 +0000 (10:53 -0400)]
lavc/videotoolboxenc: Use shared pixel buffer pool

This reduces the chance of a memcpy in the media server.

Signed-off-by: Rick Kern <kernrj@gmail.com>
8 years agoavcodec/adpcm: fix decoding of stereo non 4-bit ADPCM IMA WAV
Paul B Mahol [Wed, 4 May 2016 09:33:34 +0000 (11:33 +0200)]
avcodec/adpcm: fix decoding of stereo non 4-bit ADPCM IMA WAV

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavcodec/adpcm: replace char/short/long with int8_t/int16_t/int
Paul B Mahol [Tue, 3 May 2016 22:33:48 +0000 (00:33 +0200)]
avcodec/adpcm: replace char/short/long with int8_t/int16_t/int

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavcodec/dca: convert to AVCRC
foo86 [Tue, 3 May 2016 00:42:36 +0000 (03:42 +0300)]
avcodec/dca: convert to AVCRC

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agolavf/mpegtsenc: Define service_type "HEVC digital television service".
smallishzulu [Tue, 3 May 2016 12:25:22 +0000 (14:25 +0200)]
lavf/mpegtsenc: Define service_type "HEVC digital television service".

Fixes ticket #5455.

8 years agortpenc: packetizer for VC-2 HQ RTP payload format (draft v1)
Thomas Volkert [Tue, 3 May 2016 17:07:37 +0000 (19:07 +0200)]
rtpenc: packetizer for VC-2 HQ RTP payload format (draft v1)

8 years agoavcodec/h264: Put the removed SPS handling code back
Michael Niedermayer [Tue, 3 May 2016 13:45:02 +0000 (15:45 +0200)]
avcodec/h264: Put the removed SPS handling code back

reverts one hunk from 7966ddfc0bb7ee87dc2606b7b146701db6f6c717
The new code from 7966ddfc0bb7ee87dc2606b7b146701db6f6c717 only covers extradata based SPS

Fixes: ffplay -ss 13 58af5798-fa2c-42a2-997d-dc8e49de2d8a.flv

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoMerge commit 'a7829a2a3f8e6ec0b9f2673c11f56916800aeb33'
Derek Buitenhuis [Tue, 3 May 2016 12:42:38 +0000 (13:42 +0100)]
Merge commit 'a7829a2a3f8e6ec0b9f2673c11f56916800aeb33'

* commit 'a7829a2a3f8e6ec0b9f2673c11f56916800aeb33':
  h264: reimplement 3aa661ec5 in a more explicit way

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agolavf/mpegtsenc: Fix stream_type for low sample rate MP2/MP3.
Carl Eugen Hoyos [Tue, 3 May 2016 12:15:14 +0000 (14:15 +0200)]
lavf/mpegtsenc: Fix stream_type for low sample rate MP2/MP3.

8 years agoMerge commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe'
Derek Buitenhuis [Tue, 3 May 2016 09:57:36 +0000 (10:57 +0100)]
Merge commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe'

* commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe':
  svq3: drop the build dependency on the h264 decoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoMerge commit 'a4d126dc59c39bb03e5e444432d1b27af26a45b4'
Derek Buitenhuis [Tue, 3 May 2016 09:52:04 +0000 (10:52 +0100)]
Merge commit 'a4d126dc59c39bb03e5e444432d1b27af26a45b4'

* commit 'a4d126dc59c39bb03e5e444432d1b27af26a45b4':
  svq3: eliminate remaining H264Context usage.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoMerge commit '7bbdae81e895a49125dba58bad01b98389966c39'
Derek Buitenhuis [Tue, 3 May 2016 09:27:51 +0000 (10:27 +0100)]
Merge commit '7bbdae81e895a49125dba58bad01b98389966c39'

* commit '7bbdae81e895a49125dba58bad01b98389966c39':
  svq3: move block_offset to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoMerge commit '1848a154a49d18c1f31f54ee75c7445dc49a7ecc'
Derek Buitenhuis [Tue, 3 May 2016 09:26:13 +0000 (10:26 +0100)]
Merge commit '1848a154a49d18c1f31f54ee75c7445dc49a7ecc'

* commit '1848a154a49d18c1f31f54ee75c7445dc49a7ecc':
  svq3: stop using H264Context.gb

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoMerge commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690'
Derek Buitenhuis [Tue, 3 May 2016 09:24:27 +0000 (10:24 +0100)]
Merge commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690'

* commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690':
  svq3: move the frame num variables to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoMerge commit '21b746932241246be846a133abb3c5f91b1cab85'
Derek Buitenhuis [Tue, 3 May 2016 09:23:58 +0000 (10:23 +0100)]
Merge commit '21b746932241246be846a133abb3c5f91b1cab85'

* commit '21b746932241246be846a133abb3c5f91b1cab85':
  svq3: eliminate H264Context.cur_pic usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoMerge commit '939b388383db8d0db5b2ff483e3a197c27b79791'
Derek Buitenhuis [Tue, 3 May 2016 09:23:23 +0000 (10:23 +0100)]
Merge commit '939b388383db8d0db5b2ff483e3a197c27b79791'

* commit '939b388383db8d0db5b2ff483e3a197c27b79791':
  svq3: eliminate remaining H264SliceContext usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoMerge commit '5a5db90edf71ef4c60db8ad7b0ebaa9a810c2d9e'
Derek Buitenhuis [Tue, 3 May 2016 09:17:34 +0000 (10:17 +0100)]
Merge commit '5a5db90edf71ef4c60db8ad7b0ebaa9a810c2d9e'

* commit '5a5db90edf71ef4c60db8ad7b0ebaa9a810c2d9e':
  svq3: move pict_type to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoMerge commit '12f13ecb2dcddfa3ee930167395370d3c6fff90c'
Derek Buitenhuis [Tue, 3 May 2016 09:15:43 +0000 (10:15 +0100)]
Merge commit '12f13ecb2dcddfa3ee930167395370d3c6fff90c'

* commit '12f13ecb2dcddfa3ee930167395370d3c6fff90c':
  svq3: move mb strides/sizes to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoMerge commit 'ad9d3384de08f02967d6eb11196ee8c78e8b2dba'
Derek Buitenhuis [Tue, 3 May 2016 09:15:22 +0000 (10:15 +0100)]
Merge commit 'ad9d3384de08f02967d6eb11196ee8c78e8b2dba'

* commit 'ad9d3384de08f02967d6eb11196ee8c78e8b2dba':
  svq3: move the dequant buffer to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agolavf/mpegts: Add E-AC3 registered stream specifier "EAC3".
Carl Eugen Hoyos [Tue, 3 May 2016 07:59:02 +0000 (09:59 +0200)]
lavf/mpegts: Add E-AC3 registered stream specifier "EAC3".

Related to ticket #5501.

8 years agowmalossless: allow calling madd_int16
Christophe Gisquet [Sun, 1 May 2016 10:34:29 +0000 (12:34 +0200)]
wmalossless: allow calling madd_int16

This is done by actually handling the "prev_values" in the cascaded LMS data
as if it were int16_t, thus requiring switching at various locations the
computations.

8 years agoavformat/riff: add M702
Michael Niedermayer [Mon, 2 May 2016 22:39:55 +0000 (00:39 +0200)]
avformat/riff: add M702

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/error_resilience: Improve missing slice handling for mpeg2
Michael Niedermayer [Mon, 2 May 2016 22:39:34 +0000 (00:39 +0200)]
avcodec/error_resilience: Improve missing slice handling for mpeg2

Fixes: m702_2.avi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/dca: fix sync word search error condition
foo86 [Mon, 2 May 2016 20:44:47 +0000 (23:44 +0300)]
avcodec/dca: fix sync word search error condition

This didn't actually check if sync word was found and always errored out
with "-err_detect explode" option enabled.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/options_table: fix strict compliance constant flags to match the strict field
Michael Niedermayer [Mon, 2 May 2016 20:01:49 +0000 (22:01 +0200)]
avcodec/options_table: fix strict compliance constant flags to match the strict field

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavformat/options_table: Add missing identifier for very strict compliance
Michael Niedermayer [Mon, 2 May 2016 20:00:55 +0000 (22:00 +0200)]
avformat/options_table: Add missing identifier for very strict compliance

Fixes Ticket5443

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agofate: wma: add lossless 24bits tests
Christophe Gisquet [Mon, 18 Apr 2016 10:53:21 +0000 (12:53 +0200)]
fate: wma: add lossless 24bits tests

Should evaluate coefficients and raw pcm tiles.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/mjpegdec: Do not try to detect last scan but apply idct after all scans for...
Michael Niedermayer [Mon, 2 May 2016 10:45:14 +0000 (12:45 +0200)]
avcodec/mjpegdec: Do not try to detect last scan but apply idct after all scans for progressive jpeg

Fixes: IMG-20160418-WA0002.jpg

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/mjpeg2jpeg_bsf: Check ff_bsf_get_packet success
Jan Sebechlebsky [Sun, 1 May 2016 23:51:25 +0000 (02:51 +0300)]
avcodec/mjpeg2jpeg_bsf: Check ff_bsf_get_packet success

This fixes ticket #5487 - mjpeg2jpeg bitstream filter causes
segmentation fault with header-less mjpeg.

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/dca: move channel counter utility into dca.h
foo86 [Sun, 1 May 2016 15:42:14 +0000 (08:42 -0700)]
avcodec/dca: move channel counter utility into dca.h

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoavcodec/dca: move huffman data into separate object file
foo86 [Sun, 1 May 2016 15:41:43 +0000 (08:41 -0700)]
avcodec/dca: move huffman data into separate object file

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoavcodec/noise_bsf: set correct size of .priv_data_size field
Paul B Mahol [Sun, 1 May 2016 20:23:48 +0000 (22:23 +0200)]
avcodec/noise_bsf: set correct size of .priv_data_size field

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavcodec/wmalosslessdec: Fix memset sizeof
Michael Niedermayer [Sun, 1 May 2016 16:29:02 +0000 (18:29 +0200)]
avcodec/wmalosslessdec: Fix memset sizeof

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/smc: Mark pixel pointer as const
Michael Niedermayer [Sun, 1 May 2016 12:33:20 +0000 (14:33 +0200)]
avcodec/smc: Mark pixel pointer as const

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavformat/wsddec: set bit_rate, fixes duration estimation
Paul B Mahol [Sun, 1 May 2016 14:21:56 +0000 (16:21 +0200)]
avformat/wsddec: set bit_rate, fixes duration estimation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavformat/dsfdec: set bit_rate, fixes duration estimation
Paul B Mahol [Sun, 1 May 2016 14:16:39 +0000 (16:16 +0200)]
avformat/dsfdec: set bit_rate, fixes duration estimation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavf/mpegts: Return small probe score for very short transport streams.
Carl Eugen Hoyos [Sun, 1 May 2016 13:39:13 +0000 (15:39 +0200)]
lavf/mpegts: Return small probe score for very short transport streams.

Fixes Debian bug 823098.

8 years agolavc/fic: Do not warn about empty cursor.
Carl Eugen Hoyos [Sun, 1 May 2016 13:30:22 +0000 (15:30 +0200)]
lavc/fic: Do not warn about empty cursor.

Fixes ticket #5174.

8 years agolavc/fic: Be less verbose for invisible cursor outside of video.
Carl Eugen Hoyos [Sun, 1 May 2016 13:27:51 +0000 (15:27 +0200)]
lavc/fic: Be less verbose for invisible cursor outside of video.

8 years agolavc/srtenc: do not emit any subrip tags with text codec
Clément Bœsch [Sun, 1 May 2016 13:16:34 +0000 (15:16 +0200)]
lavc/srtenc: do not emit any subrip tags with text codec

Fixes presence of opening tags when running
  ffmpeg -i x.ass -c text x.srt

Reported-by: Jean First <jeanfirst@gmail.com>
8 years agolavc: override decode return value only in case of error
Clément Bœsch [Sun, 1 May 2016 12:53:53 +0000 (14:53 +0200)]
lavc: override decode return value only in case of error

Fixes Ticket #5350

Regression since 29412821241050c846dbceaad4b9752857659977.

8 years agoavcodec/wmalosslessdec: silence a sample request
Christophe Gisquet [Sun, 1 May 2016 09:18:09 +0000 (11:18 +0200)]
avcodec/wmalosslessdec: silence a sample request

16bits samples with CDLMS orders of 8 are currently unsupported, but have never
been encountered before.

However, 8 seems to be the most frequent, if not the only order used for 24bits.
In that case, the dsp functions are fine with handling order that are multiples
of 8, so silence the warning.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavcodec/wmalosslessdec: fix type for coeffs and lms_updates in cdlms struct
Paul B Mahol [Sun, 1 May 2016 08:46:20 +0000 (10:46 +0200)]
avcodec/wmalosslessdec: fix type for coeffs and lms_updates in cdlms struct

They should really be int16_t.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavcodec/dcaenc: move channel reordering tables to dcaenc.h
foo86 [Wed, 27 Apr 2016 17:20:20 +0000 (10:20 -0700)]
avcodec/dcaenc: move channel reordering tables to dcaenc.h

DCA core decoder no longer uses fixed tables for channel reordering.
Move them into private encoder header (and drop ff_dca_ prefix).

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoavcodec/dcaenc: reuse shared quant levels table
foo86 [Wed, 27 Apr 2016 17:19:54 +0000 (10:19 -0700)]
avcodec/dcaenc: reuse shared quant levels table

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoavformat/riff: add m704
Michael Niedermayer [Sat, 30 Apr 2016 23:26:27 +0000 (01:26 +0200)]
avformat/riff: add m704

(Ticket 2616)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/mpeg12dec: Print position in end mismatch error
Michael Niedermayer [Sat, 30 Apr 2016 23:26:03 +0000 (01:26 +0200)]
avcodec/mpeg12dec: Print position in end mismatch error

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/mpeg12dec: Do not choke on extra m704 alpha data
Michael Niedermayer [Sat, 30 Apr 2016 23:25:20 +0000 (01:25 +0200)]
avcodec/mpeg12dec: Do not choke on extra m704 alpha data

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/wmalosslessdec: fix decoding of raw pcm tiles
Paul B Mahol [Sat, 30 Apr 2016 17:48:57 +0000 (19:48 +0200)]
avcodec/wmalosslessdec: fix decoding of raw pcm tiles

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