ffmpeg.git
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 30 Jan 2014 15:00:47 +0000 (16:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: document correct option to list encoders

Conflicts:
doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7'
Michael Niedermayer [Thu, 30 Jan 2014 14:19:51 +0000 (15:19 +0100)]
Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7'

* commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7':
  doc: add decoders.texi

Conflicts:
doc/decoders.texi
doc/ffmpeg.texi
doc/ffplay.texi

See: 5e45f03420945dfeaf66729f5d022e5c15ff5723
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '23d461fe8714a20ee5e6929f22c61512fdda568e'
Michael Niedermayer [Thu, 30 Jan 2014 13:55:03 +0000 (14:55 +0100)]
Merge commit '23d461fe8714a20ee5e6929f22c61512fdda568e'

* commit '23d461fe8714a20ee5e6929f22c61512fdda568e':
  ac3dec: Allow asymmetric application of DRC when drc_scale > 1

Conflicts:
libavcodec/ac3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd rangecoder to the sonic dependencies in configure.
Carl Eugen Hoyos [Thu, 30 Jan 2014 11:15:28 +0000 (12:15 +0100)]
Add rangecoder to the sonic dependencies in configure.

Fixes compilation with --disable-everything --enable-decoder=sonic
and --disable-everything --enable-encoder=sonic.

6 years agoWarn the user if mjpeg cbr encoding with frame threading was requested.
Carl Eugen Hoyos [Wed, 29 Jan 2014 23:55:35 +0000 (00:55 +0100)]
Warn the user if mjpeg cbr encoding with frame threading was requested.

6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 29 Jan 2014 23:55:22 +0000 (00:55 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Force automatic thread_count to 1 for cbr mjpeg frame threading.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegdec: use av_freep() instead of av_free()
Michael Niedermayer [Wed, 29 Jan 2014 23:25:31 +0000 (00:25 +0100)]
avcodec/mjpegdec: use av_freep() instead of av_free()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegdec Fix potential memleak of stereo3D at the end in case of decoding...
Michael Niedermayer [Wed, 29 Jan 2014 23:24:34 +0000 (00:24 +0100)]
avcodec/mjpegdec Fix potential memleak of stereo3D at the end in case of decoding failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoForce automatic thread_count to 1 for cbr mjpeg frame threading.
Carl Eugen Hoyos [Wed, 29 Jan 2014 23:22:25 +0000 (00:22 +0100)]
Force automatic thread_count to 1 for cbr mjpeg frame threading.

Constant bit rate mjpeg encoding fails for threads > 1 and frame threading.

6 years agomjpegdec: parse JPS extension and save relevant stereo3d information
Kirill Gavrilov [Wed, 29 Jan 2014 17:22:24 +0000 (21:22 +0400)]
mjpegdec: parse JPS extension and save relevant stereo3d information

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 29 Jan 2014 22:40:39 +0000 (23:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avformat: utils: Refactor duplicated PRINT macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: document correct option to list encoders
John Stebbins [Sun, 26 Jan 2014 14:55:26 +0000 (14:55 +0000)]
doc: document correct option to list encoders

6 years agodoc: add decoders.texi
John Stebbins [Sun, 26 Jan 2014 14:49:10 +0000 (14:49 +0000)]
doc: add decoders.texi

Only documents ac3 decoder options at this point.

6 years agoac3dec: Allow asymmetric application of DRC when drc_scale > 1
John Stebbins [Mon, 13 Jan 2014 17:04:30 +0000 (17:04 +0000)]
ac3dec: Allow asymmetric application of DRC when drc_scale > 1

Amplification of quiet sounds is enhanced.
Inspired by gbooker's A52Decoder.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 29 Jan 2014 16:05:12 +0000 (17:05 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpeg: Drop unused parameters from ff_draw_horiz_band()

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: utils: Refactor duplicated PRINT macro
Diego Biurrun [Thu, 16 Jan 2014 00:55:38 +0000 (01:55 +0100)]
avformat: utils: Refactor duplicated PRINT macro

6 years agompeg: Drop unused parameters from ff_draw_horiz_band()
Diego Biurrun [Wed, 29 Jan 2014 13:14:46 +0000 (14:14 +0100)]
mpeg: Drop unused parameters from ff_draw_horiz_band()

6 years agoRemove now unneeded Makefile dependency for the wtv muxer.
Carl Eugen Hoyos [Wed, 29 Jan 2014 08:59:45 +0000 (09:59 +0100)]
Remove now unneeded Makefile dependency for the wtv muxer.

6 years agoavformat/mpegts: Continue parsing PMTs until at least 2 streams are found or 100kb...
Michael Niedermayer [Wed, 29 Jan 2014 04:44:03 +0000 (05:44 +0100)]
avformat/mpegts: Continue parsing PMTs until at least 2 streams are found or 100kb are reached

This (ugly) hack fixes Ticket3348
If someone has an idea on how to fix this nicer, that would be very welcome
but the stream contains several PMTs with just one of the 2 streams at the start

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mpegts: drop stray space
Michael Niedermayer [Wed, 29 Jan 2014 04:43:39 +0000 (05:43 +0100)]
avformat/mpegts: drop stray space

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSupport writing E-AC3 in wav.
Carl Eugen Hoyos [Tue, 28 Jan 2014 23:48:50 +0000 (00:48 +0100)]
Support writing E-AC3 in wav.

6 years agoMove GUID-related objects to riffenc.c and riff.c.
Carl Eugen Hoyos [Tue, 28 Jan 2014 23:44:59 +0000 (00:44 +0100)]
Move GUID-related objects to riffenc.c and riff.c.

This simplifies the following eac3-in-wav patch.

6 years agoAdd elbg Makefile dependency to the cinepak encoder.
Carl Eugen Hoyos [Tue, 28 Jan 2014 21:39:45 +0000 (22:39 +0100)]
Add elbg Makefile dependency to the cinepak encoder.

6 years agoavfilter/vf_colormatrix: update output AVFrame colorspace
Michael Niedermayer [Tue, 28 Jan 2014 19:49:38 +0000 (20:49 +0100)]
avfilter/vf_colormatrix: update output AVFrame colorspace

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_colormatrix: Support using the source AVFrame colorspace if none is specified
Michael Niedermayer [Wed, 8 Jan 2014 17:40:23 +0000 (18:40 +0100)]
avfilter/vf_colormatrix: Support using the source AVFrame colorspace if none is specified

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/hls: Fix cookies and user agent with encrypted HLS streams
Mikael Finstad [Mon, 27 Jan 2014 10:05:27 +0000 (11:05 +0100)]
avformat/hls: Fix cookies and user agent with encrypted HLS streams

Session data (cookies, user-agent) is not being sent on payload requests with
encrypted HLS streams This causes services like Akamai to give a 403 forbidden
when requesting the TS files, because they expect the same cookies
and user-agent on all requests

6 years agodoc/general: update device and protocol status
Lukasz Marek [Tue, 28 Jan 2014 16:35:49 +0000 (17:35 +0100)]
doc/general: update device and protocol status

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: add myself as opengl_enc.c maintainer
Lukasz Marek [Tue, 28 Jan 2014 10:41:31 +0000 (11:41 +0100)]
MAINTAINERS: add myself as opengl_enc.c maintainer

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: add avdevice_*_control_message functions
Lukasz Marek [Tue, 28 Jan 2014 10:41:30 +0000 (11:41 +0100)]
doc/APIchanges: add avdevice_*_control_message functions

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuvenc: frame multi-threading support
Michael Niedermayer [Tue, 28 Jan 2014 03:02:35 +0000 (04:02 +0100)]
avcodec/huffyuvenc: frame multi-threading support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/vp9lpf: add ff_vp9_loop_filter_[vh]_88_16_sse2()
James Almer [Tue, 28 Jan 2014 07:59:45 +0000 (04:59 -0300)]
x86/vp9lpf: add ff_vp9_loop_filter_[vh]_88_16_sse2()

Similar gains as the ssse3 version once again

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agox86/vp9lpf: add ff_vp9_loop_filter_[vh]_88_16_{ssse3,avx}.
Clément Bœsch [Sat, 25 Jan 2014 16:38:42 +0000 (17:38 +0100)]
x86/vp9lpf: add ff_vp9_loop_filter_[vh]_88_16_{ssse3,avx}.

9680 decicycles in loop_filter_v_88_16_c, 4193765 runs, 539 skips
9233 decicycles in loop_filter_h_88_16_c, 4193751 runs, 553 skips

1929 decicycles in ff_vp9_loop_filter_v_88_16_ssse3, 4194118 runs, 186 skips
2738 decicycles in ff_vp9_loop_filter_h_88_16_ssse3, 4193861 runs, 443 skips

5.978 → 5.417 overall decode time on ped1080p.webm (-threads 1)

Adding SSE2 support should be relatively trivial (just a matter of
changing the pshufb [mask_mix] with something else), patch welcome.

6 years agoavcodec/huffyuv: dont depend on bitstream_bpp having a specific value for version>2
Michael Niedermayer [Mon, 27 Jan 2014 23:27:57 +0000 (00:27 +0100)]
avcodec/huffyuv: dont depend on bitstream_bpp having a specific value for version>2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Mon, 27 Jan 2014 22:45:14 +0000 (23:45 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd: add opengl device
  lavd: add avdevice_dev_to_app_control_message API
  lavd: add avdevice_app_to_dev_control_message API

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libfdk-aacenc: change MODE_7_1_FRONT_CENTER to map to AV_CH_LAYOUT_7POINT1_WI...
Michael Niedermayer [Sun, 26 Jan 2014 13:46:11 +0000 (14:46 +0100)]
avcodec/libfdk-aacenc: change MODE_7_1_FRONT_CENTER to map to AV_CH_LAYOUT_7POINT1_WIDE_BACK

This was suggested by Rodeo on IRC
<Rodeo> for consistency with the rest, MODE_7_1_FRONT_CENTER would be AV_CH_LAYOUT_7POINT1_WIDE_BACK (since LS+RS is mapped to back channels in other modes)

Reviewed-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libfdk-aacenc: change MODE_7_1_REAR_SURROUND to map to AV_CH_LAYOUT_7POINT1
Michael Niedermayer [Sun, 26 Jan 2014 13:44:27 +0000 (14:44 +0100)]
avcodec/libfdk-aacenc: change MODE_7_1_REAR_SURROUND to map to AV_CH_LAYOUT_7POINT1

This was suggested by Rodeo on IRC
<Rodeo> sorry, I meant MODE_7_1_REAR_SURROUND would probably be AV_CH_LAYOUT_7POINT1

Reviewed-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/vp9lpf: add a preload system in FILTER_UPDATE.
Clément Bœsch [Sat, 25 Jan 2014 18:04:56 +0000 (19:04 +0100)]
x86/vp9lpf: add a preload system in FILTER_UPDATE.

Allow some macro refactoring in filter14().

6 years agox86/vp9lpf: refactor v/h using common macros for P7 to Q7.
Clément Bœsch [Sat, 25 Jan 2014 14:55:27 +0000 (15:55 +0100)]
x86/vp9lpf: refactor v/h using common macros for P7 to Q7.

6 years agox86/vp9lpf: faster P7..Q7 accesses.
Clément Bœsch [Sat, 25 Jan 2014 14:32:42 +0000 (15:32 +0100)]
x86/vp9lpf: faster P7..Q7 accesses.

Introduce 2 additional registers for stride3 and mstride3 to allow
direct accesses (lea drops).

3931 → 3827 decicycles in ff_vp9_loop_filter_v_16_16_ssse3

Also uses defines to clarify the code.

6 years agolavd: add opengl device
Lukasz Marek [Sun, 24 Nov 2013 19:13:27 +0000 (20:13 +0100)]
lavd: add opengl device

It can render to OpenGL context provided by application or into SDL window

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd: add avdevice_dev_to_app_control_message API
Lukasz Marek [Sun, 19 Jan 2014 15:12:07 +0000 (16:12 +0100)]
lavd: add avdevice_dev_to_app_control_message API

New API allows to send messages from devices to application.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd: add avdevice_app_to_dev_control_message API
Lukasz Marek [Sun, 19 Jan 2014 15:11:09 +0000 (16:11 +0100)]
lavd: add avdevice_app_to_dev_control_message API

New API allows to send messages from application to devices.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoFix decoding of some 8 < bpc < 16 signed j2k samples with libopenjpeg.
Carl Eugen Hoyos [Mon, 27 Jan 2014 13:28:30 +0000 (14:28 +0100)]
Fix decoding of some 8 < bpc < 16 signed j2k samples with libopenjpeg.

No testcase known.

Reviewed-by: Michael Bradshaw
6 years agodxva2: bump maximum number of slieces for mpeg2
Rainer Hochecker [Mon, 27 Jan 2014 07:16:13 +0000 (08:16 +0100)]
dxva2: bump maximum number of slieces for mpeg2

Suggested by heleppkes on https://trac.ffmpeg.org/ticket/3133

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: remove redundant prototype
Lukasz Marek [Sat, 5 Oct 2013 14:10:41 +0000 (16:10 +0200)]
ffplay: remove redundant prototype

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuv: support gbrp9/10/12/14
Michael Niedermayer [Mon, 27 Jan 2014 01:05:13 +0000 (02:05 +0100)]
avcodec/huffyuv: support gbrp9/10/12/14

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuv: update years in copyright
Michael Niedermayer [Mon, 27 Jan 2014 00:45:57 +0000 (01:45 +0100)]
avcodec/huffyuv: update years in copyright

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b7d0d10a1d54073501b728dbe166a32e2b7b26f1'
Michael Niedermayer [Sun, 26 Jan 2014 22:41:43 +0000 (23:41 +0100)]
Merge commit 'b7d0d10a1d54073501b728dbe166a32e2b7b26f1'

* commit 'b7d0d10a1d54073501b728dbe166a32e2b7b26f1':
  x86inc: Speed up assembling with Yasm

See: 4d55fe7204382a75cc4817aeb272257005d442e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'
Michael Niedermayer [Sun, 26 Jan 2014 22:35:38 +0000 (23:35 +0100)]
Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'

* commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654':
  avformat: utils: K&R formatting cosmetics

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: fix invalid ref frame w/h on size change.
Ronald S. Bultje [Sun, 26 Jan 2014 01:30:07 +0000 (20:30 -0500)]
vp9: fix invalid ref frame w/h on size change.

Fixes invalid reads and crashes in vp90-2-05-resize.webm and fuzzed6.ivf.
The output is still not identical to what libvpx does (because we don't
actually scale in MC).

Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: disable use_last_frame_mvs on resolution change (scalable).
Ronald S. Bultje [Sun, 26 Jan 2014 01:11:28 +0000 (20:11 -0500)]
vp9: disable use_last_frame_mvs on resolution change (scalable).

Prevents some invalid memory accesses after resolution change in
vp90-2-05-resize.webm, and libvpx does this too.

Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuvdec: optimize >8bps VLC reading
Michael Niedermayer [Sun, 26 Jan 2014 18:53:14 +0000 (19:53 +0100)]
avcodec/huffyuvdec: optimize >8bps VLC reading

97479 -> 54891 decicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86inc: Speed up assembling with Yasm
Loren Merritt [Sun, 19 Jan 2014 18:22:55 +0000 (19:22 +0100)]
x86inc: Speed up assembling with Yasm

Work around Yasm's inefficiency with handling large numbers of variables
in the global scope.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoconfigure: add missing dependency for the remuxing example
Stefano Sabatini [Sun, 26 Jan 2014 17:30:37 +0000 (18:30 +0100)]
configure: add missing dependency for the remuxing example

6 years agoavformat: utils: K&R formatting cosmetics
Diego Biurrun [Thu, 16 Jan 2014 00:53:03 +0000 (01:53 +0100)]
avformat: utils: K&R formatting cosmetics

Also adjust some comment wording / spelling and reorder header #includes.

6 years agoffmpeg: use intermediary variables in reap_filters, increase readability
Stefano Sabatini [Fri, 24 Jan 2014 16:27:33 +0000 (17:27 +0100)]
ffmpeg: use intermediary variables in reap_filters, increase readability

6 years agodoc/filters: re-edit notes on filtergraph escaping
Stefano Sabatini [Fri, 24 Jan 2014 10:31:25 +0000 (11:31 +0100)]
doc/filters: re-edit notes on filtergraph escaping

State the escaping rules more explicitly, reword various sentences and
drop confusing quoting example.

Should fix trac issue #3334.

6 years agoavcodec/huffyuvenc: fix end pointer for stats_out
Michael Niedermayer [Sun, 26 Jan 2014 15:24:36 +0000 (16:24 +0100)]
avcodec/huffyuvenc: fix end pointer for stats_out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuvenc: fail if stats_out is too small instead of silently truncating
Michael Niedermayer [Sun, 26 Jan 2014 15:23:45 +0000 (16:23 +0100)]
avcodec/huffyuvenc: fail if stats_out is too small instead of silently truncating

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add test for 16bps ffvhuff
Michael Niedermayer [Sun, 26 Jan 2014 03:51:38 +0000 (04:51 +0100)]
fate: add test for 16bps ffvhuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libfdk_aacenc: enable 7.1 channel encoding
Jean First [Sun, 26 Jan 2014 00:31:53 +0000 (01:31 +0100)]
avcodec/libfdk_aacenc: enable 7.1 channel encoding

7.1(wide) and 7.1(wide-side) channel layouts are supported in fdk_aac since october 2013 (commit fa3eba1644)

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 26 Jan 2014 02:23:46 +0000 (03:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: clang: explicitly state dep file and rule name in DEPFLAGS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fb87e69ff77f96536768dbae01d82db70c8b41f3'
Michael Niedermayer [Sun, 26 Jan 2014 02:19:03 +0000 (03:19 +0100)]
Merge commit 'fb87e69ff77f96536768dbae01d82db70c8b41f3'

* commit 'fb87e69ff77f96536768dbae01d82db70c8b41f3':
  configure: add missing x86 dependency for i686

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12dec: Revert Change to mpeg2_fast_decode_block_non_intra
Michael Niedermayer [Sun, 26 Jan 2014 01:53:17 +0000 (02:53 +0100)]
avcodec/mpeg12dec: Revert Change to mpeg2_fast_decode_block_non_intra

This fixes the speed regression from 20626f53e9f41cb3db82329ed3db7d773cfa3a8f
and still checks sufficiently to prevent out of allocated memory accesses
due to the index

Before:
1823 decicycles in mpeg2_fast_decode_block_non_intra, 8388493 runs, 115 skips
After:
1808 decicycles in mpeg2_fast_decode_block_non_intra, 8388494 runs, 114 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12dec: Redesign index checks for mpeg2_fast_decode_block_intra
Michael Niedermayer [Sun, 26 Jan 2014 01:53:17 +0000 (02:53 +0100)]
avcodec/mpeg12dec: Redesign index checks for mpeg2_fast_decode_block_intra

This fixes the speed regression from 20626f53e9f41cb3db82329ed3db7d773cfa3a8f
and still checks sufficiently to prevent out of allocated memory accesses
due to the index

Before:
1681 decicycles in mpeg2_fast_decode_block_intra, 4194238 runs, 66 skips
After:
1658 decicycles in mpeg2_fast_decode_block_intra, 4194248 runs, 56 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6d93307f8df81808f0dcdbc064b848054a6e83b3'
Michael Niedermayer [Sun, 26 Jan 2014 01:33:27 +0000 (02:33 +0100)]
Merge commit '6d93307f8df81808f0dcdbc064b848054a6e83b3'

* commit '6d93307f8df81808f0dcdbc064b848054a6e83b3':
  mpeg12: check scantable indices in all decode_block functions

Benchmarks

Before:
1878 decicycles in mpeg2_decode_block_non_intra, 8388487 runs, 121 skips
1700 decicycles in mpeg2_decode_block_intra, 4194239 runs, 65 skips
1808 decicycles in mpeg2_fast_decode_block_non_intra, 8388492 runs, 116 skips
1669 decicycles in mpeg2_fast_decode_block_intra, 4194248 runs, 56 skips
--
2056 decicycles in mpeg1_decode_block_inter, 65535 runs, 1 skips
2346 decicycles in mpeg1_decode_block_intra, 32768 runs, 0 skips
2011 decicycles in mpeg1_fast_decode_block_inter, 65533 runs, 3 skips
----------------
After:
1858 decicycles in mpeg2_decode_block_non_intra, 8388490 runs, 118 skips
1691 decicycles in mpeg2_decode_block_intra, 4194233 runs, 71 skips
1823 decicycles in mpeg2_fast_decode_block_non_intra, 8388493 runs, 115 skips
1681 decicycles in mpeg2_fast_decode_block_intra, 4194238 runs, 66 skips
--
2010 decicycles in mpeg1_decode_block_inter, 65535 runs, 1 skips
2322 decicycles in mpeg1_decode_block_intra, 32766 runs, 2 skips
1995 decicycles in mpeg1_fast_decode_block_inter, 65535 runs, 1 skips

All benchmarks are the best scores of several runs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/internal.h: add timer.h back
Michael Niedermayer [Sun, 26 Jan 2014 01:23:26 +0000 (02:23 +0100)]
avutil/internal.h: add timer.h back

Without this a developer would have to add a include every time he
wants to benchmark some code, this is a moderate inconvenience.

This reverts the specific hunk from fb0c9d41d685abb58575c5482ca33b8cd457c5ec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'
Michael Niedermayer [Sun, 26 Jan 2014 00:39:33 +0000 (01:39 +0100)]
Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'

* commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec':
  avutil: remove timer.h include from internal.h

Conflicts:
libavcodec/ffv1dec.c
libavutil/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuv: support AV_PIX_FMT_YUV(A)4XYP16 and GRAY16
Michael Niedermayer [Thu, 23 Jan 2014 00:41:39 +0000 (01:41 +0100)]
avcodec/huffyuv: support AV_PIX_FMT_YUV(A)4XYP16 and GRAY16

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: clang: explicitly state dep file and rule name in DEPFLAGS
Janne Grunau [Sat, 25 Jan 2014 16:34:19 +0000 (17:34 +0100)]
configure: clang: explicitly state dep file and rule name in DEPFLAGS

Fixes dependency file generation with gas-preprocessor.pl and clang.
Flags copied from GCC and tested with Apple's clang from Xcode 5 and
5.1 and clang 3.2, 3.3, 3.4 on Linux.

6 years agoconfigure: add missing x86 dependency for i686
Janne Grunau [Sat, 25 Jan 2014 15:55:58 +0000 (16:55 +0100)]
configure: add missing x86 dependency for i686

6 years agompeg12: check scantable indices in all decode_block functions
Janne Grunau [Fri, 24 Jan 2014 15:22:44 +0000 (16:22 +0100)]
mpeg12: check scantable indices in all decode_block functions

Add checks to the fast functions used with CODEC_FLAGS2_FAST and move
the check for all other functions to before the invalid memory is
accessed. Fixes https://trac.videolan.org/vlc/ticket/9713 with
CODEC_FLAGS2_FAST.

CC: libav-stable@libav.org
6 years agoavutil: remove timer.h include from internal.h
Janne Grunau [Thu, 23 Jan 2014 15:20:23 +0000 (16:20 +0100)]
avutil: remove timer.h include from internal.h

Added libavutil/timer.h include to all files with {START,STOP}_TIMER.

6 years agoavfilter/vf_scale: simplify alignment code
Michael Niedermayer [Sat, 25 Jan 2014 15:54:24 +0000 (16:54 +0100)]
avfilter/vf_scale: simplify alignment code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_scale: do aspect ratio and scale factor compensation together
Michael Niedermayer [Sat, 25 Jan 2014 15:48:13 +0000 (16:48 +0100)]
avfilter/vf_scale: do aspect ratio and scale factor compensation together

Fixes rounding error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge branch 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg
Michael Niedermayer [Sat, 25 Jan 2014 15:35:03 +0000 (16:35 +0100)]
Merge branch 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg

* 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg:
  Documentation for scale filter factor
  Documentation for scale filter factor
  Fixed factor for scale filter
  Factors for scale filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libx264: also consider ticks per frame for fps/timebase setup
Michael Niedermayer [Sat, 25 Jan 2014 15:19:39 +0000 (16:19 +0100)]
avcodec/libx264: also consider ticks per frame for fps/timebase setup

Setting fps = 1/timebase is not correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/lossless_videodsp: silly one-line cosmetic.
Clément Bœsch [Sat, 25 Jan 2014 15:23:22 +0000 (16:23 +0100)]
x86/lossless_videodsp: silly one-line cosmetic.

6 years agoDocumentation for scale filter factor
Lars Kiesow [Sat, 25 Jan 2014 14:34:23 +0000 (15:34 +0100)]
Documentation for scale filter factor

6 years agoDocumentation for scale filter factor
Lars Kiesow [Sat, 25 Jan 2014 14:02:15 +0000 (15:02 +0100)]
Documentation for scale filter factor

6 years agoFixed factor for scale filter
Lars Kiesow [Sat, 25 Jan 2014 14:00:02 +0000 (15:00 +0100)]
Fixed factor for scale filter

6 years agoFactors for scale filter
Lars Kiesow [Sat, 25 Jan 2014 13:40:48 +0000 (14:40 +0100)]
Factors for scale filter

6 years agox86/lossless_videodsp: use common macro for add and diff int16 loop.
Clément Bœsch [Sat, 25 Jan 2014 10:59:39 +0000 (11:59 +0100)]
x86/lossless_videodsp: use common macro for add and diff int16 loop.

6 years agox86/lossless_videodsp: simplify and explicit aligned/unaligned flags
Clément Bœsch [Thu, 23 Jan 2014 06:58:09 +0000 (07:58 +0100)]
x86/lossless_videodsp: simplify and explicit aligned/unaligned flags

6 years agolavfi/drawtext: add option for drawing border around text
Ramiro Polla [Sat, 18 Jan 2014 05:58:34 +0000 (03:58 -0200)]
lavfi/drawtext: add option for drawing border around text

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/drawtext: get bitmap from glyph in a separate step
Ramiro Polla [Fri, 10 Jan 2014 13:03:12 +0000 (11:03 -0200)]
lavfi/drawtext: get bitmap from glyph in a separate step

This change makes it possible to transform the glyph or get its border before
turning it into a bitmap.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'rbultje/vp9-simd'
Michael Niedermayer [Sat, 25 Jan 2014 00:43:50 +0000 (01:43 +0100)]
Merge remote-tracking branch 'rbultje/vp9-simd'

* rbultje/vp9-simd:
  vp9: fix memory corruption if header decoding fails after size change.
  vp9/x86: use explicit register for relative stack references.
  vp9/x86: iwht4x4 (lossless) mmx.
  vp9/x86: 4x4 iadst SIMD (ssse3) variants.
  vp9/x86: 8x8 iadst SIMD (ssse3/avx) variants.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 25 Jan 2014 00:39:19 +0000 (01:39 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dxtory: compressed RGB555/RGB565 decoding support

Conflicts:
libavcodec/dxtory.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0e1ad2f591b87e944550c15b54e54f8189743289'
Michael Niedermayer [Sat, 25 Jan 2014 00:33:42 +0000 (01:33 +0100)]
Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'

* commit '0e1ad2f591b87e944550c15b54e54f8189743289':
  dxtory: add more compressed and uncompressed modes

Conflicts:
libavcodec/dxtory.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: fix memory corruption if header decoding fails after size change.
Ronald S. Bultje [Sat, 25 Jan 2014 00:21:57 +0000 (19:21 -0500)]
vp9: fix memory corruption if header decoding fails after size change.

6 years agovp9/x86: use explicit register for relative stack references.
Ronald S. Bultje [Fri, 24 Jan 2014 23:48:56 +0000 (18:48 -0500)]
vp9/x86: use explicit register for relative stack references.

Before this patch, we explicitly modify rsp, which isn't necessarily
universally acceptable, since the space under the stack pointer might
be modified in things like signal handlers. Therefore, use an explicit
register to hold the stack pointer relative to the bottom of the stack
(i.e. rsp). This will also clear out valgrind errors about the use of
uninitialized data that started occurring after the idct16x16/ssse3
optimizations were first merged.

6 years agovp9/x86: iwht4x4 (lossless) mmx.
Ronald S. Bultje [Tue, 21 Jan 2014 01:04:48 +0000 (20:04 -0500)]
vp9/x86: iwht4x4 (lossless) mmx.

6 years agovp9/x86: 4x4 iadst SIMD (ssse3) variants.
Ronald S. Bultje [Mon, 20 Jan 2014 20:30:22 +0000 (15:30 -0500)]
vp9/x86: 4x4 iadst SIMD (ssse3) variants.

Cycle measurements for intra itxfm_4x4_add on ped1080p.webm:
idct_idct:    66 -> 67 cycles (noise measurement)
idct_iadst:  199 -> 79 cycles
iadst_idct:  165 -> 70 cycles
iadst_iadst: 183 -> 82 cycles

6 years agovp9/x86: 8x8 iadst SIMD (ssse3/avx) variants.
Ronald S. Bultje [Mon, 20 Jan 2014 22:11:48 +0000 (17:11 -0500)]
vp9/x86: 8x8 iadst SIMD (ssse3/avx) variants.

Cycle measurements for intra itxfm_8x8_add on ped1080p.webm:
idct_idct:   133 -> 135 cycles (noise measurement)
idct_iadst:  900 -> 241 cycles
iadst_idct:  864 -> 215 cycles
iadst_iadst: 973 -> 310 cycles

6 years agoavcodec/dvbsubdec: Remove unused display_list_size
Michael Niedermayer [Sat, 25 Jan 2014 00:22:48 +0000 (01:22 +0100)]
avcodec/dvbsubdec: Remove unused display_list_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFixed a memory leak in dvbsubenc.c: sub->num_rects was reduced without freeing the...
Wim Vander Schelden [Tue, 21 Jan 2014 13:38:16 +0000 (14:38 +0100)]
Fixed a memory leak in dvbsubenc.c: sub->num_rects was reduced without freeing the associated rects.

Signed-off-by: Wim Vander Schelden <lists@fixnum.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/avienc: cosmetic indent
James Darnley [Fri, 24 Jan 2014 02:13:47 +0000 (03:13 +0100)]
lavf/avienc: cosmetic indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/avienc: use metadata_header_padding
James Darnley [Fri, 24 Jan 2014 01:22:50 +0000 (02:22 +0100)]
lavf/avienc: use metadata_header_padding

The muxer will write at least the number of bytes requested and possibly
up to 3 bytes more.  This is because the muxer writes 32-bit integers
and the format requires 4-byte alignment anyway.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/id3v2enc: update comment about minimum padding
James Darnley [Thu, 2 Jan 2014 19:34:35 +0000 (20:34 +0100)]
lavf/id3v2enc: update comment about minimum padding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/id3v2enc: use metadata_header_padding
James Darnley [Mon, 30 Dec 2013 17:13:08 +0000 (18:13 +0100)]
lavf/id3v2enc: use metadata_header_padding

As with the change to flacenc this allows the user to control the amount
of padding they want added to the file.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>