summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avdevice/caca: small trivial macros adjustmentsClément Bœsch2015-09-121-8/+10
|
* avdevice/caca: remove space before ':' (English typo, cosmetics)Clément Bœsch2015-09-121-2/+2
|
* avdevice/caca: use AV_OPT_TYPE_BOOL for list_drivers optionClément Bœsch2015-09-121-3/+1
|
* avcodec: use AV_OPT_TYPE_BOOL for refcounted_frames, side_data_only_packets ↵Clément Bœsch2015-09-121-3/+3
| | | | and skip_alpha options
* configure: fix build on mingw64 target with msys2Peter Belkner2015-09-121-2/+2
|
* Merge commit 'c0a49077ea4ff3a0ad30b9e33f1bb06ba9112aaa'Hendrik Leppkes2015-09-121-2/+4
|\ | | | | | | | | | | | | * commit 'c0a49077ea4ff3a0ad30b9e33f1bb06ba9112aaa': asfdec: add more checks for size left in asf packet buffer Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * asfdec: add more checks for size left in asf packet bufferAlexandra Hájková2015-09-121-2/+4
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '1b2412f50185447da4212f65f06e8d72a6daf06e'Hendrik Leppkes2015-09-120-0/+0
|\ \ | |/ | | | | | | | | | | * commit '1b2412f50185447da4212f65f06e8d72a6daf06e': lavc: Fix compilation with --disable-everything --enable-parser=mpeg4video Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Fix compilation with --disable-everything --enable-parser=mpeg4videoHendrik Schreiber2015-09-121-1/+1
| |
* | Merge commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b'Hendrik Leppkes2015-09-126-6/+5
|\ \ | |/ | | | | | | | | | | * commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b': lavc: Sanitize header inclusion guards Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Sanitize header inclusion guardsVittorio Giovara2015-09-126-6/+5
| | | | | | | | | | | | Fix typos, add missing comments, and remove stray lines. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '6064f697a321174232a3fad351afb21150c3e9e5'Hendrik Leppkes2015-09-125-10/+22
|\ \ | |/ | | | | | | | | | | * commit '6064f697a321174232a3fad351afb21150c3e9e5': lavc: Enable side data only packets by default Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Enable side data only packets by defaultVittorio Giovara2015-09-125-10/+22
| | | | | | | | | | | | | | | | | | Deprecate the now unused option, but temporarily retain the capability to disable the now default behaviour. Mention this change in the AVPacket documentation. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/avienc: add muxer option "write_channel_mask"Tobias Rapp2015-09-123-4/+29
| | | | | | | | | | | | | | Allow writing an empty channel mask into the wave format header. Useful if the input file contains an unknown channel layout. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: readjust AAC encoder TNS testRostislav Pehlivanov2015-09-121-1/+1
| | | | | | | | | | | | | | | | | | The recent commits change the value slightly. Even though it's within the threshold it's better to risk as little as possible especially when different systems, processors, FPUs and compilers are involved. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | aacenc_tns: readjust values for new TNS decision makingRostislav Pehlivanov2015-09-121-3/+3
| | | | | | | | | | | | | | | | | | Since TNS was fixed with the recent commits retweak the values so it's more frequently used. Still not enabled by default yet, though it's possible that it will be made enabled by default in the near future. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | aacenc_tns: encode coefficients directly and reenable compressionRostislav Pehlivanov2015-09-121-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit was made possible with the earlier commits since the new quantization method basically means we're working always with unsigned values. The specifications mention to use compression when the first 2 bits are identical but they didn't mention if this should happen before or after the conversion to signed values. Actually they said nothing about conversion to signed values. With this commit, coefficient compression usually always happens which saves a lot of space, especially at extremely low bitrates and doesn't change the quality at all. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | aacenc_tns: redo coefficient quantization and decision makingRostislav Pehlivanov2015-09-122-26/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finally (and again) gets rid of basically everything the specifications say about how TNS should be done. The main problem used to be that a single filter was used for all coefficients which despite being explicitly recommended by the specifications usually sounds wrong, therefore it's a corner case in the current TNS implementation. This commit also changes the coefficient bit size, as apparently it's better to use lower precision in case the windows are eight short. This is apparently what fdk_aac uses, looking at the bit stream and makes sense. Also the order when 8 SHORT windows happen is important as 7 was too much and according to PSNR was worse while 5 is just about correct. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | Merge commit '1e0b8bf0b3b3b4247fb21e9839af342ae879607c'Hendrik Leppkes2015-09-121-1/+1
|\ \ | |/ | | | | | | | | | | * commit '1e0b8bf0b3b3b4247fb21e9839af342ae879607c': travis: fix dependencies Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * travis: fix dependenciesJames Almer2015-09-121-1/+1
| | | | | | | | | | | | | | bc hasn't been needed since a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '99404597201911de90cff2ef85f2d44176d39147'Hendrik Leppkes2015-09-121-4/+2
|\ \ | |/ | | | | | | | | | | * commit '99404597201911de90cff2ef85f2d44176d39147': mmaldec: fix pkt_dts determination Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mmaldec: fix pkt_dts determinationwm42015-09-121-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | This also drops setting the frame->pts field. This is usually not set by decoders, so this would be an inconsistency that's at worst a danger to the API user. It appears the buffer->dts field is normally not set by the MMAL decoder, so don't use it. If it's ever going to be set by MMAL, we don't know whether the value will be what we want. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '87a051f97633010f71dfc1d23d806856499bf231'Hendrik Leppkes2015-09-123-2/+10
|\ \ | |/ | | | | | | | | | | * commit '87a051f97633010f71dfc1d23d806856499bf231': lavc: allow asynchronous decoders to return correct pkt_dts values Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: allow asynchronous decoders to return correct pkt_dts valueswm42015-09-123-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generic code in utils.c sets the AVFrame.pkt_dts field from the packet it was supposedly decoded. This does not have to be true for a fully asynchronous decoder like mmaldec. It could be overwritten with an incorrect value. Even if the decoder doesn't determine the DTS (but sets it to AV_NOPTS_VALUE), it's impossible to determine a correct value in utils.c. Decoders can now be marked with FF_CODEC_CAP_SETS_PKT_DTS, in which case utils.c won't overwrite the field. The decoders are expected to set this field (even if they only set it to AV_NOPTS_VALUE). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b7ab6e18eecad43593ad2a0e9fc9eba7f24751cb'Hendrik Leppkes2015-09-121-0/+4
|\ \ | |/ | | | | | | | | | | * commit 'b7ab6e18eecad43593ad2a0e9fc9eba7f24751cb': mmaldec: disable timestamp interpolation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mmaldec: disable timestamp interpolationwm42015-09-121-0/+4
| | | | | | | | | | | | | | | | | | This MMAL feature fills in missing timestamps from the framerate set on the input port. This is generally unwanted, since libavcodec decoders merely pass through timestamps without ever "fixing" them. The framerate is also unknown, and even the timebase doesn't have to be set. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '6b652c0273d79f2e0c52ad91450bd0737cf3c8a6'Hendrik Leppkes2015-09-120-0/+0
|\ \ | |/ | | | | | | | | | | * commit '6b652c0273d79f2e0c52ad91450bd0737cf3c8a6': mmaldec: fix problems with flush logic Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mmaldec: fix problems with flush logicwm42015-09-121-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to do a blocking wait for MMAL output if we haven't even sent a single real packet, but only flush packets. Obviously we can't expect to get anything back. Additionally, don't send a flush packet to MMAL in the same case. It appears the MMAL decoder will sometimes hang in mmal_vc_port_disable() (called from ffmmal_close_decoder()), waiting for a reply from the GPU which never arrives. Either MMAL disallows sending flush packets without preceding real data, or it's a MMAL bug. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b84675d63aaede8f6944b901250a10456c5477e6'Hendrik Leppkes2015-09-120-0/+0
|\ \ | |/ | | | | | | | | | | * commit 'b84675d63aaede8f6944b901250a10456c5477e6': mmaldec: hack against buffering problems on broken input Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mmaldec: hack against buffering problems on broken inputwm42015-09-121-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I can't come up with a nice way to handle this. It's hard to keep the lock-stepped input/output in this case. You can't predict whether the MMAL decoder will output a picture (because it's asynchronous), so you have to assume in general that any packet could produce 0 or 1 frames. You can't continue to write input packets to the decoder, because then you might get too many output frames, which you can't get rid of because the lavc decoding API does not allow the decoder to return an output frame without consuming an input frame (except when flushing). The ideal fix is a M:N decoding API (preferably asynchronous), which would make this code potentially much cleaner. For now, this hack will do. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '5788623d29c3e806a7879210986110aced758dc2'Hendrik Leppkes2015-09-121-9/+18
|\ \ | |/ | | | | | | | | | | * commit '5788623d29c3e806a7879210986110aced758dc2': jpeg2000: Split codeblock decoding from the main tile decoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * jpeg2000: Split codeblock decoding from the main tile decodingLuca Barbato2015-09-111-5/+14
| | | | | | | | That loop is completely stand-alone.
* | Merge commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776'Hendrik Leppkes2015-09-121-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776': jpeg2000: Do not warn about known and skippable markers Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * jpeg2000: Do not warn about known and skippable markersLuca Barbato2015-09-111-0/+4
| | | | | | | | Matches the openjpeg behaviour.
* | Merge commit '9b5a4a9cce3042558e107ae1ed30d9bf3d867a35'Hendrik Leppkes2015-09-120-0/+0
|\ \ | |/ | | | | | | | | | | * commit '9b5a4a9cce3042558e107ae1ed30d9bf3d867a35': mmvideo: Make sure the rle does not write over the frame boundaries Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mmvideo: Make sure the rle does not write over the frame boundariesLuca Barbato2015-09-111-1/+5
| | | | | | | | | | Bug-Id: 887 CC: libav-stable@libav.org
* | Merge commit '41ed749fe987e60b0485fa721ad869590651324d'Hendrik Leppkes2015-09-121-0/+3
|\ \ | |/ | | | | | | | | | | * commit '41ed749fe987e60b0485fa721ad869590651324d': ogg: Do not try to use the parser if it is not present Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * ogg: Do not try to use the parser if it is not presentLuca Barbato2015-09-101-0/+3
| | | | | | | | | | Bug-Id: 886 CC: libav-stable@libav.org
* | Merge commit '7b02cb29d9d60cdd5ef321043d11d02023e7dc8f'Hendrik Leppkes2015-09-121-1/+2
|\ \ | |/ | | | | | | | | | | * commit '7b02cb29d9d60cdd5ef321043d11d02023e7dc8f': pixdesc: Document the component order Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * pixdesc: Document the component orderLuca Barbato2015-09-101-0/+7
| |
* | vp9: Fix emu[] edge overflow conditions for >8bpp/non-420.Ronald S. Bultje2015-09-121-2/+2
| |
* | vp9: re-initialize internal buffers on bpp change also.Ronald S. Bultje2015-09-121-1/+2
| |
* | Merge commit 'c7ed26ad6035793c7212c17545b0ded18b72db69'Hendrik Leppkes2015-09-120-0/+0
|\ \ | |/ | | | | | | | | | | * commit 'c7ed26ad6035793c7212c17545b0ded18b72db69': pixdesc: Add missing alpha flag for yuva420p9be Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * pixdesc: Add missing alpha flag for yuva420p9beHendrik Leppkes2015-09-101-1/+1
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e336c51e6ffcdb93fbcf3c6153d378400608526b'Hendrik Leppkes2015-09-121-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'e336c51e6ffcdb93fbcf3c6153d378400608526b': pixdesc: Consistently order components Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * pixdesc: Consistently order componentsHendrik Leppkes2015-09-101-50/+50
| | | | | | | | | | | | | | | | Ensure that the components are ordered consistently, ie. always RGB(A) and YUV(A). This allows to identify a specific plane on a given pixel format without hard-coding knowledge of the plane order. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | x86: port PSIGNW to cpuflagsJames Almer2015-09-112-11/+5
| | | | | | | | | | Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | ffserver: remove redundant comment, clarify another oneReynaldo H. Verdejo Pinochet2015-09-111-2/+1
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: unify exit path in http_server()Reynaldo H. Verdejo Pinochet2015-09-111-10/+9
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: unify fail path in socket_open_listen()Reynaldo H. Verdejo Pinochet2015-09-111-4/+6
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
OpenPOWER on IntegriCloud