OSDN Git Service
Clément Bœsch [Sun, 19 Jun 2016 11:34:22 +0000 (13:34 +0200)]
Merge commit '
755f79f84cbeb5d749fb120e55e0098a2d7663a0'
* commit '
755f79f84cbeb5d749fb120e55e0098a2d7663a0':
h264_refs: make the H264Context const where possible
ff_h264_decode_ref_pic_list_reordering() and h264_initialise_ref_list()
do not have a const H264Context * as they modify the default_ref inside
that context.
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sun, 19 Jun 2016 11:03:31 +0000 (13:03 +0200)]
Merge commit '
a2fd547839d3ef8f342b6f2c096d0887675d3b1a'
* commit '
a2fd547839d3ef8f342b6f2c096d0887675d3b1a':
h264_refs: reorder functions to avoid forward declarations
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sun, 19 Jun 2016 10:53:19 +0000 (12:53 +0200)]
Merge commit '
0ba471d7d864c712f45d7ac6aca4829aba025adc'
* commit '
0ba471d7d864c712f45d7ac6aca4829aba025adc':
h264: eliminate copy_fields
Added a copy of default_ref which isn't present in Libav.
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sun, 19 Jun 2016 10:43:21 +0000 (12:43 +0200)]
Merge commit '
72da8d9bb24d1b1bf74c2f1108650c0da0054d2e'
* commit '
72da8d9bb24d1b1bf74c2f1108650c0da0054d2e':
h264_parser: remove the remaining dependencies on the h264 decoder
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sun, 19 Jun 2016 10:38:28 +0000 (12:38 +0200)]
lavc/h264: move history parsing variable to H264ParseContext
This makes h264_find_frame_end() not depend on H264Context anymore.
Clément Bœsch [Sun, 19 Jun 2016 10:34:38 +0000 (12:34 +0200)]
lavc/h264_parser: pass logctx to h264_find_frame_end()
This helps removing the H264Context from the H264ParseContext.
Clément Bœsch [Sun, 19 Jun 2016 10:17:41 +0000 (12:17 +0200)]
Merge commit '
98c97994c5b90bdae02accb155eeceeb5224b8ef'
* commit '
98c97994c5b90bdae02accb155eeceeb5224b8ef':
h264: decouple extradata parsing from the decoder
Main changes:
- move get_avc_nalsize() inside h264_parser.c and make it use
H264ParseContext instead of H264Context. This helps fixing
fate-flv-demux.
- Also use is_avc/nal_length_size from the H264ParseContext in various
places instead of the H264Context one as that's the fields now filled
by ff_h264_decode_extradata()
- h264_parse: dont fail decode_extradata_ps() due to nal split failure.
Change by Michael to fix decoding of h264/ref_10.avi.
Merged-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 19 Jun 2016 07:43:22 +0000 (09:43 +0200)]
avcodec/magicyuv: check dimensions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Andrey Turkin [Sat, 4 Jun 2016 18:11:52 +0000 (21:11 +0300)]
libavcodec: factor out SEI generation for A53 captions
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 7 Jun 2016 15:26:38 +0000 (17:26 +0200)]
Revert "avfilter/trim: add compatibility layer to not break ABI used by ffmpeg"
This reverts commit
9219ec93b145725ac74fbfbde7f67ac5135b85cf.
Fixes Ticket 5411
Clément Bœsch [Sat, 18 Jun 2016 12:10:00 +0000 (14:10 +0200)]
lavc/h264_parse: remove tabs introduced in
a2922b5d
Clément Bœsch [Sat, 18 Jun 2016 12:04:17 +0000 (14:04 +0200)]
Merge commit '
728d90a0c1973661a9e73da697bf4f90c9d19577'
* commit '
728d90a0c1973661a9e73da697bf4f90c9d19577':
h264: decouple h264_sei from the h264 decoder
Main changes:
- SEI decoding doesn't have access to the debug flag in the codec context so a
few logging are dropped.
- naming of quincunx_sampling_flag and frame_packing_arrangement_type are kept
as they are in FFmpeg instead of respectively quincunx_subsampling and
arrangement_type used in Libav because the former match the specifications.
- don't reset the x264 build info once read in order to fix
fate-h264-lossless (change by Hendrik)
- H264Context.has_recovery_point and deprecated
AVCodecContext.dtg_active_format are set after ff_h264_sei_decode()
based on the SEI state since ff_h264_sei_decode() doesn't have access
to H264Context anymore.
- frame_packing_arrangement_type is not checked against <= 0 in
decode_postinit() since it is always read as a positive value with
get_bits(). This fixes a -Wtype-limits warning by GCC spotted by
Michael.
Side Notes:
- tested that ffprobe on the file from ticket #3652 still returns 4
keyframes
- tested that playback from ticket #3063 still works
Merged-by: Clément Bœsch <clement@stupeflix.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
James Almer [Fri, 17 Jun 2016 16:47:02 +0000 (13:47 -0300)]
avcodec/ffv1enc: silence warning about deprecated coded_frame
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 17 Jun 2016 19:24:06 +0000 (21:24 +0200)]
avcodec/snow: Document BlockNode
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jun 2016 19:08:23 +0000 (21:08 +0200)]
avcodec/snow: Remove unused function
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Fri, 17 Jun 2016 13:55:58 +0000 (15:55 +0200)]
lavc/videotoolbox: remove config_info maximum capacity
In case of extradata, config_info will contain two entries instead of
one.
Clément Bœsch [Fri, 17 Jun 2016 13:51:08 +0000 (15:51 +0200)]
lavc/videotoolbox: CFRelease() session
"When you are done with a decompression session you created, call
VTDecompressionSessionInvalidate to tear it down and then CFRelease to
release your object reference."
Clément Bœsch [Fri, 17 Jun 2016 12:29:05 +0000 (14:29 +0200)]
fate/h264: add test for ticket #631
Kongqun Yang [Wed, 15 Jun 2016 20:53:01 +0000 (13:53 -0700)]
Add experimental support for vp9 in iso-bmff
Implemented according to the draft specification
"VP Codec ISO Media File Format Binding":
http://www.webmproject.org/vp9/#draft-vp-codec-iso-media-file-format-binding
'-strict -2' is required to use this feature.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Muhammad Faiz [Thu, 16 Jun 2016 22:34:30 +0000 (05:34 +0700)]
swresample/resample: do not increase phase_count on exact_rational
high phase_count is only useful when dst_incr_mod is non zero
in other word, it is only useful on soft compensation
on init, it will build filter with low phase_count
but when soft compensation is enabled, rebuild filter
with high phase_count
this approach saves lots of memory
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Thu, 16 Jun 2016 22:30:37 +0000 (05:30 +0700)]
swresample/resample: add support for odd phase_count
because exact_rational does not guarantee
that phase_count is even
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Steve Lhomme [Wed, 15 Jun 2016 07:24:29 +0000 (09:24 +0200)]
d3d11va: don't keep the context lock while waiting for a frame
also fixes a deadlock found by Денис Кулаков <kudesnik33ra@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Rick Kern [Fri, 17 Jun 2016 01:22:13 +0000 (21:22 -0400)]
lavc/videotoolboxenc: remove unnecessary logging
Signed-off-by: Rick Kern <kernrj@gmail.com>
Rick Kern [Thu, 16 Jun 2016 13:05:06 +0000 (09:05 -0400)]
MAINTAINERS: Add myself for videotoolbox.c, remove vda* maintainer
Person in MAINTAINERS hasn't responded to a patch on the ML or private
email, and doesn't maintain the files according to git.
Signed-off-by: Rick Kern <kernrj@gmail.com>
Rick Kern [Thu, 2 Jun 2016 01:40:22 +0000 (21:40 -0400)]
lavc/videotoolbox: fix H.264 hwaccel init issue
Fixes VTDecompressionSessionCreate() error.
Signed-off-by: Rick Kern <kernrj@gmail.com>
Rick Kern [Thu, 2 Jun 2016 06:25:21 +0000 (02:25 -0400)]
lavc/audiotoolboxenc: fix dropped frames on iOS
AudioConverterFillComplexBuffer() doesn't always call its callback. A frame
queue is used to prevent skipped audio samples.
Signed-off-by: Rick Kern <kernrj@gmail.com>
Yuri Zats [Thu, 9 Jun 2016 17:54:20 +0000 (10:54 -0700)]
avformat/http: change seek_ret to int64
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jan Sebechlebsky [Fri, 10 Jun 2016 17:11:00 +0000 (19:11 +0200)]
avutil/threadmessage.h: Fix swapped comments
Fix swapped descriptions of av_thread_message_queue_set_err_send
and av_thread_message_queue_set_err_recv.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
James Almer [Thu, 16 Jun 2016 21:52:23 +0000 (18:52 -0300)]
avodec/h264dec: fix compilation with -DTRACE
Signed-off-by: James Almer <jamrial@gmail.com>
Petru Rares Sincraian [Thu, 16 Jun 2016 15:12:29 +0000 (17:12 +0200)]
fate: add test for agate
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Thu, 16 Jun 2016 21:05:30 +0000 (23:05 +0200)]
avcodec/sheervideo: check build_vlc for failure
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Niklas Söderlund [Wed, 15 Jun 2016 15:21:42 +0000 (17:21 +0200)]
lavd/v4l2: allow devices not implementing VIDIOC_G_PARM
Not all v4l2 devices implement the VIDIOC_G_PARM ioctl. This patch allow
ffmpeg to open such device and treat it the same as devices that do
implement the ioctl but returns that it do not implement the
V4L2_CAP_TIMEPERFRAME capability.
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 15 Jun 2016 21:27:38 +0000 (23:27 +0200)]
doc/APIchanges: Fill in some missing things
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Muhammad Faiz [Wed, 15 Jun 2016 06:58:01 +0000 (13:58 +0700)]
fate: add swr-resample_exact_async tests
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Carl Eugen Hoyos [Wed, 15 Jun 2016 15:45:51 +0000 (17:45 +0200)]
lavc/dpx: Support decoding 12 bit colourspace with transparency information.
Matthieu Bouron [Wed, 15 Jun 2016 14:40:36 +0000 (16:40 +0200)]
lavc/mediacodec: re-indent after previous commit
Matthieu Bouron [Thu, 2 Jun 2016 08:42:25 +0000 (10:42 +0200)]
lavc/mediacodec: refactor ff_AMediaCodecList_getCodecByType
Allows to select a codec (encoder or decoder) only if it supports a
specific profile.
Adds ff_AMediaCodecProfile_getProfileFromAVCodecContext to convert an
AVCodecContext profile to a MediaCodec profile. It only supports H264
for now.
The codepath using MediaCodecList.findDecoderForFormat() (Android >= 5.0)
has been dropped as this method does not allow to select a decoder
compatible with a specific profile.
Benjamin Steffes [Sun, 29 May 2016 15:45:33 +0000 (17:45 +0200)]
avfilter/af_hdcd: Use int32_t instead of int for gaintable in hdcd filter.
Signed-off-by: Benjamin Steffes <benjaminst123@gmail.com>
(comment by ronald)
prevent the theoretical case where the container type (int)
would be 64 bit on some platforms, which would waste some space
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
dsmudhar [Thu, 9 Jun 2016 13:12:33 +0000 (18:42 +0530)]
vf_codecview: added new options
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Benoit Fouet [Wed, 8 Jun 2016 09:42:51 +0000 (11:42 +0200)]
hls muxer doc: clarify segment splitting option
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Tue, 14 Jun 2016 15:02:40 +0000 (17:02 +0200)]
os_support: use the appropriate stat functions matching the stat type
The stat struct is defined to stati64, which requires using the appropriate wstati/stati functions as well.
Fixes a whole bunch of compiler warnings as well as build breakage with the decklink avdevice.
Fixes trac #5640
Aman Gupta [Tue, 14 Jun 2016 18:08:54 +0000 (11:08 -0700)]
avformat/utils: in debug mode, print number of streams found before avformat_find_stream_info()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Aman Gupta [Tue, 14 Jun 2016 18:08:53 +0000 (11:08 -0700)]
avformat/mpegts: enhance logging in trace mode
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 14 Jun 2016 15:13:51 +0000 (17:13 +0200)]
avfilter/vf_telecine: Make frame writable before writing into it
Fixes Ticket 5627
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Tue, 14 Jun 2016 15:41:23 +0000 (12:41 -0300)]
x86/aacpsdsp: optimize add_squares loop
Signed-off-by: James Almer <jamrial@gmail.com>
Carl Eugen Hoyos [Tue, 14 Jun 2016 15:02:34 +0000 (17:02 +0200)]
lavc/dpx: Support decoding 10 bit colourspace with transparency information.
Fixes one sample from ticket #5639.
Stefano Sabatini [Sun, 5 Jun 2016 08:36:26 +0000 (10:36 +0200)]
doc/muxers/mpegts: apply misc consistency/formatting fixes
Stefano Sabatini [Thu, 2 Jun 2016 15:50:00 +0000 (17:50 +0200)]
lavf/utils: fix timestamp trace log in estimate_timings() function
Use the correct timebase, also replace "stream" with "format" in the
context of the format.
Clément Bœsch [Mon, 13 Jun 2016 20:57:48 +0000 (22:57 +0200)]
lavc/h264_sei: fix broken style around green metadata code
Clément Bœsch [Mon, 13 Jun 2016 20:56:16 +0000 (22:56 +0200)]
lavc/h264: rename GreenMetaData to H264SEIGreenMetaData
Reduces diff for the next merge with Libav.
Clément Bœsch [Mon, 13 Jun 2016 20:54:23 +0000 (22:54 +0200)]
lavc/h264_sei: reduce scope of parameters for green meta decode
This is again will help the merge as ff_h264_decode_sei will not have
access to H264Context anymore.
Clément Bœsch [Mon, 13 Jun 2016 19:41:53 +0000 (21:41 +0200)]
lavc/h264: move green meta logging out of the sei decoding
This will simplify the next Libav merge where SEI decoding doesn't have
access to the debug level anymore.
Martin Storsjö [Wed, 27 Apr 2016 11:36:57 +0000 (14:36 +0300)]
rtpdec_vp9: Support parsing the scalability structure
We still only support one single layer though, but this allows
receiving streams that have this structure present even for
single layer streams.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 29 Apr 2016 19:19:33 +0000 (22:19 +0300)]
rtpdec_h264: Use avpriv_report_missing_feature instead of a manual av_log
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 29 Apr 2016 17:37:24 +0000 (20:37 +0300)]
rtpdec: Use AVERROR_PATCHWELCOME instead of AVERROR(ENOSYS) for
unimplemented features
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 27 Apr 2016 11:36:24 +0000 (14:36 +0300)]
rtpdec_vp9: Update header parsing to spec draft 02
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 27 Apr 2016 11:03:18 +0000 (14:03 +0300)]
rtpdec_vp9: Make sure to free the temp buffer on close
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 14 Jun 2016 02:11:24 +0000 (04:11 +0200)]
fate: fate-filter-acrossfade needs samples
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jun 2016 23:36:15 +0000 (01:36 +0200)]
avformat/mpegts: adjust probe score for low check_count
Fixes mis-detection of tiff as mpegts
Fixes Ticket5565
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Marton Balint [Sat, 11 Jun 2016 18:02:02 +0000 (20:02 +0200)]
avformat/mux: factorize header writing code
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 11 Jun 2016 16:52:27 +0000 (18:52 +0200)]
avformat/mux: call deinit if write_header fails
Docs clearly states that av_write_trailer should only be called if
avformat_write_header was successful, therefore we have to deinit if we return
failure.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Tue, 31 May 2016 20:48:24 +0000 (22:48 +0200)]
avformat/mxfdec: check if source_package is NULL
Fixes ticket #5554.
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Marton Balint <cus@passwd.hu>
Clément Bœsch [Mon, 13 Jun 2016 15:41:07 +0000 (17:41 +0200)]
lavc/h264_sei: fix green metadata typo
Jérôme Martinez [Mon, 13 Jun 2016 17:18:22 +0000 (19:18 +0200)]
avcodec/ffv1dec: fix some unsupported pix_fmt
When checking pix_fmt mapping, some bitstreams are mapped to an
incorrect pix_fmt instead of being rejected (ENOSYS).
Actually, such bitstreams are not supported (FFmpeg encoder does not
produce such bitstream, such bitstream may come only from another
encoder for the moment).
- JPEG 2000 RCT 11/13/15/16 bit depths are mapped to a 8-bit FFmpeg
pix_fmt (e.g. bgr0), which is not expected.
- JPEG 2000 RCT 9/10/12/14 bit depths with alpha are mapped to a
FFmpeg pix_fmt without alpha (e.g. AV_PIX_FMT_GBRP9 for 9-bit with
alpha), which is not expected.
The order for choosing the pix_fmt is changed to the one used by YCbCr
selection (<=8 bit first).
" && !f->transparency" is added to the other lines.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Thomas Bernard [Mon, 6 Jun 2016 22:25:38 +0000 (00:25 +0200)]
avformat/au: Read MetaData from AU Sun audio file header
recognize title= album= artist= genre= track=
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 5 Jun 2016 02:11:11 +0000 (04:11 +0200)]
avformat/dump: Show coded dimensions again
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Thomas Volkert [Mon, 13 Jun 2016 16:40:14 +0000 (18:40 +0200)]
rtpdec_vc2hq: avoid magic number
Thomas Volkert [Mon, 30 May 2016 14:31:52 +0000 (16:31 +0200)]
rtpenc: packetizer for VP9 RTP payload format (draft v2)
Michael Niedermayer [Sun, 5 Jun 2016 01:55:41 +0000 (03:55 +0200)]
avformat/utils: Export coded dimensions unconditionally
This fixes a API regression
Probably fixes Ticket5451
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Muhammad Faiz [Thu, 5 May 2016 07:07:21 +0000 (14:07 +0700)]
avfilter/graphparser: remove '\n' from parse_filter
this allow a filter to be written like this:
aformat =
sample_fmts = fltp|flt:
sample_rates = 44100|44800
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Mon, 13 Jun 2016 06:12:05 +0000 (13:12 +0700)]
doc/resampler: add exact_rational option
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Mon, 13 Jun 2016 00:35:40 +0000 (07:35 +0700)]
fate: add libswresample exact_rational test
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Sat, 11 Jun 2016 22:19:20 +0000 (05:19 +0700)]
swresample: add exact_rational option
give high quality resampling
as good as with linear_interp=on
as fast as without linear_interp=on
tested visually with ffplay
ffplay -f lavfi "aevalsrc='sin(10000*t*t)', aresample=osr=48000, showcqt=gamma=5"
ffplay -f lavfi "aevalsrc='sin(10000*t*t)', aresample=osr=48000:linear_interp=on, showcqt=gamma=5"
ffplay -f lavfi "aevalsrc='sin(10000*t*t)', aresample=osr=48000:exact_rational=on, showcqt=gamma=5"
slightly speed improvement
for fair comparison with -cpuflags 0
audio.wav is ~ 1 hour 44100 stereo 16bit wav file
ffmpeg -i audio.wav -af aresample=osr=48000 -f null -
old new
real 13.498s 13.121s
user 13.364s 12.987s
sys 0.131s 0.129s
linear_interp=on
old new
real 23.035s 23.050s
user 22.907s 22.917s
sys 0.119s 0.125s
exact_rational=on
real 12.418s
user 12.298s
sys 0.114s
possibility to decrease memory usage if soft compensation is ignored
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Matt Oliver [Mon, 6 Jun 2016 07:02:34 +0000 (17:02 +1000)]
lavu/intmath.h: fix compilation with msvc10.
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
Matt Oliver [Mon, 6 Jun 2016 07:04:39 +0000 (17:04 +1000)]
lavf/os_support.h: Fix for unicode filenames on windows.
Fixes #819 #5256 #5281
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
Ilya87 [Wed, 1 Jun 2016 04:49:51 +0000 (07:49 +0300)]
Timeline function for the eq filter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jun 2016 19:28:10 +0000 (21:28 +0200)]
avcodec/h264_slice: Add casts to suppress warnings
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sun, 12 Jun 2016 20:26:11 +0000 (17:26 -0300)]
avformat/redspark: deobfuscate header decrypt code
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 12 Jun 2016 19:30:32 +0000 (16:30 -0300)]
avformat/redspark: remove av_malloc usage
Signed-off-by: James Almer <jamrial@gmail.com>
Clément Bœsch [Sun, 12 Jun 2016 18:45:43 +0000 (20:45 +0200)]
lavc/videotoolbox: fix sps/pps mistake introduced in
1534ef87
Clément Bœsch [Sun, 12 Jun 2016 18:36:24 +0000 (20:36 +0200)]
lavc/videotoolbox: fixes compilation after
1534ef87
Clément Bœsch [Sun, 12 Jun 2016 18:12:07 +0000 (20:12 +0200)]
lavc/vda_h264: fixes compilation after
1534ef87
Michael Niedermayer [Sun, 12 Jun 2016 18:13:36 +0000 (20:13 +0200)]
avcodec/iff: Fix bytestream advance
Fixes Ticket5585
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Sun, 12 Jun 2016 14:06:58 +0000 (16:06 +0200)]
Merge commit '
c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8'
* commit '
c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8':
h264: factor out calculating the POC count into a separate file
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sun, 12 Jun 2016 13:37:58 +0000 (15:37 +0200)]
Merge commit '
113aeee6aed35cb786a9f6d69b0cb210f498b9da'
* commit '
113aeee6aed35cb786a9f6d69b0cb210f498b9da':
h264_parser: move the H264DSPContext to the parser context
H264Context is kept locally as it is currently needed for logging
(h->avctx as log context) and for is_avc and nal_length_size. These
later fields will later be obtained when the extradata parsing is
decoupled from the decoder. This code will be updated accordingly when
that commit is merged.
Merged-by: Clément Bœsch <u@pkh.me>
Petru Rares Sincraian [Sat, 11 Jun 2016 11:30:09 +0000 (13:30 +0200)]
fate: add afade test
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Sun, 12 Jun 2016 11:38:23 +0000 (13:38 +0200)]
lavc/h264: remove unused ff_h264_init_dequant_tables prototype
Unused since
1534ef87 /
3176217c.
Clément Bœsch [Sun, 12 Jun 2016 11:24:27 +0000 (13:24 +0200)]
Merge commit '
3176217c60ca7828712985092d9102d331ea4f3d'
* commit '
3176217c60ca7828712985092d9102d331ea4f3d':
h264: decouple h264_ps from the h264 decoder
Main changes:
- a local GetBitContext is created for the various
ff_h264_decode_seq_parameter_set() attempts
- just like the old code, remove_sps() is adjusted so it doesn't remove
the pps.
Fixes decode with Ticket #631
http://ffmpeg.org/pipermail/ffmpeg-user/attachments/
20111108/
dae58f17/attachment.mp4
but see next point as well.
- ff_h264_update_thread_context() is updated to work even when SPS
isn't set as it breaks current skip_frame code. This makes sure we
can still decode the sample from ticket #631 without the need for
-flags2 +chunks. (Thanks to Michael)
- keep {sps,pps}_ref pointers that stay alive even when the active
pps/sps get removed from the available lists (patch by michaelni with
additionnal frees in ff_h264_free_context() from mateo)
- added a check on sps in avpriv_h264_has_num_reorder_frames() to fix
crashes with mpegts_with_dvbsubs.ts from Ticket #4074
http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket4074/mpegts_with_dvbsubs.ts
- in h264_parser.c:h264_parse(), after the ff_h264_decode_extradata() is
called, the pps and sps from the local parser context are updated with
the pps and sps from the used h264context. This fixes fate-flv-demux.
- in h264_slice.c, "PPS changed between slices" error is not triggered
anymore in one condition as it makes fate-h264-xavc-4389 fails with
THREADS=N (Thanks to Michael)
Merged-by: Clément Bœsch <clement@stupeflix.com>
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
Paul B Mahol [Mon, 30 May 2016 17:33:31 +0000 (19:33 +0200)]
avcodec/sheervideo: add 10-bit interlaced RGB(A) support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 11 Jun 2016 21:44:06 +0000 (23:44 +0200)]
avcodec/utvideodec: add support for UQRG and UQRA formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Sat, 11 Jun 2016 20:41:18 +0000 (22:41 +0200)]
lavu/file_open: Use current directory for temporary files also on Android.
Fixes ticket #5620.
Carl Eugen Hoyos [Sat, 11 Jun 2016 20:38:41 +0000 (22:38 +0200)]
lavc/libutvideodec: Do not set bits_per_raw_sample.
It is not always 8 but never different from the pix_fmt property.
Paul B Mahol [Sat, 11 Jun 2016 19:31:49 +0000 (21:31 +0200)]
avcodec/utvideodec: fix multiple slices for UQY2 and other issues
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Dave Rice [Sat, 11 Jun 2016 04:55:30 +0000 (00:55 -0400)]
avfilter/vf_histogram: indent histogram options
Dave Rice [Sat, 11 Jun 2016 04:54:59 +0000 (00:54 -0400)]
avfilter/vf_histogram: shortcuts for histogram options
Paul B Mahol [Sat, 11 Jun 2016 16:17:41 +0000 (18:17 +0200)]
avcodec/utvideo: add support for UQY2
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 11 Jun 2016 12:28:24 +0000 (14:28 +0200)]
avcodec/mpc8: Correct end truncation
Fixes Ticket5478
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Rick Kern [Sun, 29 May 2016 02:32:55 +0000 (22:32 -0400)]
lavc/videotoolboxenc: set extradata when opening codec
VideoToolbox doesn't supply parameter sets until the first frame is done
encoding. This spins up a temporary encoder and encodes a single frame to
get this data.
Signed-off-by: Rick Kern <kernrj@gmail.com>
Rick Kern [Sun, 29 May 2016 02:28:04 +0000 (22:28 -0400)]
lavc/videotoolboxenc: fix allocated buffer size
Allocates a buffer with padding, and with enough room for start codes when
length codes are smaller.
Signed-off-by: Rick Kern <kernrj@gmail.com>
Ivan [Fri, 10 Jun 2016 02:12:10 +0000 (22:12 -0400)]
libavformat/flvenc: support for codec configuration change mid stream
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>