Andrey Utkin [Thu, 13 Sep 2012 11:10:26 +0000 (14:10 +0300)]
udp: pick params from AVOptions also
This updated version does not deviate from previous behavior on default value of 'buffer_size'
I skipped porting 'sources', 'block' options for now as they're parsed seriously. So i added TODO remarks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Sep 2012 19:30:57 +0000 (21:30 +0200)]
pngdec: av_log() zlib errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 11 Sep 2012 15:50:23 +0000 (11:50 -0400)]
Remove mt-work directory
It is all dead and rotting code.
Also, move yuvcmp.c to tools. Its license is non-existent, however,
and should be clarified.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Ben Jackson [Sat, 15 Sep 2012 17:32:44 +0000 (10:32 -0700)]
lavc/vp56: Re-indent functions affected by threading refactor
All whitespace plus a curly brace.
Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ben Jackson [Sat, 15 Sep 2012 17:32:43 +0000 (10:32 -0700)]
lavc/vp6: Implement "slice" threading for VP6A decode
The YUV channels of VP6 are encoded in a highly linear fashion which does
not have any slice-like concept to thread. The alpha channel of VP6A is
fairly independent of the YUV and comprises 40% of the work. This patch
uses the THREAD_SLICE capability to split the YUV and A decodes into
separate threads.
Two bugs are fixed by splitting YUV and alpha state:
- qscale_table from VP6A decode was for alpha channel instead of YUV
- alpha channel filtering settings were overwritten by YUV header parse
Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ben Jackson [Sat, 15 Sep 2012 17:32:42 +0000 (10:32 -0700)]
lavc/vp56: Simplify get/release_buffer code
Rather than cleverly managing frame pointers with swaps to avoid
re-using "golden" frames, just do brute-force management of the
4 AVFrames. New strategy is probably no more costly and is easier
to adapt to threaded usage.
Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ben Jackson [Sat, 15 Sep 2012 17:32:41 +0000 (10:32 -0700)]
lavc/vp56: Move golden_frame into VP56Context
Makes golden_frame more like other frame data, paves way for threading
alpha channel decode.
Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ben Jackson [Sat, 15 Sep 2012 17:32:40 +0000 (10:32 -0700)]
lavc/vp6: Refactor vp6_decode_init into vp6_decode_init/vp6_decode_init_context
Pave the way for per-thread context initialization.
Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ben Jackson [Sat, 15 Sep 2012 17:32:39 +0000 (10:32 -0700)]
lavc/vp56: Refactor ff_vp56_init into ff_vp56_init/ff_vp56_init_context
Pave the way for per-thread context initialization.
Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Sep 2012 14:22:59 +0000 (16:22 +0200)]
x86/v210: fix xmm clobbers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Thu, 13 Sep 2012 00:43:29 +0000 (03:43 +0300)]
Document tcp proto 'timeout' parameter behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 9 Sep 2012 14:37:45 +0000 (16:37 +0200)]
ffmpeg: use PTS from the AVSubtitle structure for sub2video.
Nicolas George [Sun, 9 Sep 2012 14:28:51 +0000 (16:28 +0200)]
ffplay: use PTS from the AVSubtitle structure.
Nicolas George [Sun, 9 Sep 2012 14:28:30 +0000 (16:28 +0200)]
ffmpeg: use PTS from the AVSubtitle structure.
Nicolas George [Sun, 9 Sep 2012 14:08:39 +0000 (16:08 +0200)]
lavc/pgssubdec: use the PTS from the presentation segment.
According to the sample for trac ticket #1722, PGS subtitles
are decoded from several packets at the same DTS and varying PTS.
The PTS from the presentation segment seem to be the valid one;
in particular, clear subtitles are too early with the other PTS.
Nicolas George [Sun, 9 Sep 2012 14:00:06 +0000 (16:00 +0200)]
lavc: set AVSubtitle.pts if possible.
If the packet has a PTS and the corresponding time base is known,
set the pts field of the decoded subtitle structure before the
call to the decoder. The decoder is still allowed to change the
PTS if necessary.
Nicolas George [Sun, 9 Sep 2012 13:53:21 +0000 (15:53 +0200)]
ffmpeg: call sub2video_update for end packets.
Without that change, all subtitles will stay until the next one.
Michael Niedermayer [Sat, 15 Sep 2012 08:09:55 +0000 (10:09 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
riff: Add SVQ3 fourcc
fate: ac3: add 4.0 and downmix tests
configure: x86: improve ebp availability check
vorbisdec: ensure FASTDIV denominator is never 1
avformat: refactor avformat_close_input
avformat: simplify avformat_close_input
Conflicts:
configure
libavcodec/vorbisdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Sep 2012 01:03:49 +0000 (03:03 +0200)]
bintext: mark hscroll() as unused
This fixes a warning about a unused function
Alternatively the function could be removed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Akihiro Tsukada [Sat, 25 Aug 2012 11:30:54 +0000 (20:30 +0900)]
aacdec: add support for dual mono in Japanese DTV
Japanese DTV uses some non standard extensions in AAC audio.
One example is 'dual mono', which combines two independent
audio into one stereo stream, storing them in left and right channels
respectively. Historically, dual mono audio has been used for
multi-lingual audio, one for local/native language, and another for english,
and usually the "main" (local language) channel should be output without
any user interactions.
The frames of those dual mono audio are allowed to set
ADTS channel_config field to 0, and just contain two SCE's *WITHOUT* PCE,
which is a non standard extension by Japanese DTV standard.
(ref. ARIB STD-B32 PartII 5.2.3)
This patch adds an AVPacket side data, AV_PKT_DATA_JP_DUALMONO,
which indicates that the AVPacket is likely to contain an audio frame
with the above dual mono extension, and has the parameter to specify
the desired channel selection in that case.
It also makes aacdec to detect dual mono and output just the desired
channel when this side data is attached.
Signed-off-by: Akihiro Tsukada <atsukada@users.sourceforge.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jérémy Tran [Fri, 14 Sep 2012 17:31:13 +0000 (19:31 +0200)]
lavfi/hue: add dynamic expression evaluation support
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Fri, 14 Sep 2012 12:06:55 +0000 (14:06 +0200)]
tools: move raw-test program to tools, with the name fourcc2pixfmt
Derek Buitenhuis [Fri, 14 Sep 2012 14:10:50 +0000 (14:10 +0000)]
riff: Add SVQ3 fourcc
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 14 Sep 2012 15:12:58 +0000 (11:12 -0400)]
riff: Add SVQ3 fourcc
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Sep 2012 17:46:44 +0000 (19:46 +0200)]
lavf/compute_pkt_fields: only run pts by duration correction if reference ts is available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Wed, 12 Sep 2012 22:24:50 +0000 (23:24 +0100)]
fate: ac3: add 4.0 and downmix tests
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 13 Sep 2012 19:17:54 +0000 (20:17 +0100)]
configure: x86: improve ebp availability check
Some compilers are extra strict about register usage in main(),
disallowing ebp in inline asm there while allowing it elsewhere.
This change makes the test better reflect actual usage.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Luca Barbato [Thu, 13 Sep 2012 17:45:21 +0000 (19:45 +0200)]
vorbisdec: ensure FASTDIV denominator is never 1
In both usages of FASTDIV the denominator might be 1.
Using a branch could make the function slower than using a normal
division.
Both denominator and numerator can be multiplied by 2 safely and
using shifts is faster than using a branch.
Luca Barbato [Tue, 4 Sep 2012 14:05:28 +0000 (16:05 +0200)]
avformat: refactor avformat_close_input
Do not crash if the input format is not allocated yet.
Luca Barbato [Mon, 10 Sep 2012 05:07:56 +0000 (07:07 +0200)]
avformat: simplify avformat_close_input
avio_close checks by itself for NULL condition.
Michael Niedermayer [Fri, 14 Sep 2012 12:07:21 +0000 (14:07 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place
trasher: Include all the necessary headers
x86: Remove some leftover declarations for non-existent functions
ARM: libavresample: NEON optimised generic fltp to s16 conversion
ARM: libavresample: NEON optimised stereo fltp to s16 conversion
ARM: libavresample: NEON optimised flat float to s16 conversion
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 14 Sep 2012 09:27:23 +0000 (11:27 +0200)]
tools/graphdot: unbreak syntax
Fix regression introduced in
f054dbee6cc5195ba8f37823a494dab2d26e7cca.
+10.23l.
Stefano Sabatini [Thu, 13 Sep 2012 08:56:54 +0000 (10:56 +0200)]
lavfi/avcodec: apply cosmetics style fixes
Stefano Sabatini [Wed, 12 Sep 2012 22:59:49 +0000 (00:59 +0200)]
ffprobe: kill initializers with nested union field definition
The c99-to-c89 converter (for MSVC support) doesn't currently handle
designated initializers or compound literals with nested unions or
structs.
This is apparently the only place where this construct is used in the
FFmpeg codebase.
Stefano Sabatini [Wed, 12 Sep 2012 22:44:04 +0000 (00:44 +0200)]
ffprobe: avoid potentially lossy long long int -> double cast in value_string()
Previously the cast long long int -> double was always performed (and
then the double was converted back to long long int) even when it was
avoidable.
Ben Jackson [Fri, 14 Sep 2012 04:26:43 +0000 (21:26 -0700)]
pthread: Avoid crashes/odd behavior caused by spurious wakeups
pthread_wait_cond can wake up for no reason (Wikipedia: Spurious_wakeup).
The FF_THREAD_SLICE thread mechanism could spontaneously execute jobs or
allow the caller of avctx->execute to return before all jobs were complete.
This adds tests to both cases to ensure the wakeup is real.
Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Sep 2012 03:55:11 +0000 (05:55 +0200)]
mpegaudio_parser: reset state to prevent it to be random
Fixes Ticket1718
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Sep 2012 01:27:25 +0000 (03:27 +0200)]
aacpsy: psy_3gpp_analyze_channel() handle energy == 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Sep 2012 01:26:19 +0000 (03:26 +0200)]
aacpsy: calc_reduction_3gpp() handle active_lines = 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Sep 2012 00:30:00 +0000 (02:30 +0200)]
compute_pkt_fields2: dont interpret max_b_frames of <0 as there being b frames.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 13 Sep 2012 22:59:03 +0000 (00:59 +0200)]
x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place
Michael Niedermayer [Thu, 13 Sep 2012 20:08:00 +0000 (22:08 +0200)]
mpegaudioenc: replace pow(2,.. by exp2(
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 13 Sep 2012 08:16:38 +0000 (10:16 +0200)]
examples/decoding_encoding: clarify operations in the usage message
Martin Storsjö [Thu, 13 Sep 2012 09:55:44 +0000 (12:55 +0300)]
trasher: Include all the necessary headers
The missing headers are required for errno and for strerror.
This fixes building of this tool on mingw32ce.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Thu, 13 Sep 2012 10:45:33 +0000 (12:45 +0200)]
x86: Remove some leftover declarations for non-existent functions
Stefano Sabatini [Thu, 13 Sep 2012 08:09:44 +0000 (10:09 +0200)]
examples/decoding_encoding: replace "picture" with "frame" in encode_example()
The use of "picture" in place of "frame" is confusing.
Stefano Sabatini [Thu, 13 Sep 2012 08:06:36 +0000 (10:06 +0200)]
examples/decoding_encoding: apply various message log fixes
Mans Rullgard [Mon, 10 Sep 2012 14:47:00 +0000 (15:47 +0100)]
ARM: libavresample: NEON optimised generic fltp to s16 conversion
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 10 Sep 2012 14:47:00 +0000 (15:47 +0100)]
ARM: libavresample: NEON optimised stereo fltp to s16 conversion
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 9 Sep 2012 18:25:43 +0000 (19:25 +0100)]
ARM: libavresample: NEON optimised flat float to s16 conversion
Signed-off-by: Mans Rullgard <mans@mansr.com>
Nicolas George [Wed, 12 Sep 2012 19:00:34 +0000 (21:00 +0200)]
lavfi: check that buffer and link properties match.
Nicolas George [Thu, 13 Sep 2012 15:13:10 +0000 (17:13 +0200)]
lavfi: set sample_rate in the default allocator.
Michael Niedermayer [Thu, 13 Sep 2012 16:03:13 +0000 (18:03 +0200)]
swr/resample: mark mm_flags as potentially unused
They are unused when asm is disabled
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Sep 2012 15:56:09 +0000 (17:56 +0200)]
x86_cpu.h: newline at the end to shutup some warnings in opencc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Wed, 12 Sep 2012 22:01:22 +0000 (18:01 -0400)]
Revert "lavc/libx264: remap X264_LOG_INFO loglevel from AV_LOG_INFO to VERBOSE"
You should not need to enable verbose logging and all the output that comes
with it in order to get things like the obtained bitrate from a first
pass encode. Many things parse this output.
Also, since it is marked as info in libx264, it should be marked as
info in libavcodec as well.
This reverts commit
911519caec2346fc7728bca9840ffc000e866161.
Michael Niedermayer [Wed, 12 Sep 2012 16:01:36 +0000 (18:01 +0200)]
mpegvideo: skip ff_print_debug_info() for VDPAU
Based on code by: MEANX / gruntster (Avidemux Rev 7990 — 2012-05-30 13:02:27)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Sep 2012 15:45:33 +0000 (17:45 +0200)]
libavformat.v: export ffurl_protocol_next
This is used by avidemux, and is likely usefull to others too.
Patch by: gruntster (Avidemux Rev 7990 — 2012-05-30 13:02:27)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Sep 2012 13:53:05 +0000 (15:53 +0200)]
sws: revert: "swscale: Remove two bogus asserts"
Also change them to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Sep 2012 13:35:50 +0000 (15:35 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
os_support: Choose between direct.h and io.h using a configure check
os_support: Include io.h instead of direct.h on mingw32ce
x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared
swscale: Remove two bogus asserts
ac3: move ac3_downmix() from dsputil to ac3dsp
lavr/audio_mix_matrix: acknowledge the existence of LFE2.
mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel.
lavu/audioconvert: add a second low frequency channel.
Conflicts:
doc/APIchanges
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h
libavcodec/mlp_parser.c
libavutil/audioconvert.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Sep 2012 13:21:26 +0000 (15:21 +0200)]
Merge commit '
07584eaf4a95db3f11d3bc411f9786932829e82b'
* commit '
07584eaf4a95db3f11d3bc411f9786932829e82b':
mpegts: check substreams before discarding
Add a smooth streaming segmenter muxer
file: Add an avoption for disabling truncating existing files on open
img2dec: always close AVIOContexts
rtpdec_jpeg: Error out on other unsupported type values as well
rtpdec_jpeg: Disallow using the reserved q values
rtpdec_jpeg: Fold the default qtables case into an existing if statement
rtpdec_jpeg: Store and reuse old qtables for q values 128-254
rtpdec_jpeg: Simplify the calculation of the number of qtables
rtpdec_jpeg: Add more comments about the fields in the SOF0 section
rtpdec_jpeg: Clarify where the subsampling magic numbers come from
rtpdec_jpeg: Don't use a bitstream writer for the EOI marker
rtpdec_jpeg: Don't needlessly use a bitstream writer for the header
rtpdec_jpeg: Simplify writing of the jpeg header
rtpdec_jpeg: Merge two if statements
rtpdec_jpeg: Write the DHT section properly
Conflicts:
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 13 Sep 2012 11:26:10 +0000 (14:26 +0300)]
os_support: Choose between direct.h and io.h using a configure check
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 13 Sep 2012 09:34:17 +0000 (12:34 +0300)]
os_support: Include io.h instead of direct.h on mingw32ce
Windows CE doesn't have neither mkdir nor _mkdir officially (only
CreateDirectoryW), but mingw32ce has compat wrappers with these names
(declared in io.h since direct.h is unavailable).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 13 Sep 2012 08:18:25 +0000 (11:18 +0300)]
x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared
This fixes building without inline assembly.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Tue, 11 Sep 2012 20:11:25 +0000 (22:11 +0200)]
swscale: Remove two bogus asserts
Nicolas George [Wed, 12 Sep 2012 17:34:21 +0000 (19:34 +0200)]
lavfi/aresample: set buffer properties after copy.
The aresample filter changes the format, layout and/or sample rate,
it can not copy them blindly from its input.
Related to trac ticket #1671.
Mans Rullgard [Tue, 11 Sep 2012 16:55:11 +0000 (17:55 +0100)]
ac3: move ac3_downmix() from dsputil to ac3dsp
Signed-off-by: Mans Rullgard <mans@mansr.com>
Tim Walker [Wed, 12 Sep 2012 15:09:33 +0000 (17:09 +0200)]
lavr/audio_mix_matrix: acknowledge the existence of LFE2.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Tim Walker [Wed, 12 Sep 2012 15:09:32 +0000 (17:09 +0200)]
mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Tim Walker [Wed, 12 Sep 2012 15:09:31 +0000 (17:09 +0200)]
lavu/audioconvert: add a second low frequency channel.
Can be used by DTS-HD, TrueHD and E-AC-3, among others.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Christian Schmidt [Thu, 6 Sep 2012 14:43:24 +0000 (16:43 +0200)]
mpegts: check substreams before discarding
Allow to extract the AC3 core from TrueHD with the "copy" codec.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö [Mon, 19 Mar 2012 21:12:54 +0000 (23:12 +0200)]
Add a smooth streaming segmenter muxer
This muxer splits the output from the ismv muxer into individual
files, in realtime.
The same can also be done by the standalone tool ismindex, but this
muxer is needed for doing it in realtime (especially for live
streams that need extra handling for updating the lookahead fields
in the fragment headers).
Using this muxer, one can deliver live smooth streaming from a
normal static file web server. (Using ismindex, one can deliver
premade smooth streaming files from a static file web server,
or prepare files for serving with IIS.)
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 9 Sep 2012 19:42:56 +0000 (22:42 +0300)]
file: Add an avoption for disabling truncating existing files on open
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 12 Sep 2012 19:12:18 +0000 (21:12 +0200)]
vc1dec: export adv profile color format indication
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Sep 2012 18:35:09 +0000 (20:35 +0200)]
asfdec: invert SAR
It appears this was wrong
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Sep 2012 17:37:29 +0000 (19:37 +0200)]
configure: try to support clang on netbsd
The headers on netbsd are not fully C99 compatible which leads to multiple
definitions of symbols in clang bit not with gcc.
AFAIK this has been fixed in netbsd trunk (didnt check though)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Fri, 7 Sep 2012 11:28:48 +0000 (13:28 +0200)]
img2dec: always close AVIOContexts
Zero sized files would cause the contexts to leak away.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Carl Eugen Hoyos [Wed, 12 Sep 2012 11:33:57 +0000 (13:33 +0200)]
Support decoding of monochrome tiff images without bpp tag.
Carl Eugen Hoyos [Wed, 12 Sep 2012 11:08:27 +0000 (13:08 +0200)]
Fix muxing mjpeg in swf.
Michael Niedermayer [Wed, 12 Sep 2012 09:46:47 +0000 (11:46 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
utvideoenc: Add missing AV_ prefix to codec ID
avserver: Add missing #include for av_gettime()
configure: Only disable aligned stack on MSVC on 32 bit
configure: indentation cosmetics
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 11 Sep 2012 11:42:22 +0000 (14:42 +0300)]
rtpdec_jpeg: Error out on other unsupported type values as well
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 11:41:42 +0000 (14:41 +0300)]
rtpdec_jpeg: Disallow using the reserved q values
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 11:39:58 +0000 (14:39 +0300)]
rtpdec_jpeg: Fold the default qtables case into an existing if statement
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 11:29:54 +0000 (14:29 +0300)]
rtpdec_jpeg: Store and reuse old qtables for q values 128-254
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 11:43:10 +0000 (14:43 +0300)]
rtpdec_jpeg: Simplify the calculation of the number of qtables
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 09:54:06 +0000 (12:54 +0300)]
rtpdec_jpeg: Add more comments about the fields in the SOF0 section
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 09:52:55 +0000 (12:52 +0300)]
rtpdec_jpeg: Clarify where the subsampling magic numbers come from
Write out the numbers the way they are constructed, not just the
final values.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 09:46:44 +0000 (12:46 +0300)]
rtpdec_jpeg: Don't use a bitstream writer for the EOI marker
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 09:44:25 +0000 (12:44 +0300)]
rtpdec_jpeg: Don't needlessly use a bitstream writer for the header
Everything written with this bitstream writer is 8/16 bit units
(except for a pair of 4 bit values), so using a bitstream writer
isn't necessary.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 09:32:37 +0000 (12:32 +0300)]
rtpdec_jpeg: Simplify writing of the jpeg header
Generalize writing of any number of qtables. Don't manually write
16 bit values in two separate calls.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 09:07:56 +0000 (12:07 +0300)]
rtpdec_jpeg: Merge two if statements
This makes the code more readable and robust.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Sep 2012 08:03:05 +0000 (11:03 +0300)]
rtpdec_jpeg: Write the DHT section properly
Currently the size header of the generated DHT section is
incorrect, making the mjpeg decoder just skip it. Since the
written huffman tables are the default ones, this failure had
gone undetected.
Signed-off-by: Martin Storsjö <martin@martin.st>
Stefano Sabatini [Sat, 8 Sep 2012 11:00:13 +0000 (13:00 +0200)]
ffprobe: print start_pts and duration_ts stream information
Derek Buitenhuis [Tue, 11 Sep 2012 21:23:47 +0000 (17:23 -0400)]
FATE/bprint: Convert a VLA to a normal array
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Sep 2012 03:17:52 +0000 (05:17 +0200)]
rtmpproto: reorder some expressions to fix compilation with clang without optimizations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Sep 2012 21:33:25 +0000 (23:33 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: increase sample array buffer
configure: add crop filter as ffplay requirement
ffplay: ensure that pictq_prev_picture never fills the picture queue
ffplay: simplify picture allocation
ffplay: make initial window size calculation based on aspect ratio
ffplay: factor display rectangle calculation to its own function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 11 Sep 2012 19:54:10 +0000 (15:54 -0400)]
diracdsp: Fix unprotected inline asm
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 11 Sep 2012 19:54:09 +0000 (15:54 -0400)]
ffmpeg: Only include unistd.h if it exists
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 11 Sep 2012 20:51:46 +0000 (22:51 +0200)]
lavd/lavfi: apply stylistic fixes to the options help fields
Stefano Sabatini [Tue, 11 Sep 2012 09:49:14 +0000 (11:49 +0200)]
ffprobe: add priv_class field to Writer, and factorize writer options initialization
Marton Balint [Thu, 6 Sep 2012 21:35:04 +0000 (23:35 +0200)]
ffplay: increase sample array buffer
A decoded and resampled audio frame may not fit in the current size which is
not handled by the current code causing out of order waveform displays or even
channel mixups. A todo is added because this part can certainly be improved to
consume less memory but work reliably for any frame size.
Signed-off-by: Marton Balint <cus@passwd.hu>