summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* movtextdec: Don't emit errors for normal duration-end packets.Philip Langdale2012-08-15
| | | | | | | | The logic here was off. If the packet size is exactly two, then it's a well-formed empty subtitle, used to mark the end of the duration of the previous subtitle. Signed-off-by: Philip Langdale <philipl@overt.org>
* srtenc: Add timing-less "subrip" encoder.Philip Langdale2012-08-15
| | | | | | | | | Unsurprisingly, if a timing-less subrip decoder is desireable, an encoder is as well. With this in place, we can move on to remove the use of the old encoder/decoder with embedded timing and move all timing handling the (de)muxer where they belong. Signed-off-by: Philip Langdale <philipl@overt.org>
* srtdec: Add timing-less "subrip" decoder.Philip Langdale2012-08-15
| | | | | | | | | | | | After various discussions, we concluded that, amongst other things, it made sense to have a separate subrip decoder that did not use in-band timing information, and rather relied on the ffmpeg level timing. As this is 90% the same as the existing srt decoder, it's implemented in the same file. Signed-off-by: Philip Langdale <philipl@overt.org>
* sp5xdec: fix off by 1 error causing a crashMichael Niedermayer2012-08-16
| | | | | | | Fixes Ticket1633 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* av_get_audio_frame_duration: fix ra144Michael Niedermayer2012-08-16
| | | | | | Fixes Ticket1612 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* snowdec: add 2 av_asserts to check run validityMichael Niedermayer2012-08-16
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* snowdec: check log in get_symbol2()Michael Niedermayer2012-08-16
| | | | | | | Fixes Ticket1635 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mpegvideo: dont call draw edges on lowresMichael Niedermayer2012-08-15
| | | | | | | this crashes otherwise, and can happen from try_decode_frame() in the case of decoding errors Fixes Ticket1602 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h263penc: fix multitheraded encodingMichael Niedermayer2012-08-15
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mpegvideo_enc: reset mb_x/y before writing the headersMichael Niedermayer2012-08-15
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* motion_est: switch some asserts to av_assertMichael Niedermayer2012-08-15
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add support for SWFVerification api-example: use new video encoding API. x86: avcodec: Appropriately name files containing only init functions mpegvideo_mmx_template: drop some commented-out cruft libavresample: add mix level normalization option w32pthreads: Add missing #includes to make header compile standalone rtmp: Gracefully ignore _checkbw errors by tracking them rtmp: Do not send _checkbw calls as notifications prores: interlaced ProRes encoding Conflicts: doc/examples/decoding_encoding.c libavcodec/proresenc_kostya.c libavcodec/w32pthreads.h libavcodec/x86/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * api-example: use new video encoding API.Anton Khirnov2012-08-15
| |
| * x86: avcodec: Appropriately name files containing only init functionsDiego Biurrun2012-08-15
| |
| * mpegvideo_mmx_template: drop some commented-out cruftDiego Biurrun2012-08-15
| |
| * w32pthreads: Add missing #includes to make header compile standaloneDiego Biurrun2012-08-14
| |
| * prores: interlaced ProRes encodingMaksalov Boris2012-08-14
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | msmpeg4v2: initialize mb_type arrayMichael Niedermayer2012-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: fix MB/MV vissualization on videos that are not mod 16 == 0Michael Niedermayer2012-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pafdec: fix wrong check for input buffer size.Michael Niedermayer2012-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pafdec: fix wrong palette index check.Michael Niedermayer2012-08-15
| | | | | | | | | | | | | | Fixes Ticket1641 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vda: better frame allocation.Sebastien Zwickert2012-08-14
| |
* | bmv_videodec: fix out of array readMichael Niedermayer2012-08-14
| | | | | | | | | | | | Fixes Ticket1373 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | remove duplicated codeupsuper2012-08-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | prores_kostya: implement interlaced encoding.Boris Maksalov2012-08-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | prores_kostya: fix incorrect picture_size field.Boris Maksalov2012-08-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: g723.1: simplify scale_vector() g723.1: simplify normalize_bits() vda: cosmetics: fix Doxygen comment formatting vda: better frame allocation vda: Merge implementation into one file vda: support synchronous decoding vda: Reuse the bitstream buffer and reallocate it only if needed build: Factor out mpegvideo encoding dependencies to CONFIG_MPEGVIDEOENC avprobe: Include libm.h for the log2 fallback proresenc: use the edge emulation buffer rtmp: handle bytes read reports configure: Fix typo in mpeg2video/svq1 decoder dependency declaration Use log2(x) instead of log(x) / log(2) x86: swscale: fix fragile memory accesses x86: swscale: remove disabled code x86: yadif: fix asm with suncc x86: cabac: allow building with suncc x86: mlpdsp: avoid taking address of void ARM: intmath: use native-size return types for clipping functions Conflicts: configure ffprobe.c libavcodec/Makefile libavcodec/g723_1.c libavcodec/v210dec.h libavcodec/vda.h libavcodec/vda_h264.c libavcodec/x86/cabac.h libavfilter/x86/yadif_template.c libswscale/x86/rgb2rgb_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g723.1: simplify scale_vector()Mans Rullgard2012-08-14
| | | | | | | | | | | | | | It is impossible for bits to be 15 here so the special case is not needed. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * g723.1: simplify normalize_bits()Mans Rullgard2012-08-14
| | | | | | | | | | | | | | | | | | This function is always called with a non-negative argument, so those special cases are not needed. In the places the argument might be zero, the return value for a zero argument does not matter since it would then be used to scale an array full of zeros. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * vda: cosmetics: fix Doxygen comment formattingSebastien Zwickert2012-08-14
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vda: better frame allocationSebastien Zwickert2012-08-14
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vda: Merge implementation into one fileSebastien Zwickert2012-08-14
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vda: support synchronous decodingSebastien Zwickert2012-08-14
| | | | | | | | | | | | | | Note that the symbols used to run the hardware decoder in asynchronous mode have been marked deprecated and will be dropped at a future version bump. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vda: Reuse the bitstream buffer and reallocate it only if neededSebastien Zwickert2012-08-14
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * build: Factor out mpegvideo encoding dependencies to CONFIG_MPEGVIDEOENCDiego Biurrun2012-08-14
| | | | | | | | | | A new hidden config variable is added for the codecs that depend on the mpegvideo encoding parts.
| * proresenc: use the edge emulation bufferBoris Maksalov2012-08-13
| | | | | | | | | | | | Prevents reading past the end of frame buffer. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * Use log2(x) instead of log(x) / log(2)Mans Rullgard2012-08-13
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * x86: cabac: allow building with sunccMans Rullgard2012-08-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes two issues preventing suncc from building this code. The undocumented 'a' operand modifier, causing gcc to omit a $ in front of immediate operands (as required in addresses), is not supported by suncc. Luckily, the also undocumented 'c' modifer has the same effect and is supported. On some asm statements with a large number of operands, suncc for no obvious reason fails to correctly substitute some of the operands. Fortunately, some of the operands in these statements are plain numbers which can be inserted directly into the code block instead of passed as operands. With these changes, the code builds correctly with both gcc and suncc. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * x86: mlpdsp: avoid taking address of voidMans Rullgard2012-08-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This code contains a C array of addresses of labels defined in inline asm. To do this, the names must be declared as external in C. The declared type does not matter since only the address is used, and for some reason, the author of the code used the 'void' type despite taking the address of a void expression being invalid. Changing the type to char, a reasonable choice since the alignment of the code labels cannot be known or guaranteed, eliminates gcc warnings and allows building with suncc. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | vda: fix make checkheaders.Sebastien Zwickert2012-08-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dvdsubenc: reindent after recent commit.Nicolas George2012-08-14
| |
* | lavc: add const to AVCodecContext.codec_descriptor.Nicolas George2012-08-14
| |
* | lavc: reimplement avcodec_get_name with descriptors.Nicolas George2012-08-14
| |
* | dvdsubenc: set frame size in extradata.Nicolas George2012-08-14
| |
* | dvdsubenc: make it usable for transcoding.Nicolas George2012-08-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DVD subtitles packets can only encode a single rectangle: if there are several, copy them into a big transparent one. DVD subtitles rely on an external 16-colors palette: use a reasonable default one, stored in the private context, and encode it into the extradata, as specified by Matroska. TODO: allow to change the palette with an option. Each packet can use four colors out of the global palette. The old logic was to map transparent colors to the color 0 and all other colors to 3, 2, 1, cyclically in descending frequency order, completely disregarding the original color. Select the "best" four colors from the global palette, according to heuristics based on frequency, opacity and brightness, and arrange them in standard DVD order: background, foreground, outline, other. TODO: select the alpha value more finely; see if CHG_COLCON can allow more than 4 colors per packet. Reference: http://dvd.sourceforge.net/dvdinfo/spu.html With these changes, dvdsubenc can be used to transcode DVB subtitles and get a very decent result.
* | vda: merge implementation into one file.Sebastien Zwickert2012-08-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vda: support synchronous decoding.Sebastien Zwickert2012-08-14
| | | | | | | | | | | | | | Note that the symbols used to run the hardware decoder in asynchronous mode has been marked as deprecated and will be dropped at a future version dump. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Proresenc: add multithreading supportSpeedy Gonzales2012-08-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g723_1dec: inline normalize_bits() in scale vector and optimize it.Michael Niedermayer2012-08-13
| | | | | | | | | | | | | | many branches and cases of scale_vector are irrelevant for the case here and by inlining they can be reliably removed. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g723_1dec: remove dead code that leaked in from libavMichael Niedermayer2012-08-13
| | | | | | | | | | | | | | | | It appears someone thinks this special case can be reached Well, it cannot, thus not only do we not need to optimize it we dont need it at all Signed-off-by: Michael Niedermayer <michaelni@gmx.at>