1ca042a14b
avcodec/snowenc: Export quality/pict_type/PSNR stats through side data
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
27294bc203
avcodec/mpegvideo_enc: export per frame PSNR through side data
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
5d95f32bff
avocdec/mpeg12dec: fix mpeg_xvmc hwaccel flag
...
The flag is deprecated and as such didn't get a new AV_ prefixed version
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
360cebc9c8
avcodec/mpegvideo_enc: move ff_side_data_set_encoder_stats() call to after the vbv retry code
...
This ensures the data matches the final values
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
ea7e4f8e6a
Merge commit 'b7040e67ec18259ca634a0e29d98469b3484a87c'
...
* commit 'b7040e67ec18259ca634a0e29d98469b3484a87c':
h264: fix AVDISCARD_NONKEY for some interlaced content
Conflicts:
libavcodec/h264.c
Not merged, the used field is not initialized where it is used
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
e1296b5fa4
Merge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf'
...
* commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf':
asfdec: do not align Data Object when Broadcast Flag is set
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
4ecc9a2f31
Merge commit 'db21dde3f72c2331653399bdb8745350f015d847'
...
* commit 'db21dde3f72c2331653399bdb8745350f015d847':
qsvdec_mpeg2: drop an incorrect comment
Conflicts:
libavcodec/qsvdec_mpeg2.c
No change as the removed comment was not in libavcodec/qsvdec_mpeg2.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
1467304802
Merge commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead'
...
* commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead':
fate: Add hap-chunk ref file
Conflicts:
tests/ref/fate/hap-chunk
See: c7e6443441
10 years ago
952e9fbb4a
Merge commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7'
...
* commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7':
hap: Add utility functions file
Conflicts:
libavcodec/hap.c
No change, no files are/where missing in FFmpeg
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
4be1b6bef0
Merge commit '3ee217853a6741b829a2683f49c590618891b1ab'
...
* commit '3ee217853a6741b829a2683f49c590618891b1ab':
Support the Hap chunked frame format
Conflicts:
libavcodec/hap.h
libavcodec/hapdec.c
libavcodec/version.h
See: c7e6443441
10 years ago
f01e3c5d00
Merge commit '43dd004747fa697396b47d034a80e069facbea09'
...
* commit '43dd004747fa697396b47d034a80e069facbea09':
hap: Move some per-stream setup into decoder init rather than per-frame
Conflicts:
libavcodec/hapdec.c
See: 6074956fa1
10 years ago
e3ec2cde2c
Merge commit 'b94ec30428b9696f99b08055735689623fe63954'
...
* commit 'b94ec30428b9696f99b08055735689623fe63954':
lavc: Update version and APIchanges
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
29d147c94d
Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'
...
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
lavc: Consistently prefix input buffer defines
Conflicts:
doc/examples/decoding_encoding.c
libavcodec/4xm.c
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.h
libavcodec/asvenc.c
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/dvdec.c
libavcodec/ffv1enc.c
libavcodec/g2meet.c
libavcodec/gif.c
libavcodec/h264.c
libavcodec/h264_mp4toannexb_bsf.c
libavcodec/huffyuvdec.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libxvid.c
libavcodec/mdec.c
libavcodec/motionpixels.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/noise_bsf.c
libavcodec/nuv.c
libavcodec/nvenc.c
libavcodec/options.c
libavcodec/parser.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/qsvdec.c
libavcodec/svq1enc.c
libavcodec/tiffenc.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/vc1dec.c
libavcodec/wmalosslessdec.c
libavformat/adxdec.c
libavformat/aiffdec.c
libavformat/apc.c
libavformat/apetag.c
libavformat/avidec.c
libavformat/bink.c
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/id3v2.c
libavformat/isom.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mpc.c
libavformat/mpc8.c
libavformat/mpegts.c
libavformat/mvi.c
libavformat/mxfdec.c
libavformat/mxg.c
libavformat/nutdec.c
libavformat/oggdec.c
libavformat/oggparsecelt.c
libavformat/oggparseflac.c
libavformat/oggparseopus.c
libavformat/oggparsespeex.c
libavformat/omadec.c
libavformat/rawdec.c
libavformat/riffdec.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_qdm2.c
libavformat/rtpdec_svq3.c
libavformat/sierravmd.c
libavformat/smacker.c
libavformat/smush.c
libavformat/spdifenc.c
libavformat/takdec.c
libavformat/tta.c
libavformat/utils.c
libavformat/vqf.c
libavformat/westwood_vqa.c
libavformat/xmv.c
libavformat/xwma.c
libavformat/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
444e9874a7
Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'
...
* commit 'def97856de6021965db86c25a732d78689bd6bb0':
lavc: AV-prefix all codec capabilities
Conflicts:
cmdutils.c
ffmpeg.c
ffplay.c
libavcodec/8svx.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/adpcm.c
libavcodec/alac.c
libavcodec/atrac3plusdec.c
libavcodec/bink.c
libavcodec/dnxhddec.c
libavcodec/dvdec.c
libavcodec/dvenc.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/fic.c
libavcodec/flacdec.c
libavcodec/flacenc.c
libavcodec/flvdec.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/gifdec.c
libavcodec/h261dec.c
libavcodec/hevc.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/libopenjpegdec.c
libavcodec/libvo-aacenc.c
libavcodec/libvorbisenc.c
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpegaudiodec_float.c
libavcodec/msmpeg4dec.c
libavcodec/mxpegdec.c
libavcodec/nvenc_h264.c
libavcodec/nvenc_hevc.c
libavcodec/pngdec.c
libavcodec/qpeg.c
libavcodec/ra288.c
libavcodec/rv10.c
libavcodec/s302m.c
libavcodec/sp5xdec.c
libavcodec/takdec.c
libavcodec/tiff.c
libavcodec/tta.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/vp6.c
libavcodec/vp9.c
libavcodec/wavpack.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
94d68a41fa
Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'
...
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
lavc: AV-prefix all codec flags
Conflicts:
doc/examples/muxing.c
ffmpeg.c
ffmpeg_opt.c
ffplay.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/ac3enc_float.c
libavcodec/atrac1.c
libavcodec/atrac3.c
libavcodec/atrac3plusdec.c
libavcodec/dcadec.c
libavcodec/ffv1enc.c
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb.c
libavcodec/imc.c
libavcodec/libmp3lame.c
libavcodec/libtheoraenc.c
libavcodec/libtwolame.c
libavcodec/libvpxenc.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpegaudiodec_template.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/nellymoserdec.c
libavcodec/nellymoserenc.c
libavcodec/nvenc.c
libavcodec/on2avc.c
libavcodec/options_table.h
libavcodec/opus_celt.c
libavcodec/pngenc.c
libavcodec/ra288.c
libavcodec/ratecontrol.c
libavcodec/twinvq.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c
libavcodec/vorbisdec.c
libavcodec/vp3.c
libavcodec/wma.c
libavcodec/wmaprodec.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/me_cmp_init.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
b7040e67ec
h264: fix AVDISCARD_NONKEY for some interlaced content
...
When skip_frame is set to _NONKEY the decoder skips everything except intra
slices, which breaks frames that consist of an intra field together with any
other field type; half the frame becomes garbage. This patch fixes the issue by
letting non-intra slices through if they're part of a keyframe.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years ago
b5c1c16247
asfdec: do not align Data Object when Broadcast Flag is set
...
its size is invalid in this case
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years ago
db21dde3f7
qsvdec_mpeg2: drop an incorrect comment
...
It got copypasted from the h264 decoder, but it does not apply to mpeg2.
10 years ago
abdc7e403e
fate: Add hap-chunk ref file
...
Missing from the push of 3ee217853a
10 years ago
aaf937ee35
hap: Add utility functions file
...
Missing from the push of 3ee217853a
10 years ago
3ee217853a
Support the Hap chunked frame format
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
10 years ago
43dd004747
hap: Move some per-stream setup into decoder init rather than per-frame
...
This change will reject frames with a texture type which does not match
the stream description.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
10 years ago
b94ec30428
lavc: Update version and APIchanges
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
10 years ago
059a934806
lavc: Consistently prefix input buffer defines
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
10 years ago
def97856de
lavc: AV-prefix all codec capabilities
...
Express bitfields more simply.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
10 years ago
7c6eb0a1b7
lavc: AV-prefix all codec flags
...
Convert doxygen to multiline and express bitfields more simply.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
10 years ago
4b6b1082a7
lavc: Deprecate avctx.me_method
...
This option is extremely codec specific and only a few codecs employ it.
Move it to codec private options instead: mpegenc family supports only 3
values, xavs and x264 use 5, and xvid has a different metric entirely.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
10 years ago
03eb557414
wmv2enc: Check memory allocation
10 years ago
a67b67944a
ac3enc_template: Use the correct context field
...
For audio encoders, delay has no effect, use the appropriate one,
initial_padding (see 2df0c32
10 years ago
60a21b3d81
configure: Check for _M_ARMT to detect thumb when using MSVC
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
616b409c8f
configure: Check MSVC defines for identifying hardfloat
...
This macro identifies whether VFPv3 is available; MSVC defaults
to hardfloat (except for older MSVC versions for CE, targeting
ARMv4).
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
2192ff84dd
configure: Default to armasm for --toolchain=msvc when targeting arm
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
e4015b00d4
configure: Simplify, remove an unnecessary intermediate variable
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
6d3081e6c3
doc: Remove the now unnecessary remark about PATH and link.exe
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
9e8627a1ff
asfdec: interpret the first flag in an asf packet as length flag
...
if the error correction flag is not set, a packet starts with payload
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years ago
65c1480152
checkasm: Modify report format
...
Makes it a bit more clear where each test belongs.
Suggested by Anton Khirnov.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years ago
f3bd3810d2
qsvdec_*: add missing CODEC_CAP_DR1
10 years ago
4a2836eaf3
avfilter: add acrossfade filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
10 years ago
0b6f092ed3
Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'
...
* commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6':
lavc: Deprecate avctx.me_method
Conflicts:
doc/encoders.texi
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/motion_est.c
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
59b009411f
Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'
...
* commit '03eb55741427c6608f63972c105e565ca0ba4f15':
wmv2enc: Check memory allocation
Conflicts:
libavcodec/wmv2enc.c
See: 6e8fe44815
10 years ago
c707437572
Merge commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09'
...
* commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09':
ac3enc_template: Use the correct context field
See: 320ce9f284
10 years ago
af5f707e46
avcodec/v410enc: do not use internal->byte_buffer
...
it is not optimal when the buffer size is well known at allocation time
This avoids a memcpy()
about 1% faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
9fe873bec8
avcodec/utils: do not use internal->byte_buffer when little downsizing is expected
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
0dbfb5386f
avcodec/internal: Deprecate ff_alloc_packet() in favor of ff_alloc_packet2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
e36db49b7b
avcodec: Add a min size parameter to ff_alloc_packet2()
...
This parameter can be used to inform the allocation code about how much
downsizing might occur, and can be used to optimize how to allocate the
packet
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
59216e0525
AAC Encoder: clipping avoidance
...
Avoid clipping due to quantization noise to produce audible
artifacts, by detecting near-clipping signals and both attenuating
them a little and encoding escape-encoded bands (usually the
loudest) rounding towards zero instead of nearest, which tends to
decrease overall energy and thus clipping.
Currently fate tests measure numerical error so this change makes
tests using asynth (which are near clipping) report higher error
not less, because of window attenuation. Yet, they sound better,
not worse (albeit subtle, other samples aren't subtle at all).
Only measuring psychoacoustically weighted error would make for
a representative test, so that will be left for a future patch.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
c8c86b8f9b
avformat/mpegts: Replace silent cliping of language_count by asserts
...
Failure should not be possible, if it does occur then the code is
buggy and should be fixed not silently clip
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
71aede3ced
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 bilinear functions
...
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
42aa02418e
avformat/mpegts: Use DVB_TELETEXT timestamp heuristic also for DVB subtitles
...
Fixes Ticket4200
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
d06ea6e5ce
Merge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c'
...
* commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c':
configure: Check for _M_ARMT to detect thumb when using MSVC
Conflicts:
configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago
Michael Niedermayer
James Almer
John Högberg
Alexandra Hájková
Anton Khirnov
Vittorio Giovara
Tom Butterworth
Martin Storsjö
Henrik Gramner
Paul B Mahol
Michael Niedermayer
Claudio Freire
Shivraj Patil