ffmpeg.git
6 years agolavfi/overlay: yuv444p & yuva444p support
Paul B Mahol [Mon, 11 Feb 2013 17:15:07 +0000 (17:15 +0000)]
lavfi/overlay: yuv444p & yuva444p support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoh264: put visualization and debug support back
Michael Niedermayer [Tue, 19 Feb 2013 01:47:47 +0000 (02:47 +0100)]
h264: put visualization and debug support back

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: make ff_print_debug_info independant of mpegvideo
Michael Niedermayer [Tue, 19 Feb 2013 01:46:05 +0000 (02:46 +0100)]
mpegvideo: make ff_print_debug_info independant of mpegvideo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosplit out ff_hwaccel_pixfmt_list_420[] over individual codecs.
Ronald S. Bultje [Mon, 18 Feb 2013 16:15:52 +0000 (08:15 -0800)]
split out ff_hwaccel_pixfmt_list_420[] over individual codecs.

Not all hwaccels implement all codecs, so using one single list for
multiple such codecs means some codecs will be represented in the list,
even though they don't actually handle that codec. Copying specific
lists in each codec fixes that.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/histogram: overlay display mode for levels histogram mode
Paul B Mahol [Mon, 18 Feb 2013 20:12:07 +0000 (20:12 +0000)]
lavfi/histogram: overlay display mode for levels histogram mode

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agonutenc: only write an index if there are syncpoints
Michael Niedermayer [Mon, 18 Feb 2013 19:51:54 +0000 (20:51 +0100)]
nutenc: only write an index if there are syncpoints

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_gen_search: Fix finding the maximum timestamp in a really small file
Michael Niedermayer [Mon, 18 Feb 2013 19:18:19 +0000 (20:18 +0100)]
ff_gen_search: Fix finding the maximum timestamp in a really small file

Fixes Assertion failure

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_read_timestamp: check stream_index before using it as array index
Michael Niedermayer [Mon, 18 Feb 2013 18:48:44 +0000 (19:48 +0100)]
ff_read_timestamp: check stream_index before using it as array index

Fixes out of array read

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocdgraphics: set palette to zero too
Paul B Mahol [Mon, 18 Feb 2013 16:37:32 +0000 (16:37 +0000)]
cdgraphics: set palette to zero too

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavc/cdxl: clear palette before reading it
Paul B Mahol [Mon, 18 Feb 2013 16:19:27 +0000 (16:19 +0000)]
lavc/cdxl: clear palette before reading it

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agox86/dsputil: fix compilation when h263 decoder/encoder are disabled.
Ronald S. Bultje [Mon, 18 Feb 2013 02:20:17 +0000 (18:20 -0800)]
x86/dsputil: fix compilation when h263 decoder/encoder are disabled.

The symbol "ff_h263_loop_filter_strength" is defined in h263.c, but
the h263 loopfilter functions (in the .asm file) are not optimized
out (even though their function pointers are never assigned).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264/svq3: stop using draw_edges.
Ronald S. Bultje [Mon, 18 Feb 2013 01:01:26 +0000 (17:01 -0800)]
h264/svq3: stop using draw_edges.

Instead, only extend edges on-demand when the motion vector actually
crosses the visible decoded area using ff_emulated_edge_mc(). This
changes decoding time for cathedral from 8.722sec to 8.706sec, i.e.
0.2% faster overall. More generally (VP8 uses this also), low-motion
content gets significant speed improvements, whereas high-motion content
tends to decode in approximately the same time.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/showspectrum: add divVerent in the (c) for his recent work on the filter.
Clément Bœsch [Mon, 18 Feb 2013 12:34:37 +0000 (13:34 +0100)]
lavf/showspectrum: add divVerent in the (c) for his recent work on the filter.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 18 Feb 2013 12:00:46 +0000 (13:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  svq3: unbreak decoding

No change to the code as this fix was already part of FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b'
Michael Niedermayer [Mon, 18 Feb 2013 11:55:31 +0000 (12:55 +0100)]
Merge commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b'

* commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b':
  build: make audio_frame_queue a stand-alone component

Conflicts:
configure
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '870a0c669e536d56c6325d84f65e34c53792398e'
Michael Niedermayer [Mon, 18 Feb 2013 11:29:31 +0000 (12:29 +0100)]
Merge commit '870a0c669e536d56c6325d84f65e34c53792398e'

* commit '870a0c669e536d56c6325d84f65e34c53792398e':
  build: The libopencore-amrnb encoder depends on audio_frame_queue

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8837f4396a1a458a0efb07fe7daba7b847755a7a'
Michael Niedermayer [Mon, 18 Feb 2013 11:20:12 +0000 (12:20 +0100)]
Merge commit '8837f4396a1a458a0efb07fe7daba7b847755a7a'

* commit '8837f4396a1a458a0efb07fe7daba7b847755a7a':
  libopencore-amrwb: Make AMR-WB ifdeffery more precise

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e6bda9a9fd86505927a2e095e495eae104860701'
Michael Niedermayer [Mon, 18 Feb 2013 11:15:07 +0000 (12:15 +0100)]
Merge commit 'e6bda9a9fd86505927a2e095e495eae104860701'

* commit 'e6bda9a9fd86505927a2e095e495eae104860701':
  libopencore-amr: Conditionally compile decoder and encoder bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17'
Michael Niedermayer [Mon, 18 Feb 2013 11:10:46 +0000 (12:10 +0100)]
Merge commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17'

* commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17':
  libopencore-amrnb: cosmetics: Group all encoder-related code together

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0b70fb1d518cbd796545fd6eef02772cd0d892c7'
Michael Niedermayer [Mon, 18 Feb 2013 10:32:07 +0000 (11:32 +0100)]
Merge commit '0b70fb1d518cbd796545fd6eef02772cd0d892c7'

* commit '0b70fb1d518cbd796545fd6eef02772cd0d892c7':
  dsputil: convert remaining op_pixels_func

No changes to the code as all these fixes already existed in FFmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '488f87be873506abb01d67708a67c10a4dd29283'
Michael Niedermayer [Mon, 18 Feb 2013 10:26:53 +0000 (11:26 +0100)]
Merge commit '488f87be873506abb01d67708a67c10a4dd29283'

* commit '488f87be873506abb01d67708a67c10a4dd29283':
  roqvideodec: check dimensions validity
  vqavideo: check chunk sizes before reading chunks
  qdm2: check array index before use, fix out of array accesses

Conflicts:
libavcodec/qdm2.c
libavcodec/roqvideodec.c
libavcodec/vqavideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosvq3: unbreak decoding
Matti Hamalainen [Mon, 18 Feb 2013 01:55:07 +0000 (02:55 +0100)]
svq3: unbreak decoding

a7d2861d36756b913e85681b86ed3385274e8ced removed necessary braces.

6 years agoh264: don't store intra pcm samples in h->mb.
Ronald S. Bultje [Sun, 17 Feb 2013 22:52:24 +0000 (14:52 -0800)]
h264: don't store intra pcm samples in h->mb.

Instead, keep them in the bitstream buffer until we read them verbatim,
this saves a memcpy() and a subsequent clearing of the target buffer.
decode_cabac+decode_mb for a sample file (CAPM3_Sony_D.jsv) goes from
6121.4 to 6095.5 cycles, i.e. 26 cycles faster.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agov4l2: try to fix build on BSD
Michael Niedermayer [Sun, 17 Feb 2013 23:46:03 +0000 (00:46 +0100)]
v4l2: try to fix build on BSD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/noise: switch to AVLFG noise generator
Paul B Mahol [Sun, 17 Feb 2013 21:05:33 +0000 (21:05 +0000)]
lavfi/noise: switch to AVLFG noise generator

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoh264: don't initialize missing pictures when using VDPAU.
Carl Eugen Hoyos [Sun, 17 Feb 2013 21:33:40 +0000 (22:33 +0100)]
h264: don't initialize missing pictures when using VDPAU.

This fixes an assertion failure when running mplayer -vc ffh264vdpau.

Reported by irc user ioni.

6 years agoh264: avoid calling get_format() multiple times
Michael Niedermayer [Sun, 17 Feb 2013 19:41:16 +0000 (20:41 +0100)]
h264: avoid calling get_format() multiple times

Some applications do not like that.
Fixes VDA
Reduces noise for VDPAU

Tested-by: Guillaume POIRIER <poirierg@gmail.com>
Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: make audio_frame_queue a stand-alone component
Luca Barbato [Sun, 17 Feb 2013 21:00:36 +0000 (22:00 +0100)]
build: make audio_frame_queue a stand-alone component

Encoders requiring it have the dependency expressed in the
configure.

6 years agoRevert "swfenc: use av_get_audio_frame_duration() instead of AVCodecContext.frame_size"
Carl Eugen Hoyos [Sun, 17 Feb 2013 18:56:09 +0000 (19:56 +0100)]
Revert "swfenc: use av_get_audio_frame_duration() instead of AVCodecContext.frame_size"

This reverts commit 620b88a302d522f71a6a95aff500cf7bd8520043.

Fixes ticket #2272.

Conflicts:
libavformat/swfenc.c

6 years agoAdd yvu410 as a supported v4l2 input format.
Carl Eugen Hoyos [Sun, 17 Feb 2013 18:45:58 +0000 (19:45 +0100)]
Add yvu410 as a supported v4l2 input format.

6 years agoAdd gray16 as a supported v4l2 input format.
Carl Eugen Hoyos [Sun, 17 Feb 2013 18:44:13 +0000 (19:44 +0100)]
Add gray16 as a supported v4l2 input format.

6 years agofate: add print() to the tests of eval
Michael Niedermayer [Sun, 17 Feb 2013 16:16:30 +0000 (17:16 +0100)]
fate: add print() to the tests of eval

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoeval: print() support
Michael Niedermayer [Fri, 25 Jan 2013 16:51:56 +0000 (17:51 +0100)]
eval: print() support

This allows printing values via av_log from expressions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoOnly set accelerated arm fft functions if fft is enabled.
Carl Eugen Hoyos [Sun, 17 Feb 2013 16:29:55 +0000 (17:29 +0100)]
Only set accelerated arm fft functions if fft is enabled.

Fixes lavc compilation (linking) for configurations without fft.

Reported-by: tyler wear
Tested-by: Gavin Kinsey
6 years agodoc/codecs: simple sub_charenc option documentation.
Clément Bœsch [Sun, 17 Feb 2013 15:58:08 +0000 (16:58 +0100)]
doc/codecs: simple sub_charenc option documentation.

6 years agodoc/examples: do not allocate AVFrame directly.
Nicolas George [Sat, 16 Feb 2013 10:36:32 +0000 (11:36 +0100)]
doc/examples: do not allocate AVFrame directly.

The size of the AVFrame structure is not part of the ABI;
it can grow with later versions. Therefore, applications
are not supposed to allocate AVFrame directly, they are
supposed to use avcodec_alloc_frame() instead.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 17 Feb 2013 13:24:01 +0000 (14:24 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  error_resilience: add required headers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/subtitles: error out in case of bitmap subtitles.
Clément Bœsch [Sun, 17 Feb 2013 12:33:52 +0000 (13:33 +0100)]
lavf/subtitles: error out in case of bitmap subtitles.

6 years agolavc: fix codec_descriptor and pkt_timebase doxy.
Clément Bœsch [Sun, 17 Feb 2013 12:28:20 +0000 (13:28 +0100)]
lavc: fix codec_descriptor and pkt_timebase doxy.

6 years agotests: fix values for the unsharp test
Stefano Sabatini [Sun, 17 Feb 2013 12:11:33 +0000 (13:11 +0100)]
tests: fix values for the unsharp test

Set odd size for unsharp matrices, even values are not accepted.

6 years agolavc/utils: reindent in avcodec_decode_subtitle2() after f7963993.
Clément Bœsch [Sun, 17 Feb 2013 12:08:30 +0000 (13:08 +0100)]
lavc/utils: reindent in avcodec_decode_subtitle2() after f7963993.

6 years agolavfi/subtitles: set a different description between ass and subtitles.
Clément Bœsch [Sun, 17 Feb 2013 11:33:55 +0000 (12:33 +0100)]
lavfi/subtitles: set a different description between ass and subtitles.

6 years agolavfi: rename vf_ass.c to vf_subtitles.c
Clément Bœsch [Mon, 31 Dec 2012 10:18:29 +0000 (11:18 +0100)]
lavfi: rename vf_ass.c to vf_subtitles.c

6 years agolavfi/subtitles: support charenc option.
Clément Bœsch [Mon, 31 Dec 2012 10:15:59 +0000 (11:15 +0100)]
lavfi/subtitles: support charenc option.

6 years agolavfi/subtitles: split options between ass and subtitles.
Clément Bœsch [Mon, 31 Dec 2012 10:07:29 +0000 (11:07 +0100)]
lavfi/subtitles: split options between ass and subtitles.

6 years agolavc: support subtitles character encoding conversion.
Clément Bœsch [Mon, 7 Jan 2013 17:08:56 +0000 (18:08 +0100)]
lavc: support subtitles character encoding conversion.

6 years agobuild: The libopencore-amrnb encoder depends on audio_frame_queue
Diego Biurrun [Sat, 16 Feb 2013 22:05:05 +0000 (23:05 +0100)]
build: The libopencore-amrnb encoder depends on audio_frame_queue

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolibopencore-amrwb: Make AMR-WB ifdeffery more precise
Diego Biurrun [Sat, 16 Feb 2013 22:05:04 +0000 (23:05 +0100)]
libopencore-amrwb: Make AMR-WB ifdeffery more precise

The library might provide an encoder in the future, so it's better to
check for the presence of the decoder rather than just the library.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolibopencore-amr: Conditionally compile decoder and encoder bits
Diego Biurrun [Sat, 16 Feb 2013 22:05:03 +0000 (23:05 +0100)]
libopencore-amr: Conditionally compile decoder and encoder bits

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolibopencore-amrnb: cosmetics: Group all encoder-related code together
Diego Biurrun [Sat, 16 Feb 2013 22:05:02 +0000 (23:05 +0100)]
libopencore-amrnb: cosmetics: Group all encoder-related code together

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agodsputil: convert remaining op_pixels_func
Luca Barbato [Sat, 9 Feb 2013 23:17:20 +0000 (00:17 +0100)]
dsputil: convert remaining op_pixels_func

Convert to diffptr_t the line_size parameters still int.

Remove all the warnings in dsputil.c

6 years agolavc: mark bitmap based subtitles codecs as such.
Clément Bœsch [Sat, 5 Jan 2013 10:06:31 +0000 (11:06 +0100)]
lavc: mark bitmap based subtitles codecs as such.

6 years agolavfi/mp: drop mp=kerndeint filter
Stefano Sabatini [Sun, 17 Feb 2013 10:22:13 +0000 (11:22 +0100)]
lavfi/mp: drop mp=kerndeint filter

The filter has been natively integrated into libavfilter.

6 years agolavfi/mp: drop mp=unsharp filter
Stefano Sabatini [Fri, 15 Feb 2013 13:26:07 +0000 (14:26 +0100)]
lavfi/mp: drop mp=unsharp filter

The native filter is equivalent from the point of view of the features
and of performances.

6 years agolavfi/unsharp: add missing NULL check
Stefano Sabatini [Fri, 15 Feb 2013 13:22:21 +0000 (14:22 +0100)]
lavfi/unsharp: add missing NULL check

6 years agolavfi/unsharp: merge definition and declaration in init_filter_param()
Stefano Sabatini [Fri, 15 Feb 2013 13:19:13 +0000 (14:19 +0100)]
lavfi/unsharp: merge definition and declaration in init_filter_param()

6 years agolavfi/unsharp: directly access in-loop variables in apply_unsharp()
Stefano Sabatini [Sat, 16 Feb 2013 15:55:55 +0000 (16:55 +0100)]
lavfi/unsharp: directly access in-loop variables in apply_unsharp()

Increase performance, to match mp=unsharp.

6 years agolavfi/unsharp: add check on matrix x/y size values oddity
Stefano Sabatini [Fri, 15 Feb 2013 13:18:02 +0000 (14:18 +0100)]
lavfi/unsharp: add check on matrix x/y size values oddity

6 years agoroqvideodec: check dimensions validity
Michael Niedermayer [Thu, 29 Nov 2012 14:18:17 +0000 (15:18 +0100)]
roqvideodec: check dimensions validity

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3ae610451170cd5a28b33950006ff0bd23036845)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fee26d352a52eb9f7fcd8d9167fb4a5ba015b612)

CC: libav-stable@libav.org
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agovqavideo: check chunk sizes before reading chunks
Michael Niedermayer [Fri, 25 Jan 2013 05:11:59 +0000 (06:11 +0100)]
vqavideo: check chunk sizes before reading chunks

Fixes out of array writes

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ab6c9332bfa1e20127a16392a0b85a4aa4840889)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 13093f9767b922661132a3c1f4b5ba2c7338b660)

CC: libav-stable@libav.org
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoqdm2: check array index before use, fix out of array accesses
Michael Niedermayer [Fri, 30 Nov 2012 22:59:40 +0000 (23:59 +0100)]
qdm2: check array index before use, fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a7ee6281f7ef1c29284e3a4cadfe0f227ffde1ed)

CC: libav-stable@libav.org
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoerror_resilience: add required headers.
Anton Khirnov [Sat, 16 Feb 2013 19:58:18 +0000 (20:58 +0100)]
error_resilience: add required headers.

6 years agoChangelog: Add entry for encrypted TTA stream decoding
James Almer [Sat, 16 Feb 2013 07:49:50 +0000 (04:49 -0300)]
Changelog: Add entry for encrypted TTA stream decoding

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/tta: Use a safer check for encrypted streams
James Almer [Sat, 16 Feb 2013 04:12:30 +0000 (01:12 -0300)]
lavc/tta: Use a safer check for encrypted streams

The user can provide a password even when the stream
is not encrypted, so check the value of s->format
instead of s->pass in ttafilter_init().

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: don't initialize missing pictures when using a hwaccel
Hendrik Leppkes [Sat, 16 Feb 2013 23:25:34 +0000 (00:25 +0100)]
h264: don't initialize missing pictures when using a hwaccel

Writing into uninitialized hw surfaces is not supported and triggers an assert inside avpriv_color_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: Fix checkheaders for x86/emms.h
James Almer [Sat, 16 Feb 2013 03:56:14 +0000 (00:56 -0300)]
lavu: Fix checkheaders for x86/emms.h

internal.h doesn't need to include cpu.h anymore since
the relevant code was moved to x86/emms.h

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 16 Feb 2013 20:14:00 +0000 (21:14 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: deMpegEncContextize

Conflicts:
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb_template.c
libavcodec/h264_parser.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/h264_sei.c
libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885'
Michael Niedermayer [Sat, 16 Feb 2013 18:00:39 +0000 (19:00 +0100)]
Merge commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885'

* commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885':
  mpegvideo: split ff_draw_horiz_band().

Conflicts:
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'
Michael Niedermayer [Sat, 16 Feb 2013 17:46:28 +0000 (18:46 +0100)]
Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'

* commit '54974c62982ae827becdbdb9b620b7ba75d079a0':
  error_resilience: decouple ER from MpegEncContext

Conflicts:
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoChangelog: add missing empty line after the version line
Stefano Sabatini [Sat, 16 Feb 2013 15:01:01 +0000 (16:01 +0100)]
Changelog: add missing empty line after the version line

6 years agoMerge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc'
Michael Niedermayer [Sat, 16 Feb 2013 13:30:21 +0000 (14:30 +0100)]
Merge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc'

* commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc':
  svq3: remove a pointless if()
  h264: remove a pointless if()

Conflicts:
libavcodec/h264.c
libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '68f930d2188aba5b32624887dcbf688c23482834'
Michael Niedermayer [Sat, 16 Feb 2013 13:13:20 +0000 (14:13 +0100)]
Merge commit '68f930d2188aba5b32624887dcbf688c23482834'

* commit '68f930d2188aba5b32624887dcbf688c23482834':
  h264: simplify calls to ff_er_add_slice().

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocinepack: print an error if cinepak_decode() failed
Michael Niedermayer [Sat, 16 Feb 2013 12:49:04 +0000 (13:49 +0100)]
cinepack: print an error if cinepak_decode() failed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyadif: remove unused variable
Michael Niedermayer [Sat, 16 Feb 2013 12:24:43 +0000 (13:24 +0100)]
yadif: remove unused variable

Found by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'
Michael Niedermayer [Sat, 16 Feb 2013 12:13:42 +0000 (13:13 +0100)]
Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'

* commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793':
  get_buffer(): do not initialize the data.

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: color frames gray
Michael Niedermayer [Sat, 16 Feb 2013 11:13:48 +0000 (12:13 +0100)]
h264: color frames gray

This prevents a regression from the removial of the buffer
initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: add avpriv_color_frame()
Michael Niedermayer [Sat, 16 Feb 2013 11:13:27 +0000 (12:13 +0100)]
avcodec: add avpriv_color_frame()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: port MP noise filter
Paul B Mahol [Sun, 10 Feb 2013 15:18:30 +0000 (15:18 +0000)]
lavfi: port MP noise filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agompegvideo_enc: draw edges on input
Michael Niedermayer [Sat, 16 Feb 2013 09:44:38 +0000 (10:44 +0100)]
mpegvideo_enc: draw edges on input

Improves Motion estimation, avoids using out of picture areas for %16 != 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'
Michael Niedermayer [Sat, 16 Feb 2013 08:03:58 +0000 (09:03 +0100)]
Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'

* commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82':
  vf_yadif: fix out-of line reads

Conflicts:
libavfilter/vf_yadif.c
tests/ref/fate/filter-yadif-mode0
tests/ref/fate/filter-yadif-mode1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13'
Michael Niedermayer [Sat, 16 Feb 2013 07:48:45 +0000 (08:48 +0100)]
Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13'

* commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13':
  vf_yadif: factorize initializing the filtering callbacks

Conflicts:
libavfilter/vf_yadif.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 16 Feb 2013 02:03:29 +0000 (03:03 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: only display frames if there are no pending events
  ffplay: remove remains of video_clock
  ffplay: remove refresh thread to achieve more precise frame delay

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/yadif: support 9, 12, and 14 bits per pixel
James Darnley [Fri, 15 Feb 2013 22:48:31 +0000 (23:48 +0100)]
lavfi/yadif: support 9, 12, and 14 bits per pixel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/yadif: remove unnecessary cast
James Darnley [Fri, 15 Feb 2013 22:48:30 +0000 (23:48 +0100)]
lavfi/yadif: remove unnecessary cast

Finish what 99162f8 started

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/kerndeint: move is_rgb_packed definition to the internal context
Stefano Sabatini [Fri, 15 Feb 2013 18:44:08 +0000 (19:44 +0100)]
lavfi/kerndeint: move is_rgb_packed definition to the internal context

No need to recompute it for each new frame.

6 years agolavfi/kerndeint: use aligned linesizes for the temporary buffer.
Clément Bœsch [Sun, 6 Jan 2013 18:34:16 +0000 (19:34 +0100)]
lavfi/kerndeint: use aligned linesizes for the temporary buffer.

This improves the performances just enough to match mp=kerndeint.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavfi/unsharp: extend range for amount values, to reflect the behavior of mp=unsharp
Stefano Sabatini [Fri, 15 Feb 2013 13:06:05 +0000 (14:06 +0100)]
lavfi/unsharp: extend range for amount values, to reflect the behavior of mp=unsharp

Also update the documentation accordingly, and suggest a meaningful range.

6 years agodoc/filters: itemize unsharp examples
Stefano Sabatini [Fri, 15 Feb 2013 01:07:02 +0000 (02:07 +0100)]
doc/filters: itemize unsharp examples

Also drop pointless example.

6 years agolavfi/unsharp: use named options, and add missing checks on matrix size values
Stefano Sabatini [Fri, 12 Aug 2011 23:08:48 +0000 (01:08 +0200)]
lavfi/unsharp: use named options, and add missing checks on matrix size values

In particular, avoid out-of-buffer access and crashes with too big
values, and rework documentation accordingly.

6 years agosws/x86: improve rounding for yuv2yuvX
Michael Niedermayer [Fri, 15 Feb 2013 20:08:51 +0000 (21:08 +0100)]
sws/x86: improve rounding for yuv2yuvX

This tries to compensate for the errors introduced by
the rounding of pmulhw

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/kerndeint: use av_pix_fmt_desc_get instead of directly accessing the table
Hendrik Leppkes [Fri, 15 Feb 2013 14:53:54 +0000 (15:53 +0100)]
lavfi/kerndeint: use av_pix_fmt_desc_get instead of directly accessing the table

Fixes FATE in MSVC DLL builds.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: fix reference to ffmpeg-bitstream-filters.html page
Stefano Sabatini [Fri, 15 Feb 2013 12:31:09 +0000 (13:31 +0100)]
doc: fix reference to ffmpeg-bitstream-filters.html page

6 years agolavfi/ebur128: advance pointer to samples
sedacca@comcast.net [Fri, 18 Jan 2013 05:14:01 +0000 (05:14 +0000)]
lavfi/ebur128: advance pointer to samples

Correct the advancement of a pointer to skip over LFE samples as
intended in the loudness computation.

This suggested patch is 3 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
This suggested patch supersedes the contribution of January 15, 2013
in the thread “[PATCH] lavfi: EBU R.128 irreg time, ch weights, skip
LFE” which combined multiple fixes in one batch.

6 years agolavfi/ebur128: fix channel weights
David A. Sedacca [Sat, 19 Jan 2013 20:24:53 +0000 (20:24 +0000)]
lavfi/ebur128: fix channel weights

Correct the recognition of channel layouts for good channel weight
in the loudness computation.
This suggested patch is 2 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".

Signed-off-by: David A. Sedacca <sedacca at comcast.net>
6 years agoh264: deMpegEncContextize
Anton Khirnov [Sun, 3 Feb 2013 10:10:05 +0000 (11:10 +0100)]
h264: deMpegEncContextize

Most of the changes are just trivial are just trivial replacements of
fields from MpegEncContext with equivalent fields in H264Context.
Everything in h264* other than h264.c are those trivial changes.

The nontrivial parts are:
1) extracting a simplified version of the frame management code from
   mpegvideo.c. We don't need last/next_picture anymore, since h264 uses
   its own more complex system already and those were set only to appease
   the mpegvideo parts.
2) some tables that need to be allocated/freed in appropriate places.
3) hwaccels -- mostly trivial replacements.
   for dxva, the draw_horiz_band() call is moved from
   ff_dxva2_common_end_frame() to per-codec end_frame() callbacks,
   because it's now different for h264 and MpegEncContext-based
   decoders.
4) svq3 -- it does not use h264 complex reference system, so I just
   added some very simplistic frame management instead and dropped the
   use of ff_h264_frame_start(). Because of this I also had to move some
   initialization code to svq3.

Additional fixes for chroma format and bit depth changes by
Janne Grunau <janne-libav@jannau.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agompegvideo: split ff_draw_horiz_band().
Anton Khirnov [Sun, 3 Feb 2013 13:26:34 +0000 (14:26 +0100)]
mpegvideo: split ff_draw_horiz_band().

Split out dependency on MpegEncContext.

6 years agoerror_resilience: decouple ER from MpegEncContext
Anton Khirnov [Sat, 2 Feb 2013 19:42:07 +0000 (20:42 +0100)]
error_resilience: decouple ER from MpegEncContext

6 years agosvq3: remove a pointless if()
Anton Khirnov [Mon, 4 Feb 2013 10:21:10 +0000 (11:21 +0100)]
svq3: remove a pointless if()

The H264 context is always uninitialized at this point.

6 years agoh264: remove a pointless if()
Anton Khirnov [Sun, 3 Feb 2013 09:21:39 +0000 (10:21 +0100)]
h264: remove a pointless if()

!encoding is always true, we do not have a H.264 encoder

6 years agoh264: simplify calls to ff_er_add_slice().
Anton Khirnov [Sat, 2 Feb 2013 14:18:00 +0000 (15:18 +0100)]
h264: simplify calls to ff_er_add_slice().

partitioned_frame is never set for h264 (as easily seen from git grep).