ffmpeg.git
6 years agotruehd: break out part of output_data into platform-specific callback.
Ben Avison [Thu, 20 Mar 2014 18:59:17 +0000 (18:59 +0000)]
truehd: break out part of output_data into platform-specific callback.

Verified with profiling that this doesn't have a measurable effect upon
overall performance.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '483321fe789566dcb27b6387c00ea16dd86bc587'
Michael Niedermayer [Wed, 26 Mar 2014 19:50:17 +0000 (20:50 +0100)]
Merge commit '483321fe789566dcb27b6387c00ea16dd86bc587'

* commit '483321fe789566dcb27b6387c00ea16dd86bc587':
  truehd: add hand-scheduled ARM asm version of ff_mlp_rematrix_channel.

See: 89135716fd4c2963e01e0155547c47bf709f1aa3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotruehd: add hand-scheduled ARM asm version of ff_mlp_rematrix_channel.
Ben Avison [Thu, 20 Mar 2014 18:59:16 +0000 (18:59 +0000)]
truehd: add hand-scheduled ARM asm version of ff_mlp_rematrix_channel.

Profiling results for overall audio decode and the rematrix_channels function
in particular are as follows:

              Before          After
              Mean   StdDev   Mean   StdDev  Confidence  Change
6:2 total     370.8  17.0     348.8  20.1    99.9%       +6.3%
6:2 function  46.4   8.4      45.8   6.6     18.0%       +1.2%  (insignificant)
8:2 total     343.2  19.0     339.1  15.4    54.7%       +1.2%  (insignificant)
8:2 function  38.9   3.9      40.2   6.9     52.4%       -3.2%  (insignificant)
6:6 total     658.4  15.7     604.6  20.8    100.0%      +8.9%
6:6 function  109.0  8.7      59.5   5.4     100.0%      +83.3%
8:8 total     896.2  24.5     766.4  17.6    100.0%      +16.9%
8:8 function  223.4  12.8     93.8   5.0     100.0%      +138.3%

The assembly version has also been tested with a fuzz tester to ensure that
any combinations of inputs not exercised by my available test streams still
generate mathematically identical results to the C version.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4e5aa080bb8d83cb6de1ffbdd7b37ec34bc6b30b'
Michael Niedermayer [Wed, 26 Mar 2014 19:42:35 +0000 (20:42 +0100)]
Merge commit '4e5aa080bb8d83cb6de1ffbdd7b37ec34bc6b30b'

* commit '4e5aa080bb8d83cb6de1ffbdd7b37ec34bc6b30b':
  truehd: break out part of rematrix_channels into platform-specific callback.

See: 3f4e73afe92743e96a633aa5b80416e4714e4783
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotruehd: break out part of rematrix_channels into platform-specific callback.
Ben Avison [Thu, 20 Mar 2014 18:59:15 +0000 (18:59 +0000)]
truehd: break out part of rematrix_channels into platform-specific callback.

Verified with profiling that this doesn't have a measurable effect upon
overall performance.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '15a29c39d9ef15b0783c04b3228e1c55f6701ee3'
Michael Niedermayer [Wed, 26 Mar 2014 19:26:26 +0000 (20:26 +0100)]
Merge commit '15a29c39d9ef15b0783c04b3228e1c55f6701ee3'

* commit '15a29c39d9ef15b0783c04b3228e1c55f6701ee3':
  truehd: add hand-scheduled ARM asm version of mlp_filter_channel.

Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/mlpdsp_init_arm.c

See: 87b128d5ef6aeb01cc8bba167c929c74cbf2e7c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotruehd: add hand-scheduled ARM asm version of mlp_filter_channel.
Ben Avison [Thu, 20 Mar 2014 18:59:14 +0000 (18:59 +0000)]
truehd: add hand-scheduled ARM asm version of mlp_filter_channel.

Profiling results for overall audio decode and the mlp_filter_channel(_arm)
function in particular are as follows:

              Before          After
              Mean   StdDev   Mean   StdDev  Confidence  Change
6:2 total     380.4  22.0     370.8  17.0    87.4%       +2.6%  (insignificant)
6:2 function  60.7   7.2      36.6   8.1     100.0%      +65.8%
8:2 total     357.0  17.5     343.2  19.0    97.8%       +4.0%  (insignificant)
8:2 function  60.3   8.8      37.3   3.8     100.0%      +61.8%
6:6 total     717.2  23.2     658.4  15.7    100.0%      +8.9%
6:6 function  140.4  12.9     81.5   9.2     100.0%      +72.4%
8:8 total     981.9  16.2     896.2  24.5    100.0%      +9.6%
8:8 function  193.4  15.0     103.3  11.5    100.0%      +87.2%

Experiments with adding preload instructions to this function yielded no
useful benefit, so these have not been included.

The assembly version has also been tested with a fuzz tester to ensure that
any combinations of inputs not exercised by my available test streams still
generate mathematically identical results to the C version.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_pullup: add comment to explain memset(0)
Michael Niedermayer [Wed, 26 Mar 2014 19:05:57 +0000 (20:05 +0100)]
avfilter/vf_pullup: add comment to explain memset(0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotruehd: add hand-scheduled ARM asm version of ff_mlp_rematrix_channel.
Ben Avison [Thu, 20 Mar 2014 18:58:37 +0000 (18:58 +0000)]
truehd: add hand-scheduled ARM asm version of ff_mlp_rematrix_channel.

Profiling results for overall audio decode and the rematrix_channels function
in particular are as follows:

              Before          After
              Mean   StdDev   Mean   StdDev  Confidence  Change
6:2 total     370.8  17.0     348.8  20.1    99.9%       +6.3%
6:2 function  46.4   8.4      45.8   6.6     18.0%       +1.2%  (insignificant)
8:2 total     343.2  19.0     339.1  15.4    54.7%       +1.2%  (insignificant)
8:2 function  38.9   3.9      40.2   6.9     52.4%       -3.2%  (insignificant)
6:6 total     658.4  15.7     604.6  20.8    100.0%      +8.9%
6:6 function  109.0  8.7      59.5   5.4     100.0%      +83.3%
8:8 total     896.2  24.5     766.4  17.6    100.0%      +16.9%
8:8 function  223.4  12.8     93.8   5.0     100.0%      +138.3%

The assembly version has also been tested with a fuzz tester to ensure that
any combinations of inputs not exercised by my available test streams still
generate mathematically identical results to the C version.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agotruehd: break out part of rematrix_channels into platform-specific callback.
Ben Avison [Thu, 20 Mar 2014 18:58:36 +0000 (18:58 +0000)]
truehd: break out part of rematrix_channels into platform-specific callback.

Verified with profiling that this doesn't have a measurable effect upon
overall performance.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agotruehd: add hand-scheduled ARM asm version of mlp_filter_channel.
Ben Avison [Thu, 20 Mar 2014 18:58:35 +0000 (18:58 +0000)]
truehd: add hand-scheduled ARM asm version of mlp_filter_channel.

Profiling results for overall audio decode and the mlp_filter_channel(_arm)
function in particular are as follows:

              Before          After
              Mean   StdDev   Mean   StdDev  Confidence  Change
6:2 total     380.4  22.0     370.8  17.0    87.4%       +2.6%  (insignificant)
6:2 function  60.7   7.2      36.6   8.1     100.0%      +65.8%
8:2 total     357.0  17.5     343.2  19.0    97.8%       +4.0%  (insignificant)
8:2 function  60.3   8.8      37.3   3.8     100.0%      +61.8%
6:6 total     717.2  23.2     658.4  15.7    100.0%      +8.9%
6:6 function  140.4  12.9     81.5   9.2     100.0%      +72.4%
8:8 total     981.9  16.2     896.2  24.5    100.0%      +9.6%
8:8 function  193.4  15.0     103.3  11.5    100.0%      +87.2%

Experiments with adding preload instructions to this function yielded no
useful benefit, so these have not been included.

The assembly version has also been tested with a fuzz tester to ensure that
any combinations of inputs not exercised by my available test streams still
generate mathematically identical results to the C version.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavfilter/vf_pullup: zero freed memory for saftey
Michael Niedermayer [Wed, 26 Mar 2014 17:37:15 +0000 (18:37 +0100)]
avfilter/vf_pullup: zero freed memory for saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_pullup: simplify, fix double free error
wm4 [Tue, 25 Mar 2014 12:53:11 +0000 (13:53 +0100)]
vf_pullup: simplify, fix double free error

The memory allocation for f->diffs was freed multiple times in some
corner cases. Simplify the code so that this doesn't happen.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/frame: undeprecate AVFrame.motion_val API
Michael Niedermayer [Wed, 26 Mar 2014 17:22:49 +0000 (18:22 +0100)]
avutil/frame: undeprecate AVFrame.motion_val API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream parameter...
Michael Niedermayer [Wed, 26 Mar 2014 17:09:23 +0000 (18:09 +0100)]
avcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream parameter sets

Fixes h264_mp4toannexb_bsf_failure.mkv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 26 Mar 2014 15:55:46 +0000 (16:55 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init

Conflicts:
libavcodec/x86/rnd_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6'
Michael Niedermayer [Wed, 26 Mar 2014 14:53:33 +0000 (15:53 +0100)]
Merge commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6'

* commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6':
  hpeldsp_template: Move content to hpeldsp

Conflicts:
libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '09d4389de10b03ea65a84eaf3d6c4b7a7538ad75'
Michael Niedermayer [Wed, 26 Mar 2014 14:40:50 +0000 (15:40 +0100)]
Merge commit '09d4389de10b03ea65a84eaf3d6c4b7a7538ad75'

* commit '09d4389de10b03ea65a84eaf3d6c4b7a7538ad75':
  hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '92ba965103d3884609730ba9bf293772dc78a9ef'
Michael Niedermayer [Wed, 26 Mar 2014 14:36:27 +0000 (15:36 +0100)]
Merge commit '92ba965103d3884609730ba9bf293772dc78a9ef'

* commit '92ba965103d3884609730ba9bf293772dc78a9ef':
  dsputil: Move draw_edges and clear_block* out of dsputil_template

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'
Michael Niedermayer [Wed, 26 Mar 2014 14:24:50 +0000 (15:24 +0100)]
Merge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'

* commit 'da5be235250a61d6994408b054e3e3acf2e0f90f':
  dsputil: Move RV40-specific bits into rv40dsp

Conflicts:
libavcodec/dsputil.c
libavcodec/rv40dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'
Michael Niedermayer [Wed, 26 Mar 2014 14:08:46 +0000 (15:08 +0100)]
Merge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'

* commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed':
  hpeldsp_template: Detemplatize the code

Conflicts:
libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2c01ad8b206d326700974438f7193f22be416eb1'
Michael Niedermayer [Wed, 26 Mar 2014 13:59:50 +0000 (14:59 +0100)]
Merge commit '2c01ad8b206d326700974438f7193f22be416eb1'

* commit '2c01ad8b206d326700974438f7193f22be416eb1':
  dsputil_template: Detemplatize the code

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'
Michael Niedermayer [Wed, 26 Mar 2014 13:50:47 +0000 (14:50 +0100)]
Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

* commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f':
  Add missing headers to make template files compile (more) standalone

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08'
Michael Niedermayer [Wed, 26 Mar 2014 13:40:49 +0000 (14:40 +0100)]
Merge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08'

* commit 'e7373585f827d4ec05d952daa3877e8decfe3c08':
  dsputil_template: Move bits that are used templatized into separate file

Conflicts:
libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f'
Michael Niedermayer [Wed, 26 Mar 2014 13:32:12 +0000 (14:32 +0100)]
Merge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f'

* commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f':
  dsputil: Move hpel_template #include out of dsputil_template

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd0aabeab23755ee906440505ad2097c0f1493e80'
Michael Niedermayer [Wed, 26 Mar 2014 13:16:44 +0000 (14:16 +0100)]
Merge commit 'd0aabeab23755ee906440505ad2097c0f1493e80'

* commit 'd0aabeab23755ee906440505ad2097c0f1493e80':
  x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation

See: c8246d37664af9feb23edede944846687aea787a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init
Diego Biurrun [Wed, 29 Jan 2014 11:49:24 +0000 (12:49 +0100)]
x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init

There is no point in having a separate file just for the instantiation
that provides the public functions.

6 years agohpeldsp_template: Move content to hpeldsp
Diego Biurrun [Fri, 10 Jan 2014 14:01:04 +0000 (15:01 +0100)]
hpeldsp_template: Move content to hpeldsp

There is no point in having this separate; it is not used as a template.

6 years agohpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions
Diego Biurrun [Fri, 10 Jan 2014 15:37:23 +0000 (16:37 +0100)]
hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions

6 years agodsputil: Move draw_edges and clear_block* out of dsputil_template
Diego Biurrun [Tue, 7 Jan 2014 23:43:09 +0000 (00:43 +0100)]
dsputil: Move draw_edges and clear_block* out of dsputil_template

The functions are not used templatized.

6 years agodsputil: Move RV40-specific bits into rv40dsp
Diego Biurrun [Wed, 18 Dec 2013 22:27:35 +0000 (23:27 +0100)]
dsputil: Move RV40-specific bits into rv40dsp

6 years agohpeldsp_template: Detemplatize the code
Diego Biurrun [Fri, 10 Jan 2014 13:57:59 +0000 (14:57 +0100)]
hpeldsp_template: Detemplatize the code

The indirection makes no sense without multiple instantiation.

6 years agodsputil_template: Detemplatize the code
Diego Biurrun [Thu, 9 Jan 2014 11:09:35 +0000 (12:09 +0100)]
dsputil_template: Detemplatize the code

The indirection makes no sense without multiple instantiation.

6 years agoAdd missing headers to make template files compile (more) standalone
Diego Biurrun [Thu, 9 Jan 2014 09:27:20 +0000 (10:27 +0100)]
Add missing headers to make template files compile (more) standalone

6 years agodsputil_template: Move bits that are used templatized into separate file
Diego Biurrun [Wed, 8 Jan 2014 23:56:33 +0000 (00:56 +0100)]
dsputil_template: Move bits that are used templatized into separate file

This allows detemplatizing the bits that are not instantiated twice.

6 years agodsputil: Move hpel_template #include out of dsputil_template
Diego Biurrun [Tue, 7 Jan 2014 23:06:52 +0000 (00:06 +0100)]
dsputil: Move hpel_template #include out of dsputil_template

Multiple inclusion makes no sense as it is only used in the 8-bit case.

6 years agox86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation
Diego Biurrun [Wed, 26 Mar 2014 10:58:58 +0000 (11:58 +0100)]
x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation

This fixes FATE with mmxext CPUFLAGS set.

6 years agoavcodec/h261: move b_stride/b_xy under the if() where they are used
Michael Niedermayer [Wed, 26 Mar 2014 02:36:24 +0000 (03:36 +0100)]
avcodec/h261: move b_stride/b_xy under the if() where they are used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: Export picture type
Michael Niedermayer [Wed, 26 Mar 2014 01:48:12 +0000 (02:48 +0100)]
avcodec/hevc: Export picture type

This only uses the first slice, improvement here is welcome
analyzing all slices the trivial way would interfere with threads

Fixes Ticket3185

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h261dec: fix motion vector vissualization
Michael Niedermayer [Tue, 25 Mar 2014 23:39:46 +0000 (00:39 +0100)]
avcodec/h261dec: fix motion vector vissualization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 25 Mar 2014 18:38:43 +0000 (19:38 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: add missing includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'
Michael Niedermayer [Tue, 25 Mar 2014 18:24:40 +0000 (19:24 +0100)]
Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'

* commit 'aa499568afc01d59215eef7e5b14b949a9671afc':
  avconv: More descriptive message about framedrop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'
Michael Niedermayer [Tue, 25 Mar 2014 18:17:38 +0000 (19:17 +0100)]
Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'

* commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3':
  vf_transpose: K&R formatting cosmetics

Conflicts:
libavfilter/vf_transpose.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/cpu: check for OS support before enabling AVX2
James Almer [Tue, 25 Mar 2014 08:27:08 +0000 (05:27 -0300)]
x86/cpu: check for OS support before enabling AVX2

AV_CPU_FLAG_AVX is enabled at this point only if there's OS support.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoudp: mention default in documentation
rogerdpack [Mon, 24 Mar 2014 19:00:48 +0000 (13:00 -0600)]
udp: mention default in documentation

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodshow: log error and continue if unable to set audio buffer
rogerdpack [Tue, 25 Mar 2014 16:08:49 +0000 (10:08 -0600)]
dshow: log error and continue if unable to set audio buffer

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd an .oga muxer.
Carl Eugen Hoyos [Tue, 25 Mar 2014 14:47:55 +0000 (15:47 +0100)]
Add an .oga muxer.

6 years agoDo not set swscale sizeFactor to -1.
Carl Eugen Hoyos [Tue, 25 Mar 2014 14:46:35 +0000 (15:46 +0100)]
Do not set swscale sizeFactor to -1.

Fixes ticket #3495.

6 years agoswscale: add two spatially stable dithering methods
Øyvind Kolås [Sun, 23 Mar 2014 01:13:26 +0000 (02:13 +0100)]
swscale: add two spatially stable dithering methods

Both of these dithering methods are from http://pippin.gimp.org/a_dither/ for
GIF they can be considered better than bayer (provides more gray-levels), and
spatial stability - often more than twice as good compression and less visual
flicker than error diffusion methods (the methods also avoids error-shadow
artifacts of diffusion dithers).

These methods are similar to blue/green noise type dither masks; but are
simple enough to generate their mask on the fly. They are still research work
in progress; though more expensive to generate masks (which can be used in a
LUT) like 'void and cluster' and similar methods will yield superior results

6 years agolibavcodec/*/vp8dsp_init: indent
Peter Ross [Fri, 14 Feb 2014 11:58:36 +0000 (22:58 +1100)]
libavcodec/*/vp8dsp_init: indent

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/riff: add On2 VP7 fourccs
Peter Ross [Fri, 14 Feb 2014 12:00:49 +0000 (23:00 +1100)]
avformat/riff: add On2 VP7 fourccs

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoOn2 VP7 decoder
Peter Ross [Tue, 18 Feb 2014 10:52:30 +0000 (21:52 +1100)]
On2 VP7 decoder

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: BBB
previous patch reviewed by jason
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vp8: vp8_find_free_buffer
Peter Ross [Fri, 14 Feb 2014 11:58:55 +0000 (22:58 +1100)]
avcodec/vp8: vp8_find_free_buffer

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: add missing includes
Vittorio Giovara [Sat, 22 Mar 2014 23:34:13 +0000 (23:34 +0000)]
avcodec: add missing includes

6 years agoavconv: More descriptive message about framedrop
Vittorio Giovara [Tue, 25 Mar 2014 11:26:24 +0000 (12:26 +0100)]
avconv: More descriptive message about framedrop

6 years agovf_transpose: K&R formatting cosmetics
Vittorio Giovara [Tue, 25 Mar 2014 07:39:24 +0000 (07:39 +0000)]
vf_transpose: K&R formatting cosmetics

6 years agoavcodec/svq1enc: fix undefined pointer operation
Michael Niedermayer [Tue, 25 Mar 2014 02:34:00 +0000 (03:34 +0100)]
avcodec/svq1enc: fix undefined pointer operation

Fixes Ticket3152

This also removes the dependance on ff_init_block_index/ff_update_block_index()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/mpegvideoenc_template: fix integer overflow
Michael Niedermayer [Mon, 24 Mar 2014 23:15:52 +0000 (00:15 +0100)]
avcodec/x86/mpegvideoenc_template: fix integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodox/scaler:fix bicubiclin typo
Michael Niedermayer [Mon, 24 Mar 2014 21:04:52 +0000 (22:04 +0100)]
dox/scaler:fix bicubiclin typo

See Ticket3486

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 24 Mar 2014 20:23:54 +0000 (21:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx265: Only use one memcpy for headers

See: ecb5b9c098009787e02f6de9e2d3e1786531c2f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed'
Michael Niedermayer [Mon, 24 Mar 2014 20:05:41 +0000 (21:05 +0100)]
Merge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed'

* commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed':
  libx265: Write global extradata when requested

See: dded5ed9c5eb0c3d5a953e661ea21a9019e93ea4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'
Michael Niedermayer [Mon, 24 Mar 2014 19:55:23 +0000 (20:55 +0100)]
Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'

* commit '8ef33497a6a3ed05d2f931809c074ef3d1878834':
  build: Add config option for CABAC code

Conflicts:
configure
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: use ff_h264_set_erpic() instead of memset
Michael Niedermayer [Mon, 24 Mar 2014 18:58:05 +0000 (19:58 +0100)]
avcodec/h264: use ff_h264_set_erpic() instead of memset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: move packet deallocation into write_frame
Michael Niedermayer [Mon, 24 Mar 2014 18:50:39 +0000 (19:50 +0100)]
ffmpeg: move packet deallocation into write_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 24 Mar 2014 15:45:29 +0000 (16:45 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: don't warn on multiple frames per packet for codecs that expect it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'
Michael Niedermayer [Mon, 24 Mar 2014 15:40:35 +0000 (16:40 +0100)]
Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'

* commit '4754345027eb85cfa51aeb88beec68d7b036c11e':
  avconv: print verbose per-stream transcoding statistics

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a220b07b0f971f88213aef012aea51af2800be62'
Michael Niedermayer [Mon, 24 Mar 2014 15:25:31 +0000 (16:25 +0100)]
Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'

* commit 'a220b07b0f971f88213aef012aea51af2800be62':
  avconv: split printing the final statistics into a separate function

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibx265: Only use one memcpy for headers
Derek Buitenhuis [Sun, 23 Mar 2014 14:31:06 +0000 (14:31 +0000)]
libx265: Only use one memcpy for headers

They're guaranteed by the x265 API to be contiguous in memory.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Simple cosmetic fix
Derek Buitenhuis [Sun, 23 Mar 2014 14:39:46 +0000 (14:39 +0000)]
libx265: Simple cosmetic fix

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Only use one memcpy for headers
Derek Buitenhuis [Sun, 23 Mar 2014 14:31:06 +0000 (14:31 +0000)]
libx265: Only use one memcpy for headers

They're guaranteed by the x265 API to be contiguous in memory.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Write global extradata when requested
Michael Niedermayer [Fri, 14 Mar 2014 03:26:24 +0000 (04:26 +0100)]
libx265: Write global extradata when requested

Matroska, MP4, and other containers require it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoMerge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'
Michael Niedermayer [Mon, 24 Mar 2014 15:08:01 +0000 (16:08 +0100)]
Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'

* commit 'baeb59d89beda499688e528c6a269d2b255b66f2':
  avconv: rewrite output data size tracking

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'
Michael Niedermayer [Mon, 24 Mar 2014 14:48:19 +0000 (15:48 +0100)]
Merge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'

* commit 'f759f66e367bc62ed7738a51040f775b656a60d8':
  avconv: explicitly report when the muxing overhead is unknown

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e'
Michael Niedermayer [Mon, 24 Mar 2014 14:45:47 +0000 (15:45 +0100)]
Merge commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e'

* commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e':
  avconv: remove unused nb_frames_dup

Conflicts:
ffmpeg.c

No change, as the variable is not unused

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: Add config option for CABAC code
Diego Biurrun [Sat, 22 Mar 2014 17:41:43 +0000 (18:41 +0100)]
build: Add config option for CABAC code

This allows for more elegant dependency and object declarations.

6 years agoMerge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'
Michael Niedermayer [Mon, 24 Mar 2014 14:32:48 +0000 (15:32 +0100)]
Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'

* commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab':
  {v,a}f_showinfo: print frame side data

Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'
Michael Niedermayer [Mon, 24 Mar 2014 14:11:08 +0000 (15:11 +0100)]
Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'

* commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7':
  mp3dec: export replaygain tags from ID3v2

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'
Michael Niedermayer [Mon, 24 Mar 2014 14:04:47 +0000 (15:04 +0100)]
Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'

* commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15':
  af_volume: support using replaygain frame side data

Conflicts:
doc/filters.texi
libavfilter/af_volume.c
libavfilter/af_volume.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'
Michael Niedermayer [Mon, 24 Mar 2014 13:51:44 +0000 (14:51 +0100)]
Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'

* commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5':
  frame: add a function for removing side data from a frame

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'
Michael Niedermayer [Mon, 24 Mar 2014 13:44:22 +0000 (14:44 +0100)]
Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'

* commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9':
  avconv: add stream-global side data to the first demuxed packet

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4a0f6651434c6f213d830140f575b4ec7858519f'
Michael Niedermayer [Mon, 24 Mar 2014 13:26:17 +0000 (14:26 +0100)]
Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f'

* commit '4a0f6651434c6f213d830140f575b4ec7858519f':
  libavcodec: when decoding, copy replaygain side data to decoded frames

Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'
Michael Niedermayer [Mon, 24 Mar 2014 13:03:55 +0000 (14:03 +0100)]
Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'

* commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78':
  Add replaygain side data type and code for parsing replaygain tags.

Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '25b32586566f285d797737863c97a1c5c9c84e2b'
Michael Niedermayer [Mon, 24 Mar 2014 12:41:49 +0000 (13:41 +0100)]
Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'

* commit '25b32586566f285d797737863c97a1c5c9c84e2b':
  lavf: add an AVStream field for exporting stream-global side data

Conflicts:
libavformat/utils.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'
Michael Niedermayer [Mon, 24 Mar 2014 12:27:33 +0000 (13:27 +0100)]
Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619':
  lavc: give a typedeffed name to the AVPacket.side_data struct

Conflicts:
doc/APIchanges
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavconv: don't warn on multiple frames per packet for codecs that expect it
Anton Khirnov [Mon, 17 Mar 2014 10:14:14 +0000 (11:14 +0100)]
avconv: don't warn on multiple frames per packet for codecs that expect it

6 years agoavconv: print verbose per-stream transcoding statistics
Anton Khirnov [Mon, 17 Mar 2014 09:58:05 +0000 (10:58 +0100)]
avconv: print verbose per-stream transcoding statistics

6 years agoavconv: split printing the final statistics into a separate function
Anton Khirnov [Mon, 17 Mar 2014 09:09:09 +0000 (10:09 +0100)]
avconv: split printing the final statistics into a separate function

6 years agoavconv: rewrite output data size tracking
Anton Khirnov [Mon, 17 Mar 2014 09:03:47 +0000 (10:03 +0100)]
avconv: rewrite output data size tracking

Store a variable per OutputStream instead of globals for
audio/video/extradata. This makes the code simpler and cleaner and fixes
2pass with multiple output streams.

6 years agoavconv: explicitly report when the muxing overhead is unknown
Anton Khirnov [Mon, 17 Mar 2014 09:00:38 +0000 (10:00 +0100)]
avconv: explicitly report when the muxing overhead is unknown

6 years agoavconv: remove unused nb_frames_dup
Anton Khirnov [Mon, 17 Mar 2014 06:15:02 +0000 (07:15 +0100)]
avconv: remove unused nb_frames_dup

Frame duplication now happens in vf_fps.

6 years ago{v,a}f_showinfo: print frame side data
Anton Khirnov [Wed, 19 Feb 2014 17:48:15 +0000 (18:48 +0100)]
{v,a}f_showinfo: print frame side data

6 years agomp3dec: export replaygain tags from ID3v2
Anton Khirnov [Wed, 19 Feb 2014 20:02:12 +0000 (21:02 +0100)]
mp3dec: export replaygain tags from ID3v2

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 24 Mar 2014 05:07:28 +0000 (06:07 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Remove dcbzl check for e500v1 and e500v2 architectures

See: d5733936d857ce5c7d28c0bc9e89a2e2548f8895
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaf_volume: support using replaygain frame side data
Anton Khirnov [Wed, 19 Feb 2014 20:01:37 +0000 (21:01 +0100)]
af_volume: support using replaygain frame side data

6 years agoframe: add a function for removing side data from a frame
Anton Khirnov [Wed, 19 Feb 2014 19:11:21 +0000 (20:11 +0100)]
frame: add a function for removing side data from a frame

6 years agoavconv: add stream-global side data to the first demuxed packet
Anton Khirnov [Wed, 19 Feb 2014 17:49:48 +0000 (18:49 +0100)]
avconv: add stream-global side data to the first demuxed packet

6 years agolibavcodec: when decoding, copy replaygain side data to decoded frames
Anton Khirnov [Wed, 19 Feb 2014 17:52:26 +0000 (18:52 +0100)]
libavcodec: when decoding, copy replaygain side data to decoded frames

6 years agoAdd replaygain side data type and code for parsing replaygain tags.
Anton Khirnov [Wed, 19 Feb 2014 14:29:06 +0000 (15:29 +0100)]
Add replaygain side data type and code for parsing replaygain tags.

6 years agolavf: add an AVStream field for exporting stream-global side data
Anton Khirnov [Wed, 19 Feb 2014 11:10:32 +0000 (12:10 +0100)]
lavf: add an AVStream field for exporting stream-global side data

6 years agolavc: give a typedeffed name to the AVPacket.side_data struct
Anton Khirnov [Wed, 19 Feb 2014 11:00:03 +0000 (12:00 +0100)]
lavc: give a typedeffed name to the AVPacket.side_data struct