aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Remove ffmpeg.Anton Khirnov2012-01-235-5512/+1
| | |
| * | aacenc: Simplify windowingNathan Caldwell2012-01-231-33/+68
| | | | | | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | aacenc: Move saved overlap samples to the beginning of the same buffer as ↵Nathan Caldwell2012-01-231-16/+15
| | | | | | | | | | | | | | | | | | incoming samples. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | aacenc: Deinterleave input samples before processing.Nathan Caldwell2012-01-235-62/+80
| | | | | | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | aacenc: Store channel count in AACEncContext.Nathan Caldwell2012-01-232-20/+23
| | | | | | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | aacenc: Move Q^3/4 calculation to it's own tableNathan Caldwell2012-01-233-3/+11
| | | | | | | | | | | | | | | | | | This should be moved to tablegen at some point. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | aacenc: Request normalized float samples instead of converting s16 samples ↵Nathan Caldwell2012-01-235-20/+18
| | | | | | | | | | | | | | | | | | to float. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | aacpsy: Replace an if with FFMAX in LAME windowing.Nathan Caldwell2012-01-231-2/+1
| | | | | | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make ↵Nathan Caldwell2012-01-231-14/+14
| | | | | | | | | | | | | | | | | | it more clear what is being calculated. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisonsNathan Caldwell2012-01-231-6/+6
| | | | | | | | | | | | | | | | | | Also fix a typo. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | aacenc: cosmetics: move init() and end() to the bottom of the file.Nathan Caldwell2012-01-231-102/+102
| | | | | | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | aacenc: aac_encode_init() cleanupNathan Caldwell2012-01-231-43/+74
| | | | | | | | | | | | | | | | | | Macroify sanity checks and check return values of allocs and other functions. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | XWD encoder and decoderPaul B Mahol2012-01-2310-2/+564
| | | | | | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * | vc1: don't read the interpfrm and bfraction elements for interlaced framesHendrik Leppkes2012-01-231-7/+9
| | | | | | | | | | | | | | | | | | | | | 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>
| * | mxfdec: fix memleak on mxf_read_close()Janne Grunau2012-01-231-0/+1
| | |
| * | westwood: split the AUD and VQA demuxers into separate files.Justin Ruggles2012-01-233-147/+177
| | | | | | | | | | | | They have no code in common.
* | | Revert "Fix multi-channel AAC encoding."Michael Niedermayer2012-01-242-31/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b3452771c4550b46ea54d15be6cfe8cc10585199. A better solution was implemented by Nathan Caldwell. Conflicts: libavcodec/aacenc.c
* | | movenc: Decrease default chunk merge limit to 1mb.Michael Niedermayer2012-01-2314-25/+25
| | | | | | | | | | | | | | | | | | | | | 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>
* | | limit chunk size to 1GBMaksym Veremeyenko2012-01-231-1/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | cafdec: fix regression introduced in c7579ad8e84c5Paul B Mahol2012-01-231-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avidec: Fix use of stream_index before validation of its range.Michael Niedermayer2012-01-231-2/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Improve support for PGS subtitles.David Mitchell2012-01-232-81/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | pthreads: Generic progress lubrication support.Michael Niedermayer2012-01-231-0/+7
| | | | | | | | | | | | | | | | | | Fixes bug118, bug120 and bug125 at least Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | pthreads: reset got_frames on flush.Michael Niedermayer2012-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | | 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>
* | | cafdec: replace deprecated get_strz()Paul B Mahol2012-01-231-2/+2
| | |
* | | cafenc: replace deprecated av_dbl2int()Paul B Mahol2012-01-231-2/+2
| | |
* | | libavformat/libavformat.v: fix application name in commentMichael Niedermayer2012-01-231-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-236-28/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | riff: fix invalid av_freep() calls on EOF in ff_read_riff_infoJanne Grunau2012-01-221-2/+1
| | |
| * | pam: Fix a typo that broke writing and reading PAM files.Carl Eugen Hoyos2012-01-222-2/+4
| | | | | | | | | | | | | | | | | | Reported and reviewed by Derek Buitenhuis. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxfdec: fix memleak on av_realloc failuresJanne Grunau2012-01-221-5/+8
| | |
| * | mxfdec: Do not parse slices or DeltaEntryArrays.Tomas Härdin2012-01-221-76/+10
| | | | | | | | | | | | The most recent demuxing/seeking code does not need them.
| * | mxfdec: hybrid demuxing/seeking solutionJanne Grunau2012-01-223-193/+499
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | mxfdec: Add Avid's essence element key.Tomas Härdin2012-01-221-1/+4
| | | | | | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mfxdec: Separate mxf_essence_container_uls for audio and video.Carl Eugen Hoyos2012-01-221-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | mxfdec: Compute packet offsets properly.Tomas Härdin2012-01-221-16/+37
| | | | | | | | | | | | | | | | | | This replaces the old essence_offset code. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack.Tomas Härdin2012-01-221-13/+10
| | | | | | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxfdec: use av_dlog() for 'no corresponding source package found'Tomas Härdin2012-01-221-32/+143
| | | | | | | | | | | | | | | | | | This is not an error and expected behavior for OPAtom files. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxfdec: Make mxf->partitions sorted by offset.Tomas Härdin2012-01-221-1/+15
| | | | | | | | | | | | | | | | | | This also zeroes new entries for good measure (used by future patches). Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxfdec: parse ThisPartitionTomas Härdin2012-01-221-2/+5
| | | | | | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxfdec: Speed up metadata and index parsing.Tomas Härdin2012-01-221-10/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | mxfdec: Make sure DataDefinition is consistent between material track and ↵Tomas Härdin2012-01-221-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxfTomas Härdin2012-01-221-0/+1
| | | | | | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxfdec: Add hack that adjusts the n_delta calculation when system items are ↵Tomas Härdin2012-01-221-1/+8
| | | | | | | | | | | | | | | | | | present. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays.Janne Grunau2012-01-221-8/+318
| | | | | | | | | | | | | | | | | | | | | 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.
| * | mxfdec: Move FooterPartition to MXFContext and make sure it is never zero.Tomas Härdin2012-01-221-3/+14
| | | | | | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxfdec: check return value of avio_seekJoakim Plate2012-01-221-1/+4
| | | | | | | | | | | | | | | | | | Avoid modifying state if avio_seek fails. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxfdec: skip to end of structural setsPhilip de Nier2012-01-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | mxfdec: parse MXF partitionsTomas Härdin2012-01-221-1/+107
| | |
| * | avserver: fix build after the next bump.Anton Khirnov2012-01-222-11/+13
| | | | | | | | | | | | | | | | | | | | | 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.