ffmpeg.git
3 years agolavc/hevc: rudimentary support for skip_loop_filter.
Nicolas George [Thu, 23 Jul 2015 10:10:14 +0000 (12:10 +0200)]
lavc/hevc: rudimentary support for skip_loop_filter.

+~9% speed on Core i5 on test sample.

All frames are treated as ref frames, skipping only applies
at level "all". The following mail contains information on
how to improve that:
http://ffmpeg.org/pipermail/ffmpeg-devel/2015-July/176116.html

3 years agoavcodec/hevc_parse: Print the name of the NAL units in addition to the numerical...
Michael Niedermayer [Thu, 23 Jul 2015 13:56:07 +0000 (15:56 +0200)]
avcodec/hevc_parse: Print the name of the NAL units in addition to the numerical nal_unit_type in the debug output

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '7f388c0fabc51eca3106e7cc443393269435ab52'
Michael Niedermayer [Thu, 23 Jul 2015 10:44:56 +0000 (12:44 +0200)]
Merge commit '7f388c0fabc51eca3106e7cc443393269435ab52'

* commit '7f388c0fabc51eca3106e7cc443393269435ab52':
  asfdec: remove the wrong condition

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'ae5a8dca675ee544178225256893e679b750cb63'
Michael Niedermayer [Thu, 23 Jul 2015 10:35:10 +0000 (12:35 +0200)]
Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'

* commit 'ae5a8dca675ee544178225256893e679b750cb63':
  hap: Fix slice size computation

Conflicts:
libavcodec/hapdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360'
Michael Niedermayer [Thu, 23 Jul 2015 10:20:48 +0000 (12:20 +0200)]
Merge commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360'

* commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360':
  dds: Fix the slice size computation

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4'
Michael Niedermayer [Thu, 23 Jul 2015 09:56:26 +0000 (11:56 +0200)]
Merge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4'

* commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4':
  af_channelmap: properly set the supported output channel layouts

Conflicts:
libavfilter/af_channelmap.c

See: 39867f3e098ab304cd3bef0ace19d73617cdb817
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'
Michael Niedermayer [Thu, 23 Jul 2015 09:43:49 +0000 (11:43 +0200)]
Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'

* commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6':
  asfdec: increment nb_streams right after the stream allocation

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff'
Michael Niedermayer [Thu, 23 Jul 2015 09:34:36 +0000 (11:34 +0200)]
Merge commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff'

* commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff':
  asfdec: set nb_streams to 0 in the asf_read_close

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoasfdec: remove the wrong condition
Alexandra Hájková [Wed, 22 Jul 2015 14:10:25 +0000 (16:10 +0200)]
asfdec: remove the wrong condition

this condition breaks reading from the pipe as data_reached variable
have to be set to break while in the asf_read_header just after the Data
Object is found

Signed-off-by: Anton Khirnov <anton@khirnov.net>
3 years agohap: Fix slice size computation
Tom Butterworth [Wed, 22 Jul 2015 23:01:01 +0000 (00:01 +0100)]
hap: Fix slice size computation

A bug was introduced in 977105407cae55876041dddbf4ce0934cdd4cd6c whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
3 years agodds: Fix the slice size computation
Tom Butterworth [Wed, 22 Jul 2015 23:03:29 +0000 (00:03 +0100)]
dds: Fix the slice size computation

A bug was introduced in 6b2b26e7af3ede0abfb46eb5725c26d1083f50bc whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
3 years agoaf_channelmap: properly set the supported output channel layouts
Anton Khirnov [Wed, 22 Jul 2015 09:30:37 +0000 (11:30 +0200)]
af_channelmap: properly set the supported output channel layouts

The current code expects query_formats() to be called exactly once, it
will leak if it's not called at all (filter initialized, but never
configured or used) or try to read freed memory if it's called more than
once.

Found-by: James Almer <jamrial@gmail.com>
CC: libav-stable@libav.org
3 years agoasfdec: increment nb_streams right after the stream allocation
Alexandra Hájková [Thu, 23 Jul 2015 06:59:53 +0000 (08:59 +0200)]
asfdec: increment nb_streams right after the stream allocation

to prevent possible memory leaks

Signed-off-by: Anton Khirnov <anton@khirnov.net>
3 years agoasfdec: set nb_streams to 0 in the asf_read_close
Alexandra Hájková [Wed, 22 Jul 2015 19:38:15 +0000 (21:38 +0200)]
asfdec: set nb_streams to 0 in the asf_read_close

Signed-off-by: Anton Khirnov <anton@khirnov.net>
3 years agoavutil/softfloat: move av_sincos_sf() back to header
James Almer [Thu, 23 Jul 2015 01:10:50 +0000 (22:10 -0300)]
avutil/softfloat: move av_sincos_sf() back to header

Fixes compilation of host tool aacps_fixed_tablegen

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agolibavcodec/qsvdec_h264.c: SPS parsing is now performed by MFXVideoDECODE_DecodeHeader...
Ivan Uskov [Mon, 20 Jul 2015 15:07:34 +0000 (11:07 -0400)]
libavcodec/qsvdec_h264.c: SPS parsing is now performed by MFXVideoDECODE_DecodeHeader() in libavcodec/qsvdec.c

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotests/checkasm/h264pred: Use LOCAL_ALIGNED_16()
Michael Niedermayer [Wed, 22 Jul 2015 22:35:18 +0000 (00:35 +0200)]
tests/checkasm/h264pred: Use LOCAL_ALIGNED_16()

Fixes alignment issue and bus errors

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotests/checkasm/h264qpel: Use LOCAL_ALIGNED_16()
Michael Niedermayer [Wed, 22 Jul 2015 22:35:18 +0000 (00:35 +0200)]
tests/checkasm/h264qpel: Use LOCAL_ALIGNED_16()

Fixes alignment issue and bus errors

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoEdit documentation and versioning for the fixed point AAC decoder
Jovan Zelincevic [Mon, 20 Jul 2015 11:36:22 +0000 (13:36 +0200)]
Edit documentation and versioning for the fixed point AAC decoder

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: Minor macro polishing
Nedeljko Babic [Mon, 20 Jul 2015 11:36:20 +0000 (13:36 +0200)]
avcodec: Minor macro polishing

Use macros from aac_defines.h for adding suffixes
 instead of local macros.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: Make ffprobe tests depend on avdevice
Michael Niedermayer [Wed, 22 Jul 2015 17:25:26 +0000 (19:25 +0200)]
fate: Make ffprobe tests depend on avdevice

The test file they use needs avdevice to be created

Probably fixes Ticket 4455

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotests: Add aac_fixed decoder test
Nedeljko Babic [Mon, 20 Jul 2015 11:36:21 +0000 (13:36 +0200)]
tests: Add aac_fixed decoder test

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: Implementation of AAC_fixed_decoder (PS-module)
Djordje Pesut [Mon, 20 Jul 2015 11:36:19 +0000 (13:36 +0200)]
avcodec: Implementation of AAC_fixed_decoder (PS-module)

Add fixed point implementation.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: Table creation for AAC_fixed_decoder (PS-module)
Jovan Zelincevic [Mon, 20 Jul 2015 11:36:18 +0000 (13:36 +0200)]
avcodec: Table creation for AAC_fixed_decoder (PS-module)

Add fixed point implementation of functions for generating tables.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: remove unused sd variables
Michael Niedermayer [Wed, 22 Jul 2015 19:01:56 +0000 (21:01 +0200)]
avcodec: remove unused sd variables

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/dump: Also print pict_type in dump_sidedata() for AV_PKT_DATA_QUALITY_STATS
Michael Niedermayer [Wed, 22 Jul 2015 19:01:00 +0000 (21:01 +0200)]
avformat/dump: Also print pict_type in dump_sidedata() for AV_PKT_DATA_QUALITY_STATS

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/libx264: Export choosen pict_type
Michael Niedermayer [Wed, 22 Jul 2015 18:49:01 +0000 (20:49 +0200)]
avcodec/libx264: Export choosen pict_type

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/dnxhdenc: Set pict type for AV_PKT_DATA_QUALITY_STATS correctly
Michael Niedermayer [Wed, 22 Jul 2015 18:46:52 +0000 (20:46 +0200)]
avcodec/dnxhdenc: Set pict type for AV_PKT_DATA_QUALITY_STATS correctly

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/libxavs: Export pict_type in side data
Michael Niedermayer [Wed, 22 Jul 2015 17:52:04 +0000 (19:52 +0200)]
avcodec/libxavs: Export pict_type in side data

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoReplace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATS
Michael Niedermayer [Tue, 21 Jul 2015 11:23:29 +0000 (13:23 +0200)]
Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATS

The stats are a superset of the quality factor, also allowing the picture type and encoder "PSNR" stats to be exported
This also replaces the native by fixed little endian order for the affected side data

AV_PKT_DATA_QUALITY_FACTOR is left as a synonym of AV_PKT_DATA_QUALITY_STATS

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoapng: Fix decoding images with the PREVIOUS dispose op
Donny Yang [Sun, 19 Jul 2015 02:43:20 +0000 (02:43 +0000)]
apng: Fix decoding images with the PREVIOUS dispose op

3 years agoMerge commit '21c90d86d27c2143354c7d782050a779b0986eb1'
Michael Niedermayer [Wed, 22 Jul 2015 16:07:43 +0000 (18:07 +0200)]
Merge commit '21c90d86d27c2143354c7d782050a779b0986eb1'

* commit '21c90d86d27c2143354c7d782050a779b0986eb1':
  mpegvideo: Add missing include

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'a16854892c3af945d3ab0015699a0c9884f0a89a'
Michael Niedermayer [Wed, 22 Jul 2015 15:39:41 +0000 (17:39 +0200)]
Merge commit 'a16854892c3af945d3ab0015699a0c9884f0a89a'

* commit 'a16854892c3af945d3ab0015699a0c9884f0a89a':
  dds: Add a rgba fate test

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter: add deband filter
Paul B Mahol [Fri, 10 Jul 2015 16:16:53 +0000 (16:16 +0000)]
avfilter: add deband filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoMerge commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221'
Michael Niedermayer [Wed, 22 Jul 2015 15:29:34 +0000 (17:29 +0200)]
Merge commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221'

* commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221':
  dds: Fix 32bpp bitmaps decoding

Conflicts:
libavcodec/dds.c

See: 5c583b141980102530c75d2756b06766742532a1
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c'
Michael Niedermayer [Wed, 22 Jul 2015 15:26:37 +0000 (17:26 +0200)]
Merge commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c'

* commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c':
  dds: Fix palette decoding

Conflicts:
libavcodec/dds.c

See: 36a87c2dc7f302da3778bd0cff050b5c93a730c7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4'
Michael Niedermayer [Wed, 22 Jul 2015 15:13:38 +0000 (17:13 +0200)]
Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4'

* commit 'ea4d46e72945cba37feb7aa154eb970732f513e4':
  dds: Fix enum declaration

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec'
Michael Niedermayer [Wed, 22 Jul 2015 15:13:15 +0000 (17:13 +0200)]
Merge commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec'

* commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec':
  asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd'
Michael Niedermayer [Wed, 22 Jul 2015 15:06:16 +0000 (17:06 +0200)]
Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd'

* commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd':
  asfdec: close the demuxer properly when read_header is failing

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '5655236a67203d923755f285584c6e68abe7e33f'
Michael Niedermayer [Wed, 22 Jul 2015 14:53:20 +0000 (16:53 +0200)]
Merge commit '5655236a67203d923755f285584c6e68abe7e33f'

* commit '5655236a67203d923755f285584c6e68abe7e33f':
  asfdec: factor out seeking to the Data Object outside while

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'
Michael Niedermayer [Wed, 22 Jul 2015 14:46:01 +0000 (16:46 +0200)]
Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'

* commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c':
  qsvenc_hevc: use the correct HW plugin UID

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'e605bf3b590d295f215fcc9fd58eb11be55b68cb'
Michael Niedermayer [Wed, 22 Jul 2015 14:38:12 +0000 (16:38 +0200)]
Merge commit 'e605bf3b590d295f215fcc9fd58eb11be55b68cb'

* commit 'e605bf3b590d295f215fcc9fd58eb11be55b68cb':
  checkasm: remove empty array initializer list in h264pred test

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'
Michael Niedermayer [Wed, 22 Jul 2015 14:30:29 +0000 (16:30 +0200)]
Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'

* commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5':
  checkasm: Always link statically

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoSupport the Hap chunked frame format
Tom Butterworth [Tue, 21 Jul 2015 00:12:12 +0000 (01:12 +0100)]
Support the Hap chunked frame format

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agompegvideo: Add missing include
Vittorio Giovara [Mon, 20 Jul 2015 17:24:19 +0000 (18:24 +0100)]
mpegvideo: Add missing include

3 years agodds: Add a rgba fate test
Vittorio Giovara [Mon, 20 Jul 2015 22:47:14 +0000 (23:47 +0100)]
dds: Add a rgba fate test

3 years agodds: Fix 32bpp bitmaps decoding
Michael Niedermayer [Mon, 20 Jul 2015 22:47:13 +0000 (23:47 +0100)]
dds: Fix 32bpp bitmaps decoding

Found-By: ami_stuff
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
3 years agodds: Fix palette decoding
Vittorio Giovara [Mon, 20 Jul 2015 22:47:12 +0000 (23:47 +0100)]
dds: Fix palette decoding

Red and blue channels were decoded in the wrong order.

Found-By: ami_stuff
3 years agodds: Fix enum declaration
Vittorio Giovara [Wed, 22 Jul 2015 12:20:07 +0000 (13:20 +0100)]
dds: Fix enum declaration

Drop the global variables with anonymous enum type.

3 years agoavformat/asfdec_f: Parse ECC byte according to spec
Michael Niedermayer [Wed, 22 Jul 2015 11:49:31 +0000 (13:49 +0200)]
avformat/asfdec_f: Parse ECC byte according to spec

This should not change anything as the spec requires specific values
for the fields, which where handled previously.

Ask for samples when these values do not match

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoasfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0
Alexandra Hájková [Tue, 21 Jul 2015 08:45:01 +0000 (10:45 +0200)]
asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0

Signed-off-by: Anton Khirnov <anton@khirnov.net>
3 years agoasfdec: close the demuxer properly when read_header is failing
Alexandra Hájková [Fri, 17 Jul 2015 12:17:02 +0000 (14:17 +0200)]
asfdec: close the demuxer properly when read_header is failing

Signed-off-by: Anton Khirnov <anton@khirnov.net>
3 years agoasfdec: factor out seeking to the Data Object outside while
Alexandra Hájková [Tue, 21 Jul 2015 07:14:39 +0000 (09:14 +0200)]
asfdec: factor out seeking to the Data Object outside while

return INVALIDDARA if Data Object was not found

Signed-off-by: Anton Khirnov <anton@khirnov.net>
3 years agoqsvenc_hevc: use the correct HW plugin UID
Anton Khirnov [Sun, 19 Jul 2015 09:24:36 +0000 (11:24 +0200)]
qsvenc_hevc: use the correct HW plugin UID

3 years agoavcodec: loongson optimize pixblockdsp with mmi
周晓勇 [Wed, 22 Jul 2015 07:10:38 +0000 (15:10 +0800)]
avcodec: loongson optimize pixblockdsp with mmi

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agocheckasm: remove empty array initializer list in h264pred test
Janne Grunau [Mon, 20 Jul 2015 21:17:57 +0000 (23:17 +0200)]
checkasm: remove empty array initializer list in h264pred test

Fixes MSVC compilation.

3 years agoCosmetics: Reindent after last commit.
Carl Eugen Hoyos [Wed, 22 Jul 2015 08:25:10 +0000 (10:25 +0200)]
Cosmetics: Reindent after last commit.

3 years agolavf/mxfdec: Set codec_tag AVup for Avid 1:1 input.
Carl Eugen Hoyos [Wed, 22 Jul 2015 08:23:18 +0000 (10:23 +0200)]
lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input.

3 years agomovtextenc.c: Add support for text highlighting
Niklesh [Mon, 20 Jul 2015 18:32:31 +0000 (00:02 +0530)]
movtextenc.c: Add support for text highlighting

This patch takes care of the secondary color changes in ASS through highlight and hilightcolor boxes.

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
3 years agomovtextenc.c: Reorganize the code for easier maintenance
Niklesh [Mon, 20 Jul 2015 18:27:28 +0000 (23:57 +0530)]
movtextenc.c: Reorganize the code for easier maintenance

This patch reorganizes the code to make it easier to add support for different text modifier boxes and other styles in the future.

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
3 years agoavformat/asfdec_f: Improve packet resync heuristic
Michael Niedermayer [Tue, 21 Jul 2015 22:30:20 +0000 (00:30 +0200)]
avformat/asfdec_f: Improve packet resync heuristic

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/asfdec_f: Do not print errors if packets do not start with ECC
Michael Niedermayer [Tue, 21 Jul 2015 23:09:14 +0000 (01:09 +0200)]
avformat/asfdec_f: Do not print errors if packets do not start with ECC

There is nothing wrong with such packets, the spec allows this

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/asfdec_f: Increase the amount of information provided in cases of errors
Michael Niedermayer [Tue, 21 Jul 2015 22:33:30 +0000 (00:33 +0200)]
avformat/asfdec_f: Increase the amount of information provided in cases of errors

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agocheckasm: Always link statically
Luca Barbato [Tue, 21 Jul 2015 21:22:42 +0000 (23:22 +0200)]
checkasm: Always link statically

Checkasm needs to use internal symbols that should not be made public.

3 years agoAdd support for TEA (Tiny Encryption Algorithm)
Vesselin Bontchev [Sun, 19 Jul 2015 20:25:53 +0000 (22:25 +0200)]
Add support for TEA (Tiny Encryption Algorithm)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/async: rename async_interrupt_callback to async_check_interrupt
Zhang Rui [Tue, 21 Jul 2015 18:47:24 +0000 (02:47 +0800)]
avformat/async: rename async_interrupt_callback to async_check_interrupt

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/async: fix interrupt_callback usage and return code
Zhang Rui [Tue, 21 Jul 2015 18:47:23 +0000 (02:47 +0800)]
avformat/async: fix interrupt_callback usage and return code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc'
Michael Niedermayer [Tue, 21 Jul 2015 18:35:51 +0000 (20:35 +0200)]
Merge commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc'

* commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc':
  dds: Decode using optimal slices sizes

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '977105407cae55876041dddbf4ce0934cdd4cd6c'
Michael Niedermayer [Tue, 21 Jul 2015 18:20:25 +0000 (20:20 +0200)]
Merge commit '977105407cae55876041dddbf4ce0934cdd4cd6c'

* commit '977105407cae55876041dddbf4ce0934cdd4cd6c':
  hap: Decode using optimal slices sizes

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibavfilter/vf_crop: implement process_command
Bernd Bleßmann [Tue, 21 Jul 2015 10:48:33 +0000 (12:48 +0200)]
libavfilter/vf_crop: implement process_command

Signed-off-by: Bernd Bleßmann <bb@it-entwicklung.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibavfilter/vf_scale: implement process_command
Bernd Bleßmann [Tue, 21 Jul 2015 10:45:43 +0000 (12:45 +0200)]
libavfilter/vf_scale: implement process_command

Signed-off-by: Bernd Bleßmann <bb@it-entwicklung.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/utils: silence some deprecation warnings
James Almer [Tue, 21 Jul 2015 03:40:09 +0000 (00:40 -0300)]
avcodec/utils: silence some deprecation warnings

And prevent eventual compilation failures once the relevant functions
and fields are removed.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/options-test: don't alloc avctx->coded_frame
James Almer [Tue, 21 Jul 2015 03:28:57 +0000 (00:28 -0300)]
avcodec/options-test: don't alloc avctx->coded_frame

It's done automatically by avcodec_open2() now.
Fixes memleaks in fate-libavcodec-options.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec: loongson optimize blockdsp with mmi
周晓勇 [Tue, 21 Jul 2015 13:29:11 +0000 (21:29 +0800)]
avcodec: loongson optimize blockdsp with mmi

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/af_channelmap: Move ff_add_channel_layout() call to querry_format()
Michael Niedermayer [Tue, 21 Jul 2015 15:40:38 +0000 (17:40 +0200)]
avfilter/af_channelmap: Move ff_add_channel_layout() call to querry_format()

Avoids memleak if querry_formats is not called

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/async: Add missing else
Michael Niedermayer [Tue, 21 Jul 2015 15:04:11 +0000 (17:04 +0200)]
avformat/async: Add missing else

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'
Michael Niedermayer [Tue, 21 Jul 2015 14:55:39 +0000 (16:55 +0200)]
Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'

* commit '219b39a71a5694b1c14a07b86477f665a5b6849b':
  parseutil: Use non ambiguous aliases for uhd

Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotests/checkasm/Makefile: Fix checkasm with SDL
Michael Niedermayer [Tue, 21 Jul 2015 13:55:05 +0000 (15:55 +0200)]
tests/checkasm/Makefile: Fix checkasm with SDL

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: add test for async protocol
Zhang Rui [Tue, 21 Jul 2015 13:04:03 +0000 (21:04 +0800)]
fate: add test for async protocol

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/hapdec: log reason for failure when texture type doesn't match stream
Tom Butterworth [Tue, 21 Jul 2015 00:12:11 +0000 (01:12 +0100)]
avcodec/hapdec: log reason for failure when texture type doesn't match stream

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: loongson optimize xvid idct with mmi
周晓勇 [Tue, 21 Jul 2015 05:54:55 +0000 (13:54 +0800)]
avcodec: loongson optimize xvid idct with mmi

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: loongson move simple idct functions to a separate file
周晓勇 [Tue, 21 Jul 2015 05:53:44 +0000 (13:53 +0800)]
avcodec: loongson move simple idct functions to a separate file

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoaacenc: move the generation of ff_aac_pow34sf_tab[]
Rostislav Pehlivanov [Fri, 17 Jul 2015 21:20:14 +0000 (22:20 +0100)]
aacenc: move the generation of ff_aac_pow34sf_tab[]

This commit moves the generation of ff_aac_pow34sf_tab[] out of the
encoder and into the table generator. The original commit log for
this table in 2011 actually mentions that it should be moved outside
but this never happened.

This is the first commit which cleans up the encoder a little.

Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodds: Decode using optimal slices sizes
Luca Barbato [Fri, 17 Jul 2015 01:07:08 +0000 (03:07 +0200)]
dds: Decode using optimal slices sizes

Enjoy some cache locality and use less threads.
About the same speedup provided to HAP.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
3 years agohap: Decode using optimal slices sizes
Luca Barbato [Fri, 17 Jul 2015 01:07:07 +0000 (03:07 +0200)]
hap: Decode using optimal slices sizes

Enjoy some cache locality and use less threads.
About 5x speedup (from 60ms to 12ms to decode a 4k frame).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
3 years agoparseutil: Use non ambiguous aliases for uhd
Luca Barbato [Mon, 20 Jul 2015 14:50:43 +0000 (16:50 +0200)]
parseutil: Use non ambiguous aliases for uhd

uhd1 and uhd2 would be ambigous.

3 years agoMAINTAINERS: add myself as a maintainer for async protocol
Zhang Rui [Tue, 21 Jul 2015 07:46:02 +0000 (15:46 +0800)]
MAINTAINERS: add myself as a maintainer for async protocol

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/hapdec: don't log texture format every frame, do it once per decode session
Tom Butterworth [Tue, 21 Jul 2015 00:12:10 +0000 (01:12 +0100)]
avcodec/hapdec: don't log texture format every frame, do it once per decode session

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibavcodec/hap: remove unused struct member
Tom Butterworth [Tue, 21 Jul 2015 00:12:09 +0000 (01:12 +0100)]
libavcodec/hap: remove unused struct member

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibavcodec/hap: Name enums
Tom Butterworth [Tue, 21 Jul 2015 00:12:09 +0000 (01:12 +0100)]
libavcodec/hap: Name enums

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/aacsbr: fix compilation with hardcoded tables
James Almer [Mon, 20 Jul 2015 19:48:07 +0000 (16:48 -0300)]
avcodec/aacsbr: fix compilation with hardcoded tables

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '9ed6f9a17cc1f7d3699a1223783dadc1ee222069'
Michael Niedermayer [Mon, 20 Jul 2015 23:47:51 +0000 (01:47 +0200)]
Merge commit '9ed6f9a17cc1f7d3699a1223783dadc1ee222069'

* commit '9ed6f9a17cc1f7d3699a1223783dadc1ee222069':
  arm: use a local label instead of the function symbol in ff_prefetch_arm

See: cab6302534962331753fb69c674df86a458b098d
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68'
Michael Niedermayer [Mon, 20 Jul 2015 23:39:30 +0000 (01:39 +0200)]
Merge commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68'

* commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68':
  h264: aarch64: intra prediction optimisations

Conflicts:
libavcodec/h264pred.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'
Michael Niedermayer [Mon, 20 Jul 2015 23:12:59 +0000 (01:12 +0200)]
Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'

* commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370':
  Deprecate avctx.coded_frame

Conflicts:
ffmpeg.c
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/gif.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/proresenc_kostya.c
libavcodec/pthread_frame.c
libavcodec/rawenc.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/version.h
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/utils: Do not merge side data for encoders
Michael Niedermayer [Mon, 20 Jul 2015 22:46:55 +0000 (00:46 +0200)]
avcodec/utils: Do not merge side data for encoders

With side data now being added to every MPEG*/H26* video encoder
in the form of a quality scalar, software which simply stores
the pkt->data to get an ES stream would break.
This also as a side-effect makes the code faster

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'
Michael Niedermayer [Mon, 20 Jul 2015 22:54:42 +0000 (00:54 +0200)]
Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'

* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b':
  Add a quality factor packet side data

Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/avcodec.h
libavcodec/mpegvideo_enc.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'
Michael Niedermayer [Mon, 20 Jul 2015 20:59:45 +0000 (22:59 +0200)]
Merge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'

* commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534':
  Gather all coded_frame allocations and free functions to a single place

Conflicts:
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/dvenc.c
libavcodec/gif.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libopenjpegenc.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/v210enc.c
libavcodec/v410enc.c
libavcodec/xbmenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoarm: use a local label instead of the function symbol in ff_prefetch_arm
Janne Grunau [Mon, 20 Jul 2015 08:46:15 +0000 (10:46 +0200)]
arm: use a local label instead of the function symbol in ff_prefetch_arm

Avoids a relocation which might end out of range for thumb2.

Reported-By: Ludovic Fauvet <etix@videolan.org>
Bug-Id: https://bugs.webkit.org/show_bug.cgi?id=137022
CC: libav-stable@libav.org
3 years agoh264: aarch64: intra prediction optimisations
Janne Grunau [Sun, 12 Jul 2015 16:30:09 +0000 (18:30 +0200)]
h264: aarch64: intra prediction optimisations

3 years agoMerge commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf'
Michael Niedermayer [Mon, 20 Jul 2015 20:36:18 +0000 (22:36 +0200)]
Merge commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf'

* commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf':
  flashsvenc: Keep coded_frame.key_frame a write-only variable

Merged-by: Michael Niedermayer <michael@niedermayer.cc>