ffmpeg.git
8 years agofaq: fix typo.
Nicolas George [Tue, 24 Jan 2012 15:03:09 +0000 (16:03 +0100)]
faq: fix typo.

Reported-By: Clément Bœsch
8 years agofaq: document af_aconvert quirks using lavfi.
Nicolas George [Tue, 24 Jan 2012 11:42:20 +0000 (12:42 +0100)]
faq: document af_aconvert quirks using lavfi.

8 years agoAdd myself as mxfdec maintainer
Tomas Härdin [Tue, 24 Jan 2012 13:13:57 +0000 (14:13 +0100)]
Add myself as mxfdec maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: Disallow w/h/pixfmt changes for frame threads.
Michael Niedermayer [Tue, 24 Jan 2012 05:21:45 +0000 (06:21 +0100)]
h264: Disallow w/h/pixfmt changes for frame threads.

Previously this was just checked in case of slice threads,
but frame threads do not support this either currently.

Making them support this is of course the long term goal

Fixes bug155

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo: Draw edges based on the pictures linesize instead of the contexts.
Michael Niedermayer [Tue, 24 Jan 2012 00:30:28 +0000 (01:30 +0100)]
mpegvideo: Draw edges based on the pictures linesize instead of the contexts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: Allocate buffers of the size needed by the decoder.
Michael Niedermayer [Tue, 24 Jan 2012 00:29:03 +0000 (01:29 +0100)]
ffmpeg: Allocate buffers of the size needed by the decoder.

Fixes bug127

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibcelt: configure: distinguish not found and too old.
Nicolas George [Tue, 24 Jan 2012 12:21:34 +0000 (13:21 +0100)]
libcelt: configure: distinguish not found and too old.

Fixes ticket #940.

8 years agolavfi: require libswr for af_pan.
Nicolas George [Tue, 24 Jan 2012 11:11:04 +0000 (12:11 +0100)]
lavfi: require libswr for af_pan.

8 years agolavd/lavfi: add dumpgraph option.
Nicolas George [Thu, 19 Jan 2012 18:38:11 +0000 (19:38 +0100)]
lavd/lavfi: add dumpgraph option.

8 years agolavfi: add avfilter_graph_dump.
Nicolas George [Thu, 19 Jan 2012 16:38:44 +0000 (17:38 +0100)]
lavfi: add avfilter_graph_dump.

8 years agopan: drop unecessary includes.
Clément Bœsch [Mon, 23 Jan 2012 10:30:10 +0000 (11:30 +0100)]
pan: drop unecessary includes.

8 years agopan: move query_formats() to avoid forward declarations.
Clément Bœsch [Mon, 23 Jan 2012 10:28:47 +0000 (11:28 +0100)]
pan: move query_formats() to avoid forward declarations.

8 years agopan: reindent after remap commit.
Clément Bœsch [Mon, 23 Jan 2012 10:27:11 +0000 (11:27 +0100)]
pan: reindent after remap commit.

8 years agopan: add channel mapping capability.
Clément Bœsch [Wed, 18 Jan 2012 11:00:16 +0000 (12:00 +0100)]
pan: add channel mapping capability.

8 years agopan: raise correct error when there is no param specified.
Clément Bœsch [Tue, 17 Jan 2012 10:01:37 +0000 (11:01 +0100)]
pan: raise correct error when there is no param specified.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 24 Jan 2012 01:41:53 +0000 (02:41 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove ffmpeg.
  aacenc: Simplify windowing
  aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples.
  aacenc: Deinterleave input samples before processing.
  aacenc: Store channel count in AACEncContext.
  aacenc: Move Q^3/4 calculation to it's own table
  aacenc: Request normalized float samples instead of converting s16 samples to float.
  aacpsy: Replace an if with FFMAX in LAME windowing.
  aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated.
  aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons
  aacenc: cosmetics: move init() and end() to the bottom of the file.
  aacenc: aac_encode_init() cleanup
  XWD encoder and decoder
  vc1: don't read the interpfrm and bfraction elements for interlaced frames
  mxfdec: fix memleak on mxf_read_close()
  westwood: split the AUD and VQA demuxers into separate files.

Conflicts:
.gitignore
Changelog
Makefile
configure
doc/ffmpeg.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/aacenc.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/img2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "Fix multi-channel AAC encoding."
Michael Niedermayer [Tue, 24 Jan 2012 01:31:56 +0000 (02:31 +0100)]
Revert "Fix multi-channel AAC encoding."

This reverts commit b3452771c4550b46ea54d15be6cfe8cc10585199.

A better solution was implemented by Nathan Caldwell.

Conflicts:

libavcodec/aacenc.c

8 years agomovenc: Decrease default chunk merge limit to 1mb.
Michael Niedermayer [Mon, 23 Jan 2012 19:52:37 +0000 (20:52 +0100)]
movenc: Decrease default chunk merge limit to 1mb.

This reduces the delay when opening the video with quicktime.

Idea-by: Maksym Veremeyenko <verem@m1stereo.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove ffmpeg.
Anton Khirnov [Thu, 12 Jan 2012 10:12:15 +0000 (11:12 +0100)]
Remove ffmpeg.

8 years agolimit chunk size to 1GB
Maksym Veremeyenko [Mon, 23 Jan 2012 11:59:37 +0000 (13:59 +0200)]
limit chunk size to 1GB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacenc: Simplify windowing
Nathan Caldwell [Sat, 24 Dec 2011 00:36:15 +0000 (17:36 -0700)]
aacenc: Simplify windowing

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: Move saved overlap samples to the beginning of the same buffer as incoming...
Nathan Caldwell [Sat, 24 Dec 2011 22:24:16 +0000 (15:24 -0700)]
aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: Deinterleave input samples before processing.
Nathan Caldwell [Thu, 15 Dec 2011 02:43:56 +0000 (19:43 -0700)]
aacenc: Deinterleave input samples before processing.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: Store channel count in AACEncContext.
Nathan Caldwell [Wed, 7 Dec 2011 22:20:10 +0000 (15:20 -0700)]
aacenc: Store channel count in AACEncContext.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: Move Q^3/4 calculation to it's own table
Nathan Caldwell [Fri, 6 Jan 2012 21:24:37 +0000 (14:24 -0700)]
aacenc: Move Q^3/4 calculation to it's own table

This should be moved to tablegen at some point.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: Request normalized float samples instead of converting s16 samples to float.
Nathan Caldwell [Sun, 18 Dec 2011 01:45:55 +0000 (18:45 -0700)]
aacenc: Request normalized float samples instead of converting s16 samples to float.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacpsy: Replace an if with FFMAX in LAME windowing.
Nathan Caldwell [Sat, 7 Jan 2012 21:21:35 +0000 (14:21 -0700)]
aacpsy: Replace an if with FFMAX in LAME windowing.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more...
Nathan Caldwell [Mon, 9 Jan 2012 01:38:39 +0000 (18:38 -0700)]
aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons
Nathan Caldwell [Sat, 7 Jan 2012 21:16:10 +0000 (14:16 -0700)]
aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons

Also fix a typo.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: cosmetics: move init() and end() to the bottom of the file.
Nathan Caldwell [Thu, 15 Dec 2011 02:50:23 +0000 (19:50 -0700)]
aacenc: cosmetics: move init() and end() to the bottom of the file.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: aac_encode_init() cleanup
Nathan Caldwell [Fri, 2 Dec 2011 22:08:55 +0000 (15:08 -0700)]
aacenc: aac_encode_init() cleanup

Macroify sanity checks and check return values of allocs and other functions.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agocafdec: fix regression introduced in c7579ad8e84c5
Paul B Mahol [Mon, 23 Jan 2012 18:53:22 +0000 (18:53 +0000)]
cafdec: fix regression introduced in c7579ad8e84c5

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavidec: Fix use of stream_index before validation of its range.
Michael Niedermayer [Mon, 23 Jan 2012 18:36:22 +0000 (19:36 +0100)]
avidec: Fix use of stream_index before validation of its range.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoImprove support for PGS subtitles.
David Mitchell [Thu, 19 Jan 2012 15:31:01 +0000 (07:31 -0800)]
Improve support for PGS subtitles.

The previous implementation assumed that a new picture would always
supersede the previous picture. Similarly, presentation segments
were assumed to pertain to the most-recently-read picture.

However, each presentation segment may refer to 0 or more pictures
by their ID. Picture IDs may repeat, and a repeated picture ID
indicates that the old picture for that ID is no longer needed
and may be discarded.

The new implementation allocates a buffer with one slot for each
possible picture ID (the picture ID is a 16-bit field) and
properly decodes presentation segments so that all relevant
pictures are output upon encountering a display segment.

Given that most PGS streams are unlikely to use more than a small
fraction of the available picture IDs, it would probably be better
to use a more memory-efficient data structure. I'm lazy though, so
I leave this to a more motivated individual.

I've tested the code with MKV files in VLC (a recent revision from
their git repo) and with HandBrake (a version that I hacked up to
use ffmpeg's PGS subtitle decoder).

Review-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopthreads: Generic progress lubrication support.
Michael Niedermayer [Mon, 23 Jan 2012 05:34:30 +0000 (06:34 +0100)]
pthreads: Generic progress lubrication support.

Fixes bug118, bug120 and bug125 at least

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopthreads: reset got_frames on flush.
Michael Niedermayer [Mon, 23 Jan 2012 02:39:59 +0000 (03:39 +0100)]
pthreads: reset got_frames on flush.

This fixes memory corruption when seeking in broken streams.
a random mpeg4 in nut file was used to debug.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoXWD encoder and decoder
Paul B Mahol [Sat, 21 Jan 2012 17:45:52 +0000 (17:45 +0000)]
XWD encoder and decoder

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
8 years agovc1: don't read the interpfrm and bfraction elements for interlaced frames
Hendrik Leppkes [Fri, 13 Jan 2012 17:41:21 +0000 (18:41 +0100)]
vc1: don't read the interpfrm and bfraction elements for interlaced frames

This matches the spec as well as the reference decoder, and fixes a bug
with interlaced frame decoding.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
8 years agomxfdec: fix memleak on mxf_read_close()
Janne Grunau [Sun, 22 Jan 2012 18:57:13 +0000 (19:57 +0100)]
mxfdec: fix memleak on mxf_read_close()

8 years agocafdec: replace deprecated get_strz()
Paul B Mahol [Mon, 23 Jan 2012 16:18:44 +0000 (17:18 +0100)]
cafdec: replace deprecated get_strz()

8 years agocafenc: replace deprecated av_dbl2int()
Paul B Mahol [Mon, 23 Jan 2012 16:18:13 +0000 (17:18 +0100)]
cafenc: replace deprecated av_dbl2int()

8 years agowestwood: split the AUD and VQA demuxers into separate files.
Justin Ruggles [Fri, 20 Jan 2012 18:56:51 +0000 (13:56 -0500)]
westwood: split the AUD and VQA demuxers into separate files.

They have no code in common.

8 years agolibavformat/libavformat.v: fix application name in comment
Michael Niedermayer [Mon, 23 Jan 2012 00:46:57 +0000 (01:46 +0100)]
libavformat/libavformat.v: fix application name in comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 23 Jan 2012 00:05:20 +0000 (01:05 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (25 commits)
  riff: fix invalid av_freep() calls on EOF in ff_read_riff_info
  pam: Fix a typo that broke writing and reading PAM files.
  mxfdec: fix memleak on av_realloc failures
  mxfdec: Do not parse slices or DeltaEntryArrays.
  mxfdec: hybrid demuxing/seeking solution
  mxfdec: Add Avid's essence element key.
  mfxdec: Separate mxf_essence_container_uls for audio and video.
  mxfdec: Compute packet offsets properly.
  mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack.
  mxfdec: use av_dlog() for 'no corresponding source package found'
  mxfdec: Make mxf->partitions sorted by offset.
  mxfdec: parse ThisPartition
  mxfdec: Speed up metadata and index parsing.
  mxfdec: Make sure DataDefinition is consistent between material track and source track.
  mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf
  mxfdec: Add hack that adjusts the n_delta calculation when system items are present.
  mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays.
  mxfdec: Move FooterPartition to MXFContext and make sure it is never zero.
  mxfdec: check return value of avio_seek
  mxfdec: skip to end of structural sets
  ...

Conflicts:
configure
libavcodec/pnm.c
libavformat/mxfdec.c
libavformat/riff.c
libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCrystalHD: Back up extradata to allow decoder reinit to work.
Philip Langdale [Sun, 22 Jan 2012 21:47:00 +0000 (13:47 -0800)]
CrystalHD: Back up extradata to allow decoder reinit to work.

This was a regression that came in when I switched to using the
h.264 annex b filter all the time. As the filter modifies extradata,
its use violates the statelessness assumption that exists in the
'ffmpeg' command line tool, and maybe elsewhere. It assumes that
a docoder can be reinitalised and pointed to an existing stream and
get the same results.

For now, the only way to meet this requirement is to backup the
extradata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCrystalHD: Initialise variables to silence valgrind.
Philip Langdale [Sun, 22 Jan 2012 21:46:59 +0000 (13:46 -0800)]
CrystalHD: Initialise variables to silence valgrind.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"
Michael Niedermayer [Sun, 22 Jan 2012 22:23:23 +0000 (23:23 +0100)]
Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"

This reverts commit 8e8c51318c1fe4ae61de578f0823b88aa3fe8222.

Fixes Ticket873

Conflicts:

tests/ref/acodec/pcm_s16be
tests/ref/acodec/pcm_s24be
tests/ref/acodec/pcm_s32be
tests/ref/acodec/pcm_s8
tests/ref/lavf/mov

Approved-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuild: Describe --nm and -ld options consistently
Alexander Strasser [Sun, 15 Jan 2012 12:53:33 +0000 (13:53 +0100)]
build: Describe --nm and -ld options consistently

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopthread: Change a signal to a broadcast as multiple threads
Michael Niedermayer [Sun, 22 Jan 2012 20:13:10 +0000 (21:13 +0100)]
pthread: Change a signal to a broadcast as multiple threads
have been seen waiting and deadlocking on it in bug125.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobase64: 10l endian fix.
Michael Niedermayer [Sun, 22 Jan 2012 22:04:20 +0000 (23:04 +0100)]
base64: 10l endian fix.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoriff: fix invalid av_freep() calls on EOF in ff_read_riff_info
Janne Grunau [Thu, 5 Jan 2012 19:15:53 +0000 (20:15 +0100)]
riff: fix invalid av_freep() calls on EOF in ff_read_riff_info

8 years agoavfilter: add some asserts() to check refcounts.
Michael Niedermayer [Sun, 22 Jan 2012 18:30:40 +0000 (19:30 +0100)]
avfilter: add some asserts() to check refcounts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopam: Fix a typo that broke writing and reading PAM files.
Carl Eugen Hoyos [Wed, 28 Dec 2011 04:54:59 +0000 (05:54 +0100)]
pam: Fix a typo that broke writing and reading PAM files.

Reported and reviewed by Derek Buitenhuis.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agobuild: Support selecting yasm-compatible assembler
Alexander Strasser [Sun, 15 Jan 2012 23:48:16 +0000 (00:48 +0100)]
build: Support selecting yasm-compatible assembler

  Makes it possible to select the name/path of the tool for compiling
the non-inline assembly code.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: Fix unscaled >8bit planar chroma handling.
Michael Niedermayer [Sun, 22 Jan 2012 05:44:34 +0000 (06:44 +0100)]
sws: Fix unscaled >8bit planar chroma handling.

Fixes Ticket840

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomxfdec: fix memleak on av_realloc failures
Janne Grunau [Wed, 21 Dec 2011 19:12:24 +0000 (20:12 +0100)]
mxfdec: fix memleak on av_realloc failures

8 years agompeg12: fixed parsing in some mpeg2 streams
Hendrik Leppkes [Fri, 20 Jan 2012 15:46:58 +0000 (16:46 +0100)]
mpeg12: fixed parsing in some mpeg2 streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: fix FF_LOSS_COLORQUANT detection for gray8a->pal8
Michael Niedermayer [Wed, 18 Jan 2012 14:51:09 +0000 (15:51 +0100)]
lavc: fix FF_LOSS_COLORQUANT detection for gray8a->pal8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoExtract some duplicated code.
Reimar Döffinger [Sat, 21 Jan 2012 23:12:34 +0000 (00:12 +0100)]
Extract some duplicated code.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoRemove pointless and distracting ()
Reimar Döffinger [Sat, 21 Jan 2012 23:02:42 +0000 (00:02 +0100)]
Remove pointless and distracting ()

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoSimplify: just add header_size directly.
Reimar Döffinger [Sat, 21 Jan 2012 22:59:08 +0000 (23:59 +0100)]
Simplify: just add header_size directly.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoMove some duplicated code, simplify.
Reimar Döffinger [Sat, 21 Jan 2012 22:53:57 +0000 (23:53 +0100)]
Move some duplicated code, simplify.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoMake variable that always has the same value const.
Reimar Döffinger [Sat, 21 Jan 2012 22:48:50 +0000 (23:48 +0100)]
Make variable that always has the same value const.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoOptimized base64 decode by writing 3 bytes at once.
Reimar Döffinger [Sat, 21 Jan 2012 21:52:56 +0000 (22:52 +0100)]
Optimized base64 decode by writing 3 bytes at once.

About 25% faster.
decode: 248852 -> 200385 decicycles
(syntax check unchanged)

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoCosmetics: add do {} while 0 to macro.
Reimar Döffinger [Sat, 21 Jan 2012 21:48:15 +0000 (22:48 +0100)]
Cosmetics: add do {} while 0 to macro.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agomxfdec: Do not parse slices or DeltaEntryArrays.
Tomas Härdin [Fri, 16 Dec 2011 10:02:04 +0000 (11:02 +0100)]
mxfdec: Do not parse slices or DeltaEntryArrays.

The most recent demuxing/seeking code does not need them.

8 years agomxfdec: hybrid demuxing/seeking solution
Janne Grunau [Thu, 8 Dec 2011 19:28:49 +0000 (20:28 +0100)]
mxfdec: hybrid demuxing/seeking solution

This uses the old demuxing code for OP1a and separate demuxing code for OPAtom.
Timestamp output is added to the old demuxing code.

The seeking code is made to seek to the start of the desired EditUnit only,
from which the normal demuxing code takes over (if OP1a). This means we
do not use delta entries or slices, only StreamOffsets. OPAtom seeking
basically works like before.

This also makes D-10 seeking behave the same way as OP1a and OPAtom. In other
words, we allow seeking before the start or past the end for D-10 too.

Based on several patches by Tomas Härdin <tomas.hardin@codemill.se> and
Reimar Döffinger <Reimar.Doeffinger@gmx.de>.

Changed av_calloc to av_mallocz, added overflow checks.

8 years agomxfdec: Add Avid's essence element key.
Tomas Härdin [Sat, 10 Dec 2011 11:11:11 +0000 (12:11 +0100)]
mxfdec: Add Avid's essence element key.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomfxdec: Separate mxf_essence_container_uls for audio and video.
Carl Eugen Hoyos [Sat, 10 Dec 2011 13:58:57 +0000 (14:58 +0100)]
mfxdec: Separate mxf_essence_container_uls for audio and video.

It is a really bad idea to assign a video codec id
when we have set codec_type to audio and vice versa.

Prevents detection of mp2 in mxf as mpeg2video.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: Compute packet offsets properly.
Tomas Härdin [Thu, 8 Dec 2011 11:23:36 +0000 (12:23 +0100)]
mxfdec: Compute packet offsets properly.

This replaces the old essence_offset code.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack.
Tomas Härdin [Thu, 8 Dec 2011 10:53:57 +0000 (11:53 +0100)]
mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: use av_dlog() for 'no corresponding source package found'
Tomas Härdin [Thu, 8 Dec 2011 10:21:58 +0000 (11:21 +0100)]
mxfdec: use av_dlog() for 'no corresponding source package found'

This is not an error and expected behavior for OPAtom files.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: Make mxf->partitions sorted by offset.
Tomas Härdin [Thu, 8 Dec 2011 10:06:23 +0000 (11:06 +0100)]
mxfdec: Make mxf->partitions sorted by offset.

This also zeroes new entries for good measure (used by future patches).

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: parse ThisPartition
Tomas Härdin [Wed, 7 Dec 2011 16:43:36 +0000 (17:43 +0100)]
mxfdec: parse ThisPartition

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: Speed up metadata and index parsing.
Tomas Härdin [Mon, 14 Mar 2011 16:00:21 +0000 (17:00 +0100)]
mxfdec: Speed up metadata and index parsing.

Specifically, this means parsing as before until we run into essence.
At that point we seek to the footer and parse until EOF. After that we start
seeking backward to the previous partition and parse that until we run into
essence or the next partition. This procedure is repeated until we encounter
the last partition we parsed in the forward direction.

The end result of all this is that large essence containers are not needlessly
parsed. This speeds up parsing large files a lot.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: Make sure DataDefinition is consistent between material track and source...
Tomas Härdin [Mon, 28 Nov 2011 09:51:00 +0000 (10:51 +0100)]
mxfdec: Make sure DataDefinition is consistent between material track and source track.

This fixes 0001GL.MXF.V1.mxf_opatom.mxf and 0001GL00.MXF.A1.mxf_opatom.mxf
getting two streams each due to both using the same SourcePackageID.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf
Tomas Härdin [Mon, 28 Nov 2011 08:53:10 +0000 (09:53 +0100)]
mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: Add hack that adjusts the n_delta calculation when system items are present.
Tomas Härdin [Fri, 11 Nov 2011 14:01:34 +0000 (15:01 +0100)]
mxfdec: Add hack that adjusts the n_delta calculation when system items are present.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays.
Janne Grunau [Wed, 9 Nov 2011 10:47:57 +0000 (11:47 +0100)]
mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays.

Based on patch from Tomas Härdin <tomas.hardin@codemill.se>
and work by Georg Lippitsch <georg.lippitsch@gmx.at>

Changed av_calloc to av_mallocz and added overflow checks.

8 years agomxfdec: Move FooterPartition to MXFContext and make sure it is never zero.
Tomas Härdin [Fri, 7 Oct 2011 13:48:00 +0000 (15:48 +0200)]
mxfdec: Move FooterPartition to MXFContext and make sure it is never zero.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: check return value of avio_seek
Joakim Plate [Wed, 14 Sep 2011 17:26:48 +0000 (19:26 +0200)]
mxfdec: check return value of avio_seek

Avoid modifying state if avio_seek fails.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: skip to end of structural sets
Philip de Nier [Mon, 12 Sep 2011 10:13:44 +0000 (11:13 +0100)]
mxfdec: skip to end of structural sets

This fixes reading of partition packs. The code stops reading after the
operational pattern and should skip the array of essence container
labels that follow.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agomxfdec: parse MXF partitions
Tomas Härdin [Mon, 7 Feb 2011 15:07:41 +0000 (16:07 +0100)]
mxfdec: parse MXF partitions

8 years agoavserver: fix build after the next bump.
Anton Khirnov [Thu, 12 Jan 2012 08:51:23 +0000 (09:51 +0100)]
avserver: fix build after the next bump.

Now that 0.8 is out we can reapply this commit. It breaks shared
avserver builds due to avserver using internal libavformat symbols,
which are now hidden, so this commit also disables avserver with
--enable-shared.

8 years agosws: In case of an invalid scaler algorithm, show the invalid value.
Michael Niedermayer [Fri, 20 Jan 2012 19:44:41 +0000 (20:44 +0100)]
sws: In case of an invalid scaler algorithm, show the invalid value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavidec: fix "avidec.c:362: warning: st may be used uninitialized in this function"
Michael Niedermayer [Fri, 20 Jan 2012 19:36:25 +0000 (20:36 +0100)]
avidec: fix "avidec.c:362: warning: st may be used uninitialized in this function"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRC: Fix initial buffer occupancy.
Michael Niedermayer [Sun, 22 Jan 2012 03:30:59 +0000 (04:30 +0100)]
RC: Fix initial buffer occupancy.

Fixes Ticket880
Regression since bf174a70cde333eba7e27063f9ce44497108f466

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegpsmux: Fix integer overflow with huge VBV sizes.
Michael Niedermayer [Sun, 22 Jan 2012 02:29:32 +0000 (03:29 +0100)]
mpegpsmux: Fix integer overflow with huge VBV sizes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacenc: Fix bug in writing libavcodec_ident.
Michael Niedermayer [Sun, 22 Jan 2012 00:40:10 +0000 (01:40 +0100)]
aacenc: Fix bug in writing libavcodec_ident.

the written length was off by 2 causing aac decoders to fail with the data.
lucky the encoder was marked as experimental and not used much

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSupport decoding gray8a tiff images.
Carl Eugen Hoyos [Sun, 22 Jan 2012 03:49:46 +0000 (04:49 +0100)]
Support decoding gray8a tiff images.

8 years agoimg2: add j2c file extension
Jean First [Sat, 21 Jan 2012 23:11:42 +0000 (00:11 +0100)]
img2: add j2c file extension

Some applications use the j2c extension for jpeg2000 codestream files.

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopixdesc: cosmetics
Jean First [Sat, 21 Jan 2012 23:07:48 +0000 (00:07 +0100)]
pixdesc: cosmetics

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngdec: Do not use SIMD paeth prediction for bpp=2
Michael Niedermayer [Thu, 19 Jan 2012 19:50:44 +0000 (20:50 +0100)]
pngdec: Do not use SIMD paeth prediction for bpp=2

Fixes decoding of basi4a08.png

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngdec: Fix masks for interlaced decoding
Michael Niedermayer [Thu, 19 Jan 2012 19:49:59 +0000 (20:49 +0100)]
pngdec: Fix masks for interlaced decoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngdec: Add some FF_DEBUG based av_logs.
Michael Niedermayer [Thu, 19 Jan 2012 17:58:24 +0000 (18:58 +0100)]
pngdec: Add some FF_DEBUG based av_logs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: fix copy case detection with gray8a.
Michael Niedermayer [Thu, 19 Jan 2012 07:36:17 +0000 (08:36 +0100)]
sws: fix copy case detection with gray8a.

Fixes gray_alpha.png

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agortsp: Use a random offset for trying to open UDP ports for RTP
Dmitry Volyntsev [Wed, 18 Jan 2012 09:46:37 +0000 (13:46 +0400)]
rtsp: Use a random offset for trying to open UDP ports for RTP

This avoids (for all practical cases) the issue of reusing
the same UDP port as for an earlier connection. If the remote
doesn't know the previous session was closed, he might keep
on sending packets to that port. If we always start off trying
to open the same UDP port, we might get those packets intermixed
with the new ones.

This is occasionally an issue when testing RTSP stuff with
DSS, perhaps also with other servers.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortsp: Allow specifying the UDP port range via AVOptions
Martin Storsjö [Sat, 21 Jan 2012 21:28:11 +0000 (23:28 +0200)]
rtsp: Allow specifying the UDP port range via AVOptions

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortsp: Remove a leftover, currently pointless check
Dmitry Volyntsev [Wed, 18 Jan 2012 09:54:16 +0000 (13:54 +0400)]
rtsp: Remove a leftover, currently pointless check

This check isn't relevant in the way the code currently works.

Also change a case of if (x == 0) into if (!x).

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolavc: Mark the err_detect constants as audio+video as they also apply to audio.
Michael Niedermayer [Sat, 21 Jan 2012 22:48:50 +0000 (23:48 +0100)]
lavc: Mark the err_detect constants as audio+video as they also apply to audio.

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