3c7195a969
Merge commit '23d461fe8714a20ee5e6929f22c61512fdda568e'
...
* commit '23d461fe8714a20ee5e6929f22c61512fdda568e':
ac3dec: Allow asymmetric application of DRC when drc_scale > 1
Conflicts:
libavcodec/ac3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-30 14:55:03 +01:00
3f35a31ee9
Add rangecoder to the sonic dependencies in configure.
...
Fixes compilation with --disable-everything --enable-decoder=sonic
and --disable-everything --enable-encoder=sonic.
2014-01-30 12:15:28 +01:00
e1cb6dc59e
Warn the user if mjpeg cbr encoding with frame threading was requested.
2014-01-30 01:37:27 +01:00
1a5e8511d4
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Force automatic thread_count to 1 for cbr mjpeg frame threading.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-30 00:55:29 +01:00
b80073c05f
avcodec/mjpegdec: use av_freep() instead of av_free()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-30 00:50:43 +01:00
ed56c021e7
avcodec/mjpegdec Fix potential memleak of stereo3D at the end in case of decoding failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-30 00:25:04 +01:00
cfc36666f6
Force automatic thread_count to 1 for cbr mjpeg frame threading.
...
Constant bit rate mjpeg encoding fails for threads > 1 and frame threading.
2014-01-30 00:22:25 +01:00
e9e7e68516
mjpegdec: parse JPS extension and save relevant stereo3d information
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-30 00:17:02 +01:00
72afa381b3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avformat: utils: Refactor duplicated PRINT macro
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-29 23:40:51 +01:00
64ba831da9
doc: document correct option to list encoders
2014-01-29 23:27:37 +01:00
a17ab0e46a
doc: add decoders.texi
...
Only documents ac3 decoder options at this point.
2014-01-29 23:27:18 +01:00
23d461fe87
ac3dec: Allow asymmetric application of DRC when drc_scale > 1
...
Amplification of quiet sounds is enhanced.
Inspired by gbooker's A52Decoder.
2014-01-29 23:26:25 +01:00
fbafd64acc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpeg: Drop unused parameters from ff_draw_horiz_band()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-29 17:05:51 +01:00
d67cfdeb53
avformat: utils: Refactor duplicated PRINT macro
2014-01-29 17:04:35 +01:00
54b2ce7418
mpeg: Drop unused parameters from ff_draw_horiz_band()
2014-01-29 16:37:23 +01:00
cfe282ec80
Remove now unneeded Makefile dependency for the wtv muxer.
2014-01-29 09:59:45 +01:00
29986885ef
avformat/mpegts: Continue parsing PMTs until at least 2 streams are found or 100kb are reached
...
This (ugly) hack fixes Ticket3348
If someone has an idea on how to fix this nicer, that would be very welcome
but the stream contains several PMTs with just one of the 2 streams at the start
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-29 05:44:03 +01:00
ad61419bbf
avformat/mpegts: drop stray space
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-29 05:43:39 +01:00
bf9a8d183d
Support writing E-AC3 in wav.
2014-01-29 00:48:50 +01:00
862174ec83
Move GUID-related objects to riffenc.c and riff.c.
...
This simplifies the following eac3-in-wav patch.
2014-01-29 00:44:59 +01:00
4151b9953e
Add elbg Makefile dependency to the cinepak encoder.
2014-01-28 22:39:45 +01:00
b50efe85ea
avfilter/vf_colormatrix: update output AVFrame colorspace
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-28 21:52:02 +01:00
3e41e747d6
avfilter/vf_colormatrix: Support using the source AVFrame colorspace if none is specified
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-28 21:52:00 +01:00
5846d8a91e
avformat/hls: Fix cookies and user agent with encrypted HLS streams
...
Session data (cookies, user-agent) is not being sent on payload requests with
encrypted HLS streams This causes services like Akamai to give a 403 forbidden
when requesting the TS files, because they expect the same cookies
and user-agent on all requests
2014-01-28 18:50:58 +01:00
406cb21b63
doc/general: update device and protocol status
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-28 17:58:22 +01:00
9ff2cc685b
MAINTAINERS: add myself as opengl_enc.c maintainer
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-28 15:30:49 +01:00
4115cd0e76
doc/APIchanges: add avdevice_*_control_message functions
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-28 15:30:45 +01:00
bb7a711156
avcodec/huffyuvenc: frame multi-threading support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-28 14:51:42 +01:00
644c32ea4b
x86/vp9lpf: add ff_vp9_loop_filter_[vh]_88_16_sse2()
...
Similar gains as the ssse3 version once again
Signed-off-by: James Almer <jamrial@gmail.com >
2014-01-28 09:30:55 +01:00
222c46c531
x86/vp9lpf: add ff_vp9_loop_filter_[vh]_88_16_{ssse3,avx}.
...
9680 decicycles in loop_filter_v_88_16_c, 4193765 runs, 539 skips
9233 decicycles in loop_filter_h_88_16_c, 4193751 runs, 553 skips
1929 decicycles in ff_vp9_loop_filter_v_88_16_ssse3, 4194118 runs, 186 skips
2738 decicycles in ff_vp9_loop_filter_h_88_16_ssse3, 4193861 runs, 443 skips
5.978 → 5.417 overall decode time on ped1080p.webm (-threads 1)
Adding SSE2 support should be relatively trivial (just a matter of
changing the pshufb [mask_mix] with something else), patch welcome.
2014-01-28 07:36:38 +01:00
2a9c50798b
avcodec/huffyuv: dont depend on bitstream_bpp having a specific value for version>2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-28 00:27:57 +01:00
c94ed2a729
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
lavd: add opengl device
lavd: add avdevice_dev_to_app_control_message API
lavd: add avdevice_app_to_dev_control_message API
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-27 23:45:22 +01:00
673ce8e46a
avcodec/libfdk-aacenc: change MODE_7_1_FRONT_CENTER to map to AV_CH_LAYOUT_7POINT1_WIDE_BACK
...
This was suggested by Rodeo on IRC
<Rodeo> for consistency with the rest, MODE_7_1_FRONT_CENTER would be AV_CH_LAYOUT_7POINT1_WIDE_BACK (since LS+RS is mapped to back channels in other modes)
Reviewed-by: Jean First <jeanfirst@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-27 23:33:10 +01:00
a38842120a
avcodec/libfdk-aacenc: change MODE_7_1_REAR_SURROUND to map to AV_CH_LAYOUT_7POINT1
...
This was suggested by Rodeo on IRC
<Rodeo> sorry, I meant MODE_7_1_REAR_SURROUND would probably be AV_CH_LAYOUT_7POINT1
Reviewed-by: Jean First <jeanfirst@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-27 23:33:10 +01:00
822385d775
x86/vp9lpf: add a preload system in FILTER_UPDATE.
...
Allow some macro refactoring in filter14().
2014-01-27 22:39:26 +01:00
315b4775ad
x86/vp9lpf: refactor v/h using common macros for P7 to Q7.
2014-01-27 22:39:26 +01:00
5d144086cc
x86/vp9lpf: faster P7..Q7 accesses.
...
Introduce 2 additional registers for stride3 and mstride3 to allow
direct accesses (lea drops).
3931 → 3827 decicycles in ff_vp9_loop_filter_v_16_16_ssse3
Also uses defines to clarify the code.
2014-01-27 22:37:42 +01:00
31a0ca9e75
vda: fix crash when a frame is dropped.
...
Signed-off-by: Sebastien Zwickert <dilaroga@gmail.com >
2014-01-27 20:36:42 +01:00
ded6b3af41
lavd: add opengl device
...
It can render to OpenGL context provided by application or into SDL window
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com >
2014-01-27 15:18:18 +01:00
102bd64168
lavd: add avdevice_dev_to_app_control_message API
...
New API allows to send messages from devices to application.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com >
2014-01-27 15:18:17 +01:00
7151411b9c
lavd: add avdevice_app_to_dev_control_message API
...
New API allows to send messages from application to devices.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com >
2014-01-27 15:18:17 +01:00
05e5bb6107
Fix decoding of some 8 < bpc < 16 signed j2k samples with libopenjpeg.
...
No testcase known.
Reviewed-by: Michael Bradshaw
2014-01-27 14:38:59 +01:00
bceeccc648
dxva2: bump maximum number of slieces for mpeg2
...
Suggested by heleppkes on https://trac.ffmpeg.org/ticket/3133
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-27 14:24:29 +01:00
9d087ab5ef
ffplay: remove redundant prototype
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-27 13:36:01 +01:00
6369766f01
avcodec/huffyuv: support gbrp9/10/12/14
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-27 02:11:29 +01:00
7cf8918b0d
avcodec/huffyuv: update years in copyright
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-27 01:45:57 +01:00
17e7048d30
Merge commit 'b7d0d10a1d54073501b728dbe166a32e2b7b26f1'
...
* commit 'b7d0d10a1d54073501b728dbe166a32e2b7b26f1':
x86inc: Speed up assembling with Yasm
See: 4d55fe7204michaelni@gmx.at >
2014-01-26 23:42:20 +01:00
896d6a7736
Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'
...
* commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654':
avformat: utils: K&R formatting cosmetics
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-26 23:35:38 +01:00
c2871568cf
vp9: fix invalid ref frame w/h on size change.
...
Fixes invalid reads and crashes in vp90-2-05-resize.webm and fuzzed6.ivf.
The output is still not identical to what libvpx does (because we don't
actually scale in MC).
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-26 20:16:01 +01:00
d9343c3484
vp9: disable use_last_frame_mvs on resolution change (scalable).
...
Prevents some invalid memory accesses after resolution change in
vp90-2-05-resize.webm, and libvpx does this too.
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-26 20:15:45 +01:00
