OSDN Git Service

android-x86/external-ffmpeg.git
12 years agoaacdec: update debug code to always print the processed data.
Reimar Döffinger [Sun, 8 Apr 2012 22:17:25 +0000 (00:17 +0200)]
aacdec: update debug code to always print the processed data.

When decoding LATM, this function will not process extradata
but a different buffer.
It seems this was forgotten to update when LATM support
was added.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoAdd v408 codec regression test.
Reimar Döffinger [Sun, 8 Apr 2012 14:19:06 +0000 (16:19 +0200)]
Add v408 codec regression test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoAdd roqaudio regression test.
Reimar Döffinger [Sun, 8 Apr 2012 19:10:44 +0000 (21:10 +0200)]
Add roqaudio regression test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 8 Apr 2012 18:55:02 +0000 (20:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtsp: Don't use av_malloc(0) if there are no streams
  rtsp: Don't use uninitialized data if there are no streams
  vaapi: mpeg2: fix slice_vertical_position calculation.
  hwaccel: mpeg2: decode first field, if requested.
  cosmetics: Fix indentation
  rtsp: Don't expose the MS-RTSP RTX data stream to the caller

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoAllow running fate-wmv8-x8intra manually.
Reimar Döffinger [Sun, 8 Apr 2012 17:59:59 +0000 (19:59 +0200)]
Allow running fate-wmv8-x8intra manually.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoAllow manually running disabled FATE tests.
Reimar Döffinger [Sun, 8 Apr 2012 17:55:49 +0000 (19:55 +0200)]
Allow manually running disabled FATE tests.

This makes it easy to allow people to run tests that are disabled
(e.g. because they are broken) without having to hack Makefiles
by adding the test name to FATE_TESTS-no.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoFix nellymoser encoder crash with hardcoded tables.
Reimar Döffinger [Sun, 8 Apr 2012 18:25:08 +0000 (20:25 +0200)]
Fix nellymoser encoder crash with hardcoded tables.

Use the correct init function to avoid crashes due to writing
to a rodata location.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoUpdate reference for disabled fate-wmv8-x8intra test to new format.
Reimar Döffinger [Sun, 8 Apr 2012 17:59:20 +0000 (19:59 +0200)]
Update reference for disabled fate-wmv8-x8intra test to new format.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoffv1: set slice geometry based on user specified slices.
Michael Niedermayer [Sun, 8 Apr 2012 15:03:38 +0000 (17:03 +0200)]
ffv1: set slice geometry based on user specified slices.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffv1: allow enabling of version 2 by using some of its features.
Michael Niedermayer [Sun, 8 Apr 2012 14:46:36 +0000 (16:46 +0200)]
ffv1: allow enabling of version 2 by using some of its features.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffv1: fix version=2 chroma handling
Michael Niedermayer [Sun, 8 Apr 2012 13:03:40 +0000 (15:03 +0200)]
ffv1: fix version=2 chroma handling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffv1: add a minor version field beginning with ffv1.3
Michael Niedermayer [Sun, 8 Apr 2012 12:20:17 +0000 (14:20 +0200)]
ffv1: add a minor version field beginning with ffv1.3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agortsp: Don't use av_malloc(0) if there are no streams
Martin Storsjö [Fri, 6 Apr 2012 19:36:16 +0000 (22:36 +0300)]
rtsp: Don't use av_malloc(0) if there are no streams

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agortsp: Don't use uninitialized data if there are no streams
Martin Storsjö [Fri, 6 Apr 2012 19:35:48 +0000 (22:35 +0300)]
rtsp: Don't use uninitialized data if there are no streams

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoFix side-data memleak also for audio.
Reimar Döffinger [Sun, 8 Apr 2012 10:09:55 +0000 (12:09 +0200)]
Fix side-data memleak also for audio.

This uses the same code as in decode_video also in decode_audio.
Should fix valgrind FATE failures for nellymoser encode test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agovaapi: mpeg2: fix slice_vertical_position calculation.
Gwenole Beauchesne [Sun, 18 Mar 2012 08:30:05 +0000 (09:30 +0100)]
vaapi: mpeg2: fix slice_vertical_position calculation.

VASliceParameterBufferMPEG2.slice_vertical_position shall express
the slice vertical position from the original bitstream. The HW
decoder will correctly decode to the right line computed from the
appropriate top_field_first and is_first_field flags.

This patch aligns with DXVA's definition, which is what most HW and
drivers expect. In particular, Intel PowerVR (Cedarview et al.) and
NVIDIA (through VA-to-VDPAU layer). Since it looks more complex to fix
binary drivers, I aligned the Intel Gen driver (Sandy Bridge et al.)
to this behaviour, while maintaining compatibility with codec layers
not providing this patch yet.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agohwaccel: mpeg2: decode first field, if requested.
Gwenole Beauchesne [Sun, 18 Mar 2012 08:46:58 +0000 (09:46 +0100)]
hwaccel: mpeg2: decode first field, if requested.

If user opted to present fields as they come, then the first field
picture needs to be submitted to the HW for decoding. In particular,
this fixes MPEG-2 decoding of interlaced streams.

Tested on Intel Cedar Trail, Sandy Bridge and Ivy Bridge platforms.
Someone reported on the ffmpeg-devel@ list this also works on DXVA
(Windows) and other Linux platforms (NVIDIA, through the VA wrapper).

This also means a similar patch to non-hwaccel VDPAU may be necessary.

Note: I believe the SLICE_FLAG_ALLOW_FIELD is useless since the first
field shall always be submitted to the HW anyway. Nobody uses HW accels
(dxva, vaapi, vdpau, etc.) without that flag though.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agocosmetics: Fix indentation
Martin Storsjö [Sat, 7 Apr 2012 20:40:37 +0000 (23:40 +0300)]
cosmetics: Fix indentation

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agortsp: Don't expose the MS-RTSP RTX data stream to the caller
Martin Storsjö [Fri, 6 Apr 2012 20:07:12 +0000 (23:07 +0300)]
rtsp: Don't expose the MS-RTSP RTX data stream to the caller

This avoids exposing a dummy AVStream which won't get any data
and which will make avformat_find_stream_info wait for info about
this stream.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agompegtsenc: Add support to mux s302 stream
Thierry Foucu [Sun, 8 Apr 2012 07:44:14 +0000 (09:44 +0200)]
mpegtsenc: Add support to mux s302 stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoconfigure: fix - vs _ error
Michael Niedermayer [Sat, 7 Apr 2012 22:59:22 +0000 (00:59 +0200)]
configure: fix - vs _ error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoAdd nellymoser "fuzzy" FATE test.
Reimar Döffinger [Sat, 7 Apr 2012 11:19:35 +0000 (13:19 +0200)]
Add nellymoser "fuzzy" FATE test.

Since we cannot specify decode parameters (and also because
it is better in principle) the 1-channel reference file
needs to be enabled, too.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoAllow setting CODEC_FLAG2_CHUNKS via the name "chunks".
Reimar Döffinger [Sat, 7 Apr 2012 23:14:49 +0000 (01:14 +0200)]
Allow setting CODEC_FLAG2_CHUNKS via the name "chunks".

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoFixes for third argument do_image_formats.
Reimar Döffinger [Sat, 7 Apr 2012 19:31:11 +0000 (21:31 +0200)]
Fixes for third argument do_image_formats.

Remove it from two places where it is useless, do not apply
it to the encode command and make it apply to the output
instead of the input of the decode command.
Should fix the dpx test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoffprobe: use avbprint API
Stefano Sabatini [Sat, 7 Apr 2012 14:19:13 +0000 (16:19 +0200)]
ffprobe: use avbprint API

Simplify, increase robustness.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 7 Apr 2012 20:41:37 +0000 (22:41 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec_asf: Set the no_resync_search option for the chained asf demuxer
  asfdec: Add an option for not searching for the packet markers
  cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others
  cosmetics: Align codec declarations
  cosmetics: Convert mimic.c to utf-8
  avconv: remove an unused function parameter.
  avconv: remove now pointless variables.
  avconv: drop support for building without libavfilter.
  nellymoserenc: fix crash due to memsetting the wrong area.
  libavformat: Only require first packet to be known for audio/video streams
  avplay: Don't try to scale timestamps if the tb isn't set

Conflicts:
Changelog
configure
ffmpeg.c
libavcodec/aacenc.c
libavcodec/bmpenc.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/ffv1.c
libavcodec/flacenc.c
libavcodec/fraps.c
libavcodec/huffyuv.c
libavcodec/libopenjpegdec.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videodec.c
libavcodec/pamenc.c
libavcodec/pgssubdec.c
libavcodec/pngenc.c
libavcodec/qtrleenc.c
libavcodec/rawdec.c
libavcodec/sgienc.c
libavcodec/tiffenc.c
libavcodec/v210dec.c
libavcodec/wmv2dec.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoSupport detecting and demuxing EIA-608 subtitles in mov.
Reimar Döffinger [Sat, 7 Apr 2012 00:18:17 +0000 (02:18 +0200)]
Support detecting and demuxing EIA-608 subtitles in mov.

The format is slightly proprietary.
DVDs use a format of
code byte (0x00, 0x01, 0xfe or 0xff), two data bytes
MOV uses instead
cdat/cdt2 atom, two data bytes
Auto-detecting and supporting both in one decoder is trivial,
so a single codec ID is used.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agompeg4videodec: Force quant_precision to stay within the valid range.
Michael Niedermayer [Sat, 7 Apr 2012 17:53:51 +0000 (19:53 +0200)]
mpeg4videodec: Force quant_precision to stay within the valid range.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agowmalosslessdec: rawpcm_tile fixes to keep get_bits() values within defined range.
Michael Niedermayer [Sat, 7 Apr 2012 17:34:32 +0000 (19:34 +0200)]
wmalosslessdec: rawpcm_tile fixes to keep get_bits() values within defined range.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agowmalosslessdec: channel residues can be 32 bit thus need _long bitreader.
Michael Niedermayer [Sat, 7 Apr 2012 17:33:49 +0000 (19:33 +0200)]
wmalosslessdec: channel residues can be 32 bit thus need _long bitreader.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agompeg12dec: Prevent f_code from becoming invalid.
Michael Niedermayer [Sat, 7 Apr 2012 17:32:45 +0000 (19:32 +0200)]
mpeg12dec: Prevent f_code from becoming invalid.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoalsdec: Check k used for rice decoder.
Michael Niedermayer [Sat, 7 Apr 2012 15:25:47 +0000 (17:25 +0200)]
alsdec: Check k used for rice decoder.

Values that fail this check will cause failure of decode_rice()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoh264_ps: check log2_max_frame_num for validity.
Michael Niedermayer [Sat, 7 Apr 2012 15:02:36 +0000 (17:02 +0200)]
h264_ps: check log2_max_frame_num for validity.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agorv34: Fix check_slice_end() handling of 0 bits left case
Michael Niedermayer [Sat, 7 Apr 2012 14:49:17 +0000 (16:49 +0200)]
rv34: Fix check_slice_end() handling of 0 bits left case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agompeg4videodec: make sure f/b_code are not invalid values.
Michael Niedermayer [Sat, 7 Apr 2012 14:39:59 +0000 (16:39 +0200)]
mpeg4videodec: make sure f/b_code are not invalid values.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoget_bits: check the number of bits parameter through av_assert2()
Michael Niedermayer [Sat, 7 Apr 2012 14:04:09 +0000 (16:04 +0200)]
get_bits: check the number of bits parameter through av_assert2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovc1: fix incorrect show_bits() usage.
Michael Niedermayer [Sat, 7 Apr 2012 14:23:29 +0000 (16:23 +0200)]
vc1: fix incorrect show_bits() usage.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoput_bits: add av_assert2() to check out of array writes.
Michael Niedermayer [Sat, 7 Apr 2012 13:55:19 +0000 (15:55 +0200)]
put_bits: add av_assert2() to check out of array writes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoDo not decode the mp3 data in lavf test since that is not bit-exact.
Reimar Döffinger [Sat, 7 Apr 2012 14:33:43 +0000 (16:33 +0200)]
Do not decode the mp3 data in lavf test since that is not bit-exact.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agodcaenc: Allow encoding without specifying a channel_layout.
Reimar Döffinger [Sat, 7 Apr 2012 10:01:50 +0000 (12:01 +0200)]
dcaenc: Allow encoding without specifying a channel_layout.

It will print a warning, making the behaviour consistent
with the AC3 encoder.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoTest mp3 container muxing (and thus ID3 writing).
Reimar Döffinger [Fri, 6 Apr 2012 16:17:10 +0000 (18:17 +0200)]
Test mp3 container muxing (and thus ID3 writing).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoFix DCA regression test to work across architectures.
Reimar Döffinger [Sat, 7 Apr 2012 11:55:07 +0000 (13:55 +0200)]
Fix DCA regression test to work across architectures.

Only the decoding step is not bit-exact, so avoid checksum for that.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agodoc/muxers: add documentation for the md5 and framemd5 muxers
Stefano Sabatini [Sat, 7 Apr 2012 09:05:58 +0000 (11:05 +0200)]
doc/muxers: add documentation for the md5 and framemd5 muxers

Address trac ticket #1153.

12 years agodoc/muxers: clarify documentation for the framecrc muxer
Stefano Sabatini [Sat, 7 Apr 2012 08:44:07 +0000 (10:44 +0200)]
doc/muxers: clarify documentation for the framecrc muxer

Makes more explicit that framecrc works at the packet level, also prefers
the term "packet" over "frame" when it makes sense.

12 years agodoc/muxers: update documentation for the framecrc muxer
Stefano Sabatini [Sat, 7 Apr 2012 08:16:27 +0000 (10:16 +0200)]
doc/muxers: update documentation for the framecrc muxer

Add mention to the pts and duration log fields, added in
d2afbd9a56e4e863bad01923006dd9b77f747035.

Fix trac ticket #1159.

12 years agodoc/filters: remove reference to removed delogo wrapper
Stefano Sabatini [Sat, 7 Apr 2012 11:27:31 +0000 (13:27 +0200)]
doc/filters: remove reference to removed delogo wrapper

12 years agolavfi/mp: remove remove_logo wrapper
Stefano Sabatini [Sat, 7 Apr 2012 11:26:51 +0000 (13:26 +0200)]
lavfi/mp: remove remove_logo wrapper

removelogo has been ported to libavfilter, and the wrapper was not
working.

12 years agolavfi: port libmpcodecs remove-logo filter
Stefano Sabatini [Sat, 10 Mar 2012 13:01:28 +0000 (14:01 +0100)]
lavfi: port libmpcodecs remove-logo filter

The code is based on the remove-logo filter in MPlayer/libmpcodecs, by
Robert Edele, relicensed to LGPL with consent of the author.

Address trac issue #249.

12 years agofate: try to force le for the dpx decoder side too
Michael Niedermayer [Sat, 7 Apr 2012 10:47:10 +0000 (12:47 +0200)]
fate: try to force le for the dpx decoder side too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoAdd AAC FATE encode tests.
Reimar Döffinger [Fri, 6 Apr 2012 19:39:44 +0000 (21:39 +0200)]
Add AAC FATE encode tests.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoRemove AAC and nellymoser tests that do not work.
Reimar Döffinger [Sat, 7 Apr 2012 11:22:51 +0000 (13:22 +0200)]
Remove AAC and nellymoser tests that do not work.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoAdd tests for audio encoders: aac, dca, ra144 and nellymoser.
Reimar Döffinger [Fri, 6 Apr 2012 13:59:24 +0000 (15:59 +0200)]
Add tests for audio encoders: aac, dca, ra144 and nellymoser.

The PSNR values are of varying usefulness, though at least
the DTS and AAC ones are useful with the right shift value.
Note: due to usage of floats some of these may fail on other
architectures.
In that case they should be converted into a CMD = stddev
FATE test, but it seems useful to try this way first.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoaacenc: Fix issues with huge values of bit_rate.
Reimar Döffinger [Fri, 6 Apr 2012 13:25:05 +0000 (15:25 +0200)]
aacenc: Fix issues with huge values of bit_rate.

Do not pointlessly call ff_alloc_packet2 multiple times,
and fix an infinite loop by clamping the maximum
number of bits to target in the algorithm that does
not use lambda.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoproresenc_kostya: Mention likely ancestry in the license header.
Michael Niedermayer [Sat, 7 Apr 2012 09:02:27 +0000 (11:02 +0200)]
proresenc_kostya: Mention likely ancestry in the license header.

As the encoder contained the same bug and has similar structure
to anatoliys encoder, it is possibly based on it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoproresenc_kostya: fix encoded mantissa.
Michael Niedermayer [Sat, 7 Apr 2012 09:01:52 +0000 (11:01 +0200)]
proresenc_kostya: fix encoded mantissa.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoproresenc_anatoly: fix encoded mantissa.
Michael Niedermayer [Sat, 7 Apr 2012 09:00:00 +0000 (11:00 +0200)]
proresenc_anatoly: fix encoded mantissa.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoadpcmenc: fix encoded s_0 value.
Michael Niedermayer [Sat, 7 Apr 2012 08:12:58 +0000 (10:12 +0200)]
adpcmenc: fix encoded s_0 value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agobuild system: support setting avassert() assert_level
Michael Niedermayer [Sat, 7 Apr 2012 07:20:54 +0000 (09:20 +0200)]
build system: support setting avassert() assert_level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoput_bits: switch assert to av_assert2()
Michael Niedermayer [Sat, 7 Apr 2012 05:58:16 +0000 (07:58 +0200)]
put_bits: switch assert to av_assert2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agompegpsenc: fix user specified mux rate
Michael Niedermayer [Sat, 7 Apr 2012 05:56:11 +0000 (07:56 +0200)]
mpegpsenc: fix user specified mux rate

Fixes Ticket1175

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agofate: try to fix >8bit dpx reg test
Michael Niedermayer [Sat, 7 Apr 2012 04:53:39 +0000 (06:53 +0200)]
fate: try to fix >8bit dpx reg test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agortpdec_asf: Set the no_resync_search option for the chained asf demuxer
Martin Storsjö [Fri, 6 Apr 2012 13:58:48 +0000 (16:58 +0300)]
rtpdec_asf: Set the no_resync_search option for the chained asf demuxer

Searching for packet markers doesn't make sense for this use case,
where packets are fed one at a time to the demuxer.

This fixes playing back streams that have packets not starting
with the 0x82, 0x00, 0x00 marker.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoasfdec: Add an option for not searching for the packet markers
Martin Storsjö [Fri, 6 Apr 2012 13:54:23 +0000 (16:54 +0300)]
asfdec: Add an option for not searching for the packet markers

Some streams don't contain these.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agocosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others
Martin Storsjö [Fri, 6 Apr 2012 19:40:41 +0000 (22:40 +0300)]
cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 6 Apr 2012 20:52:01 +0000 (22:52 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: Align muxer/demuxer declarations
  mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning
  avcodec: remove avcodec_guess_channel_layout()
  avutil: Add av_get_default_channel_layout()

Conflicts:
doc/APIchanges
libavcodec/mpeg12.c
libavformat/cdg.c
libavformat/matroskaenc.c
libavformat/mpegts.c
libavformat/nuv.c
libavformat/wav.c
libavutil/audioconvert.c
libavutil/audioconvert.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocosmetics: Align codec declarations
Martin Storsjö [Fri, 6 Apr 2012 16:19:39 +0000 (19:19 +0300)]
cosmetics: Align codec declarations

Also break some long lines, remove codec function placeholder comments
and add spaces in sample/pixel format lists.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoexr: fix mixed declaration and statements.
Michael Niedermayer [Fri, 6 Apr 2012 09:17:23 +0000 (11:17 +0200)]
exr: fix mixed declaration and statements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocosmetics: Convert mimic.c to utf-8
Martin Storsjö [Fri, 6 Apr 2012 17:56:45 +0000 (20:56 +0300)]
cosmetics: Convert mimic.c to utf-8

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoavconv: remove an unused function parameter.
Anton Khirnov [Thu, 22 Mar 2012 09:26:43 +0000 (10:26 +0100)]
avconv: remove an unused function parameter.

12 years agoavconv: remove now pointless variables.
Anton Khirnov [Wed, 14 Mar 2012 08:20:17 +0000 (09:20 +0100)]
avconv: remove now pointless variables.

12 years agoavconv: drop support for building without libavfilter.
Anton Khirnov [Wed, 14 Mar 2012 08:10:41 +0000 (09:10 +0100)]
avconv: drop support for building without libavfilter.

Since the mandatory memcpy in vsrc_buffer has been eliminated, there
shouldn't be any significant reason to build without lavfi anymore.

This will make upcoming support for complex filtergraphs easier to do.

12 years agotiny_psnr: allow searching for optimal shift value.
Reimar Döffinger [Fri, 6 Apr 2012 16:42:07 +0000 (18:42 +0200)]
tiny_psnr: allow searching for optimal shift value.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agonellymoserenc: fix crash due to memsetting the wrong area.
Reimar Döffinger [Fri, 6 Apr 2012 13:26:35 +0000 (15:26 +0200)]
nellymoserenc: fix crash due to memsetting the wrong area.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agolibavformat: Only require first packet to be known for audio/video streams
Joakim Plate [Sat, 10 Sep 2011 22:33:20 +0000 (00:33 +0200)]
libavformat: Only require first packet to be known for audio/video streams

It can take a long time before subtitles or data streams show up,
so we shouldn't wait for those before assuming we have all info
for streams.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoAdd regression test for mov rtp hinting.
Reimar Döffinger [Fri, 6 Apr 2012 16:00:17 +0000 (18:00 +0200)]
Add regression test for mov rtp hinting.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agodpxenc: also test 10 and 16 bit formats.
Reimar Döffinger [Fri, 6 Apr 2012 15:56:45 +0000 (17:56 +0200)]
dpxenc: also test 10 and 16 bit formats.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agonellymoserenc: fix crash due to memsetting the wrong area.
Reimar Döffinger [Fri, 6 Apr 2012 13:26:35 +0000 (15:26 +0200)]
nellymoserenc: fix crash due to memsetting the wrong area.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoavplay: Don't try to scale timestamps if the tb isn't set
Martin Storsjö [Fri, 6 Apr 2012 10:51:34 +0000 (13:51 +0300)]
avplay: Don't try to scale timestamps if the tb isn't set

If get_filtered_video_frame failed above, tb might not be
initialized at all, so don't scale using it.

This fixes cases where avplay could crash if aborting
avformat_find_stream_info with ctrl+c.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agocosmetics: Align muxer/demuxer declarations
Martin Storsjö [Fri, 6 Apr 2012 14:50:48 +0000 (17:50 +0300)]
cosmetics: Align muxer/demuxer declarations

Also add missing trailing commas, break long codec_tag lines and
add spaces in codec_tag declarations.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agompeg12: Do not change frame_pred_frame_dct flag and demote error into a warning
Anne Aaron [Wed, 4 Apr 2012 18:36:00 +0000 (11:36 -0700)]
mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agodoc: image2: update docs for glob input patterns
Alexander Strasser [Thu, 5 Apr 2012 22:21:43 +0000 (00:21 +0200)]
doc: image2: update docs for glob input patterns

* adapt examples to new syntax
* mention that glob chars need to be enabled by a preceding % char
* note that globbing will be performed if both a printf and globbing
  pattern would be possible judging from the input pattern

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
12 years agoffmpeg: remove unused MetadataMap.
Clément Bœsch [Fri, 6 Apr 2012 12:23:42 +0000 (14:23 +0200)]
ffmpeg: remove unused MetadataMap.

This struct was forgotten after
e5df74dc56494068042f094d43a5d774c257ae69.

12 years agoffmpeg: remove unused meta_data_maps.
Clément Bœsch [Thu, 22 Mar 2012 10:13:15 +0000 (11:13 +0100)]
ffmpeg: remove unused meta_data_maps.

This is unused since a7b5e841ffe4b0f8423288965b8d069bd2a7a792.

12 years agos302m: Add Channle Layout for 6 channels
Thierry Foucu [Fri, 6 Apr 2012 04:43:18 +0000 (21:43 -0700)]
s302m: Add Channle Layout for 6 channels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovsrc_buffer: remove overwrite support.
Michael Niedermayer [Tue, 3 Apr 2012 16:58:03 +0000 (18:58 +0200)]
vsrc_buffer: remove overwrite support.

the overwrite flag became unused when merging support for buffering
multiple frames.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoREADME: be a tiny bit more verbose
Michael Niedermayer [Fri, 6 Apr 2012 08:23:26 +0000 (10:23 +0200)]
README: be a tiny bit more verbose

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoexr: various cleanup and security related fixes
Michael Niedermayer [Fri, 6 Apr 2012 06:17:10 +0000 (08:17 +0200)]
exr: various cleanup and security related fixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoexr: fix av_logs()
Michael Niedermayer [Fri, 6 Apr 2012 06:15:56 +0000 (08:15 +0200)]
exr: fix av_logs()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavc: add a OpenEXR decoder
Jimmy Christensen [Fri, 6 Apr 2012 04:02:25 +0000 (06:02 +0200)]
lavc: add a OpenEXR decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agofix fate tests after 76c79aa28fc8cf0bfe52915317a3cfc72383d0ef
Michael Niedermayer [Fri, 6 Apr 2012 06:28:56 +0000 (08:28 +0200)]
fix fate tests after 76c79aa28fc8cf0bfe52915317a3cfc72383d0ef

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomovdec: handle 0x7fff langcode as macintosh per the specs
Baptiste Coudurier [Wed, 21 Mar 2012 21:18:16 +0000 (14:18 -0700)]
movdec: handle 0x7fff langcode as macintosh per the specs

The correct point that seperates ISO and MAC language codes is 0x400
according to the current QT spec. Old QT specs did not list where this
seperation is but apparently only defined the meaning of the first 137.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoSupport yuva444p rawvideo in nut.
Carl Eugen Hoyos [Thu, 5 Apr 2012 22:53:09 +0000 (00:53 +0200)]
Support yuva444p rawvideo in nut.

Fixes ticket #1058.

12 years agoavcodec: remove avcodec_guess_channel_layout()
Justin Ruggles [Thu, 22 Mar 2012 00:39:02 +0000 (20:39 -0400)]
avcodec: remove avcodec_guess_channel_layout()

It is not public because the header is not installed, and its functionality
has been replaced by av_get_default_channel_layout().

12 years agoavutil: Add av_get_default_channel_layout()
Justin Ruggles [Thu, 22 Mar 2012 00:36:51 +0000 (20:36 -0400)]
avutil: Add av_get_default_channel_layout()

Also, use the new function in the AC-3 encoder.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 5 Apr 2012 20:26:50 +0000 (22:26 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: Factorize declaration of mb_sizes array.
  vsrc_buffer: when no frame is available, return an error instead of segfaulting.
  configure: add dl to frei0r extralibs.
  dsputil x86: use SSE float instruction instead of SSE2 integer equivalent
  dsputil x86: remove deprecated parameter from scalarproduct_int16 prototype
  vp8dsp x86: perform rounding shift with a single instruction
  fate: add BMP tests.
  swscale: handle complete dimensions for monoblack/white.
  aacenc: Mark deinterleave_input_samples argument as const.
  vf_unsharp: Mark readonly variable as const.
  h264: fix 4:2:2 PCM-macroblocks decoding

Conflicts:
configure
libavcodec/h264.h
libavcodec/x86/dsputil_mmx.c
libavfilter/vf_unsharp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocmdutils: fix -fdebug without -v xy
Michael Niedermayer [Thu, 5 Apr 2012 19:50:50 +0000 (21:50 +0200)]
cmdutils: fix -fdebug without -v xy

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomov: do not print string len in handler_name.
Clément Bœsch [Thu, 5 Apr 2012 13:14:00 +0000 (15:14 +0200)]
mov: do not print string len in handler_name.

The handler name is stored as a pascal string in the QT specs (first
byte is the length of the string), thus leading to an invalid metadata
string export.

Also add a second length check based on the first character to avoid
overwriting an already specified handler_name (it happens with Youtube
videos for instance, the handler_name get masked), or specifying an
empty string metadata.

12 years agoh264: Factorize declaration of mb_sizes array.
Diego Biurrun [Wed, 4 Apr 2012 12:53:25 +0000 (14:53 +0200)]
h264: Factorize declaration of mb_sizes array.

12 years agolavf: Fix the last PTS to be generated using -fflags +genpts
Thierry Foucu [Wed, 4 Apr 2012 19:01:04 +0000 (12:01 -0700)]
lavf: Fix the last PTS to be generated using -fflags +genpts

To reproduce the problem, using ffprobe:

./ffprobe -show_packets -print_format compact -fflags +genpts -i
fate_samples/mxf/C0023S01.mxf

You will notice that the last video frame does not have it's PTS being
set, even with using genpts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovsrc_buffer: when no frame is available, return an error instead of segfaulting.
Anton Khirnov [Sun, 1 Apr 2012 13:18:00 +0000 (15:18 +0200)]
vsrc_buffer: when no frame is available, return an error instead of segfaulting.