generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
34,111 Commits 24 Branches 241 Tags 173 MiB
a67cb012e6
Commit Graph

34111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
f22bc68dc0 Merge remote-tracking branch 'hexene/stagefright' 
* hexene/stagefright:
  libstagefright: start decode_thread() only after decode_frame() is called at least once.
  libstagefright: mark the dummy frame as keyframe.
  libstagefright: limit the output queue size
  libstagefright: return EOS if CustomSource::read() is called after decode_thread() returns
  libstagefright: set the correct frame size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-07 15:32:30 +02:00
Mohamed Naufal
a85996d834 libstagefright: start decode_thread() only after decode_frame() is called at least once. 
This prevents the situation where EOS is passed as the first frame to the
h/w decoder and thus avoids a potential crash.
 2011-10-07 18:32:44 +05:30
Mohamed Naufal
fedbf9177c libstagefright: mark the dummy frame as keyframe. 
This makes sure decoder->read() returns if it is the first frame fed.
 2011-10-07 18:32:40 +05:30
Mohamed Naufal
295f13953d libstagefright: limit the output queue size 2011-10-07 18:32:36 +05:30
Mohamed Naufal
23ea48f2f7 libstagefright: return EOS if CustomSource::read() is called after decode_thread() returns 2011-10-07 18:32:31 +05:30
Mohamed Naufal
09a49e8919 libstagefright: set the correct frame size 2011-10-07 18:32:23 +05:30
Michael Niedermayer
14c21c1ff5 H264: Only wait before triggering ff_thread_setup_complete() until the next slice that contains a start-of-field/frame macroblock 
This allows concurrent decoding of the last field/frame, rather than
only the last slice, of data packets with multiple NAL units packed
together.

This will fix the slowdown reported in e.g. bug 52.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-07 14:23:26 +02:00
Michael Niedermayer
355cc1a052 swresample/rematrix: show matrix with debug log level 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-07 13:51:40 +02:00
Michael Niedermayer
86602d1c79 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vp6: Reset the internal state when aborting key frames header parsing
  vp56: Release old pictures after a resolution changes
  vp6: Check for huffman tree build errors
  vp56: Check for missing reference frame data
  cinepak: Fix invalid read access on extra data
  vmd: fix segfaults on corruped streams
  cook: Fix js_vlc_bits value validation for joint stereo
  segafilm: Check for memory allocation failures in segafilm demuxer.
  segafilm: Fix potential division by 0 on corrupted streams in the demuxer
  Fixed segfault on corrupted sega streams in the demuxer.
  Fixed deference of NULL pointer in motionpixels decoder.
  libx264: support 9- and 10-bit output.
  h264: correct implicit_weight for field-interlaced pictures.
  mpegvideo: set correct offset for edge emulation buffer.
  mpegvideo: fix position of bottom edge.

Conflicts:
	libavcodec/motionpixels.c
	libavcodec/mpegvideo.c
	libavcodec/version.h
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-07 03:38:50 +02:00
Marton Balint
177ed7e818 swresample: use av_get_default_channel_layout instead of guess_layout 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-07 02:53:18 +02:00
Marton Balint
cbfca6225a avutil: bump minor version because of av_get_default_channel_layout type fix 
Well, probably an ABI breakage at least for 32bit, but hopefully it will go
unnoticed because the fix happened realtively soon.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-07 02:53:18 +02:00
Marton Balint
d2ba604421 audioconvert: fix type of av_get_default_channel_layout 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-07 02:53:18 +02:00
Michael Niedermayer
b93cb8383f lavc: add ff_init_buffer_info() 
Fixes seeking per fileposition in ffplay.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-07 02:29:31 +02:00
Laurent Aimar
5ec55d216e h264: reject unsupported 422 9 bit streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-07 00:57:05 +02:00
Marton Balint
9bf4371e1b audioconvert: make 7POINT1 channel layout the default for 8 channels 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-07 00:57:05 +02:00
Laurent Aimar
e588a5c2d4 h264: fix the size of PPS::chroma_qp_table 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-07 00:57:05 +02:00
Laurent Aimar
a72cad0a6c vp6: Reset the internal state when aborting key frames header parsing 
It prevents leaving the state only half initialized.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-07 00:37:32 +02:00
Laurent Aimar
3d09d0017d vp56: Release old pictures after a resolution changes 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-07 00:27:24 +02:00
Laurent Aimar
066fff755a vp6: Check for huffman tree build errors 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-07 00:27:03 +02:00
Laurent Aimar
0ec6d6e9b6 vp56: Check for missing reference frame data 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-07 00:25:43 +02:00
Laurent Aimar
d239d4b447 cinepak: Fix invalid read access on extra data 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-06 23:35:29 +02:00
Laurent Aimar
c0cbe36b18 vmd: fix segfaults on corruped streams 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-06 23:33:09 +02:00
Laurent Aimar
3a742470a8 cook: Fix js_vlc_bits value validation for joint stereo 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-06 23:31:06 +02:00
Laurent Aimar
1775b92fee segafilm: Check for memory allocation failures in segafilm demuxer. 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-06 23:19:45 +02:00
Laurent Aimar
762ffa6861 segafilm: Fix potential division by 0 on corrupted streams in the demuxer 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-06 23:01:45 +02:00
Michael Niedermayer
a3ba542af3 h264: fix fill_colmap() to not store entries mbaff style when the reference is not mbaff at all 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 22:54:00 +02:00
Laurent Aimar
790f4dd5c9 Fixed segfault on corrupted sega streams in the demuxer. 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-06 22:32:02 +02:00
Laurent Aimar
69a0bce753 Fixed deference of NULL pointer in motionpixels decoder. 
Some of the arguments given to init_vlc() come from the stream
and can be corrupted.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-06 22:29:12 +02:00
Michael Niedermayer
481747c6f7 ffmpeg: make -a/v/sn work with -map 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 21:59:50 +02:00
Michael Niedermayer
f7fbbf466f lavf/utils: document AVIndexEntry.timestamp 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 20:21:40 +02:00
Michael Niedermayer
67b2df792f swresample: Try to handle cases with input channel count and layout mismatching. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 20:21:40 +02:00
Clément Bœsch
696a780c47 bintext: fix warning message wording. 2011-10-06 18:42:42 +02:00
Gwenole Beauchesne
825dd135d8 vaapi: fix VC-1 decoding (reconstruct bitstream TTFRM correctly). 2011-10-06 15:35:48 +02:00
Michael Niedermayer
955113e31b mpegps: drop incorrect line of sofdec detection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 12:40:35 +02:00
Michael Niedermayer
5bebb6e64b mpeg1dec: More complete sofdec support 
Fixes Ticket517

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 12:40:31 +02:00
Anton Khirnov
d97efd7f87 libx264: support 9- and 10-bit output. 2011-10-06 09:16:06 +02:00
Clément Bœsch
1b3b4a575b libmodplug: free file content buffer in read_close() callback. 2011-10-06 08:50:56 +02:00
Clément Bœsch
8830c4e8a9 libmodplug: add TODO entry for probing. 2011-10-06 08:30:38 +02:00
Clément Bœsch
c768e96668 libmodplug: add metadata support. 2011-10-06 08:30:38 +02:00
Clément Bœsch
e6f937237a libmodplug: add an option to enlarge the max supported file size. 2011-10-06 08:30:37 +02:00
Clément Bœsch
a763b46298 libmodplug: support options (noise reduction, reverb, bass boost, ...) 2011-10-06 08:30:37 +02:00
Michael Niedermayer
6638207bce Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fix 'heigth' vs. 'height' typos.
  lavc/lavf: use unique private classes.
  lavc: use designated initializers for av_codec_context_class

Conflicts:
	libavdevice/fbdev.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 03:42:14 +02:00
Nicolas George
2c1c0c5024 ffmpeg: fix forced key frames. 
Now that the option was moved in the per-stream context,
the parsing is done before the time_base for the stream is decided.
This patch does the parsing in AV_TIME_BASE units and rescales the
timestamps later when the correct time base is known.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 03:39:15 +02:00
Michael Niedermayer
714517b26a flvenc: Ignore metadata that has special values and is stored already based on 
more correct values.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 03:20:57 +02:00
Michael Niedermayer
9fa05db400 swr-docs: update due to last change to swresample 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 00:32:01 +02:00
Michael Niedermayer
503e5e9db5 libswresample: support directly converting sampleformats and packed/planar in a single pass. 
Previously a intermediate planar format was used when both input and output where packed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 00:07:03 +02:00
Michael Niedermayer
63b6d5f33f update_stream_timings: Remove redundant check. 
Found-by:Nicolas
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-06 00:07:03 +02:00
Clément Bœsch
d7366d918f libmodplug: handle EOF correctly. 2011-10-05 23:45:09 +02:00
Carl Eugen Hoyos
d9b6068764 Use WMAv2 as default audio codec for asf. 2011-10-05 23:44:14 +02:00
Carl Eugen Hoyos
3bcbd8c5c7 Use M4S2 as default video tag for MPEG-4 ASP in asf. 2011-10-05 23:44:13 +02:00