summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* lavc/avcodec: decodimg → decoding.Clément Bœsch2013-06-01
|
* lavf/webvttdec: save cue id and settings as side dataMatthew Heaney2013-06-01
| | | | | | | | | | | | | | | | | | | | | | Currently the WebVTT demuxer parses the cues but throws away the cue id (the optional first line of the cue) and cue settings (the optional rendering instructions that follow the timestamp). However, in order to write inband text tracks (to WebM files), the entire cue payload from the WebVTT source must be preserved. This commit makes no change to the data part of the output buffer packet (where the actual cue text is stored), but does add the cue id and settings as a side data items, if they're present in the cue. Existing code that cares only about the data part of the packet can continue to ignore the side data. There are two new packet data type flags, AV_PKT_DATA_WEBVTT_IDENTIFIER and AV_PKT_DATA_WEBVTT_SETTINGS.
* lavc/avpacket: fill padding area on side data split.Clément Bœsch2013-06-01
| | | | | | | | | | | The padding data is assumed to be 0 in several places, notably in subtitles. This problem was not detected with fate-sub-srt test because the first element of the side data (x1) is 0 in the test, so the trailing side data present in the packet wasn't read by the decoder. The issue can be observed with a large enough x1. It is also noted in FF_INPUT_BUFFER_PADDING_SIZE doxy that MPEG bitstreams require that padding with 0, so it might fix other issues.
* jpeg2000: make sure s->numXtiles / s->numYtiles are reset when tile is ↵Michael Niedermayer2013-06-01
| | | | | | | | deallocated This keeps the structure fields more consistent after cleanup Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-06-01
|\ | | | | | | | | | | | | * cehoyos/master: Fix compilation with --disable-everything --enable-encoder=jpeg2000 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix compilation with --disable-everything --enable-encoder=jpeg2000Carl Eugen Hoyos2013-06-01
| | | | | | | | The JPEG2000 encoder depends on the discrete wavelet transform.
* | jpeg2000dec: optimize dequantization_int()Michael Niedermayer2013-06-01
| | | | | | | | | | | | 4400->2800 cycles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: optimize dequantization_float()Michael Niedermayer2013-06-01
|/ | | | | | 4700 -> 2700 cycles (sandybridge i7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-01
|\ | | | | | | | | | | | | | | * qatar/master: indeo4: expand allowed quantiser range configure: icl: Merge -Qdiag-error parameters Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo4: expand allowed quantiser rangeKostya Shishkov2013-06-01
| | | | | | | | | | | | | | | | Indeo 4 has quantiser range 0-31 instead of 0-23 for Indeo 5, and clipping quantiser leads to incorrect quantisation and DC prediction on low-quality videos. This fixes bug 259.
* | tta: stop checking header checksum in extradataPaul B Mahol2013-05-31
| | | | | | | | | | | | It's redundant now as check in done in demuxer instead. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | jpeg2000dec: fix indentionMichael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: print more detailed cdx/y debug infoMichael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-31
|\| | | | | | | | | | | | | * qatar/master: proresenc: alpha coding support Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * proresenc: alpha coding supportKostya Shishkov2013-05-30
| |
* | j2k/jpeg2000dec: mergeMichael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: merge simplification of jpeg2000_decode_packets() from j2kMichael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: merge sgnd fix from j2kMichael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: merge struct field types from j2kMichael Niedermayer2013-05-31
| | | | | | | | | | | | Fixes AVOption type mismatch Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2kdec: merge JPEG2000_PGOD_CPRL code from jpeg2000Michael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2kdec: merge picture handling from jpeg2000Michael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k: restructure bitstream decodingMichael Niedermayer2013-05-31
| | | | | | | | | | | | | | | | | | | | | | This is based on jpeg2000 but differs because of problems with the design from jpeg2000 with currently supported files More files can be decoded after this commit, though they show heavy artifacts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: merge some of the tilepart related codeMichael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2kdec: merge length==0 check from jpeg2000Michael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000deci/j2kdec: fix sizeof typesMichael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: fix ff_mqc_initdec() and data setup orderMichael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: simplify init_tile() / merge from j2kMichael Niedermayer2013-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tta: remove pointless codePaul B Mahol2013-05-30
| | | | | | | | | | Checking seek table crc in decoder is pointless, as seek table is not used in decoder anyway, so also stop storing seek table into extradata.
* | h264_cavlc: fix reading skip runMichael Niedermayer2013-05-30
| | | | | | | | | | | | Fixes Ticket2606 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000/j2k: merge non functional changesMichael Niedermayer2013-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k:decode_tile() pass picture as argumentMichael Niedermayer2013-05-30
| | | | | | | | | | | | Reduce diff to jpeg2000dec Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: drop red-blue swapMichael Niedermayer2013-05-30
| | | | | | | | | | | | This should no longer be needed as the pix fmt was updated Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2kdec: s/j2k_/jpeg2000_/Michael Niedermayer2013-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: merge pix_fmt setting codeMichael Niedermayer2013-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo_enc: allow mpeg_quant to be set in mpeg2videoMichael Niedermayer2013-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000/j2k: merge j2k/jpeg2000.c/hMichael Niedermayer2013-05-30
| | | | | | | | | | | | Now only j2kdec / jpeg2000dec.c remain Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: remove unneeded castsMichael Niedermayer2013-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: merges quantization fixes from j2kMichael Niedermayer2013-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: remove unneeded variable initializationMichael Niedermayer2013-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: tag_tree_size: replace check by assertMichael Niedermayer2013-05-30
| | | | | | | | | | | | | | This function is never called with values large enough for the error condition to occur Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: split data pointer in int & float.Michael Niedermayer2013-05-30
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a TODO item and unifies both decoders structures It also fixes undefined behavior due to aliasing violations I choose 2 fields instead of a union because mistakely using the wrong type with a union will lead to hard to debug "wrong output" while with 2 fields mistakely using the wrong type will crash with a null pointer derefernce which is much easier to debug Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-30
|\| | | | | | | | | | | | | * qatar/master: arm: Include hpeldsp_neon.o if h264qpel is enabled Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Include hpeldsp_neon.o if h264qpel is enabledMartin Storsjö2013-05-30
| | | | | | | | | | | | | | | | | | A few of the h264qpel neon functions are shared with other hpeldsp functions in this file. This fixes standalone compilation of the h264 decoder on arm. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'efb7968cfe8b285ab4f27b363719b7c92d19ec74'Michael Niedermayer2013-05-30
|\| | | | | | | | | | | | | * commit 'efb7968cfe8b285ab4f27b363719b7c92d19ec74': arm: Don't unconditionally build dsputil files Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Don't unconditionally build dsputil filesMartin Storsjö2013-05-30
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '36a7df8cf1115aa37a1b0d42324ecde5ab6c2304'Michael Niedermayer2013-05-30
|\| | | | | | | | | | | | | * commit '36a7df8cf1115aa37a1b0d42324ecde5ab6c2304': arm: Only build the FFT init files if FFT is enabled Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Only build the FFT init files if FFT is enabledMartin Storsjö2013-05-30
| | | | | | | | | | | | This fixes build errors in cases where FFT is disabled. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '186599ffe0a94d587434e5e46e190e038357ed99'Michael Niedermayer2013-05-30
|\| | | | | | | | | | | | | | | | | | | * commit '186599ffe0a94d587434e5e46e190e038357ed99': build: cosmetics: Place unconditional before conditional OBJS lines Conflicts: libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: cosmetics: Place unconditional before conditional OBJS linesDiego Biurrun2013-05-30
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9b9b2e9f3036abfd42916bcf734af14b4cb686aa'Michael Niedermayer2013-05-30
|\| | | | | | | | | | | | | * commit '9b9b2e9f3036abfd42916bcf734af14b4cb686aa': build: arm: cosmetics: Place all OBJS declarations in alphabetical order Merged-by: Michael Niedermayer <michaelni@gmx.at>