ffmpeg.git
9 years agoffplay: remove unused field VideoState.dtg_active_format
Stefano Sabatini [Tue, 12 Apr 2011 15:07:53 +0000 (17:07 +0200)]
ffplay: remove unused field VideoState.dtg_active_format

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoFix compilation with --disable-avfilter.
Carl Eugen Hoyos [Wed, 13 Apr 2011 07:55:47 +0000 (09:55 +0200)]
Fix compilation with --disable-avfilter.

9 years agoflv demuxer: dont error out due to index problems, but inform the user about it.
Michael Niedermayer [Wed, 13 Apr 2011 00:52:16 +0000 (02:52 +0200)]
flv demuxer: dont error out due to index problems, but inform the user about it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Wed, 13 Apr 2011 00:49:22 +0000 (02:49 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
Partially merged:flvdec: Allow parsing keyframes metadata without seeking in most cases
  Error out if vaapi is not found
  avio: undeprecate av_url_read_fseek/fpause under nicer names
  libvo-*: Don't use deprecated sample format names and enum names
DUPLICATE  flvdec: Fix support for flvtool2 "keyframes based" generated index
DUPLICATE  libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization
  Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32.
  Convert some undefined 1<<31 shifts into 1U<<31.

Conflicts:
configure
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c
libavformat/flvdec.c

Marged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoASS decoder also requires ass_split.o to be compiled.
Reimar Döffinger [Tue, 12 Apr 2011 22:56:18 +0000 (00:56 +0200)]
ASS decoder also requires ass_split.o to be compiled.

9 years agoflvdec: Allow parsing keyframes metadata without seeking in most cases
Martin Storsjö [Tue, 12 Apr 2011 13:37:54 +0000 (16:37 +0300)]
flvdec: Allow parsing keyframes metadata without seeking in most cases

Stop the avio input at a point where amf_parse_object can
continue parsing the end of the object seamlessly, when all
data is available.

If unsupported data is encountered within the keyframes object,
try seeking to the start of the keyframes object - if the seek
back was successful, the caller can continue parsing the rest
of the AMF data.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoError out if vaapi is not found
Luca Barbato [Mon, 4 Apr 2011 13:24:19 +0000 (15:24 +0200)]
Error out if vaapi is not found

Make the behaviour consistent with the other external deps.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoavio: undeprecate av_url_read_fseek/fpause under nicer names
Anton Khirnov [Tue, 12 Apr 2011 07:37:10 +0000 (09:37 +0200)]
avio: undeprecate av_url_read_fseek/fpause under nicer names

It seems their replacements won't be ready anytime soon.

9 years agoFix compilation with --disable-yasm.
Carl Eugen Hoyos [Tue, 12 Apr 2011 15:40:18 +0000 (17:40 +0200)]
Fix compilation with --disable-yasm.

9 years agoAdd forgotten const to enum AVSampleFormat
Michael Niedermayer [Tue, 12 Apr 2011 12:25:37 +0000 (14:25 +0200)]
Add forgotten const to enum AVSampleFormat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibvo-*: Don't use deprecated sample format names and enum names
Martin Storsjö [Tue, 12 Apr 2011 07:33:35 +0000 (10:33 +0300)]
libvo-*: Don't use deprecated sample format names and enum names

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoflvdec: Fix support for flvtool2 "keyframes based" generated index
Kharkov Alexander [Fri, 8 Apr 2011 09:20:45 +0000 (16:20 +0700)]
flvdec: Fix support for flvtool2 "keyframes based" generated index

Current keyframes data parser unconditionally rewind metadata to
the end at the end of function. As result ALL metadata located
after keyframes index not parsed, and as metadata object can have
ANY placement inside metadata it can lead to unpredictable result
(bitrate can not be found, etc.). As result FLV movie will not
play at all in such situation.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agolibavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization
Martin Storsjö [Tue, 12 Apr 2011 07:32:43 +0000 (10:32 +0300)]
libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoCosmetics: Rename variable param as the more appropriate dpyname.
Sven C. Dack [Tue, 12 Apr 2011 07:33:19 +0000 (09:33 +0200)]
Cosmetics: Rename variable param as the more appropriate dpyname.

9 years agoCosmetics: Fix white-space in av_log() message.
Sven C. Dack [Tue, 12 Apr 2011 07:27:23 +0000 (09:27 +0200)]
Cosmetics: Fix white-space in av_log() message.

9 years agoFix output of AV_CH_LAYOUT_5POINT0 via alsa by reordering channels.
Carl Eugen Hoyos [Tue, 12 Apr 2011 07:17:26 +0000 (09:17 +0200)]
Fix output of AV_CH_LAYOUT_5POINT0 via alsa by reordering channels.

9 years agoSupport CODEC_ID_PCM_F64* output via alsa (stereo only).
Carl Eugen Hoyos [Tue, 12 Apr 2011 07:11:56 +0000 (09:11 +0200)]
Support CODEC_ID_PCM_F64* output via alsa (stereo only).

9 years agoSupport CODEC_ID_PCM_S24* output via alsa (stereo only).
Carl Eugen Hoyos [Tue, 12 Apr 2011 06:56:29 +0000 (08:56 +0200)]
Support CODEC_ID_PCM_S24* output via alsa (stereo only).

9 years agoUse const where appropriate.
Carl Eugen Hoyos [Tue, 12 Apr 2011 06:55:20 +0000 (08:55 +0200)]
Use const where appropriate.

Spotted by Reimar.

9 years agoMention VisualOn in the new codecs' long names to explain "libvo".
Carl Eugen Hoyos [Tue, 12 Apr 2011 06:51:58 +0000 (08:51 +0200)]
Mention VisualOn in the new codecs' long names to explain "libvo".

9 years agoFix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32.
Alex Converse [Mon, 11 Apr 2011 06:42:29 +0000 (23:42 -0700)]
Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32.

(1<<31) is undefined and seems to be evaluated by gcc to -2^31 when
these formulae require 2^31.

These conversions still need fate tests.

9 years agoConvert some undefined 1<<31 shifts into 1U<<31.
Alex Converse [Sun, 10 Apr 2011 00:22:04 +0000 (17:22 -0700)]
Convert some undefined 1<<31 shifts into 1U<<31.

According to ISO 9899:1999 S 6.5.7/4:

The result of E1 << E2 is E1 left-shifted E2 bit positions; vacated bits
are filled with zeros. If E1 has an unsigned type, the value of the
result is E1× 2^E2, reduced modulo one more than the maximum value
representable in the result type. If E1 has a signed type and
nonnegative value, and E1× 2^E2 is representable in the result type, then
that is the resulting value; otherwise, the behavior is undefined.

9 years agovpxenc: add CQ_LEVEL mapping
James Zern [Tue, 12 Apr 2011 00:00:35 +0000 (17:00 -0700)]
vpxenc: add CQ_LEVEL mapping

via the equivalent AVCodecContext::crf modifying the range allowed by
options.c (0-51 -> 0-63)
update configure check to require libvpx 0.9.6 (Bali)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovpxenc: add VP8E_SET_STATIC_THRESHOLD mapping
James Zern [Tue, 12 Apr 2011 00:00:29 +0000 (17:00 -0700)]
vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping

via the equivalent AVCodecContext::mb_threshold

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Tue, 12 Apr 2011 01:43:43 +0000 (03:43 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
Not pulled due to wrong author, according to carl:  Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().
  Fix compilation of timefilter test program.
  Add support for AMR-WB encoding via libvo-amrwbenc
  Add an AAC encoder by using the libvo-aacenc library
  g722: Return 8 bits per sample for g722 in av_get_bits_per_sample

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocosmetics: alignment
Aurelien Jacobs [Tue, 12 Apr 2011 00:02:35 +0000 (02:02 +0200)]
cosmetics: alignment

9 years agoffplay: fix weird brace placement in video_image_display()
Stefano Sabatini [Mon, 11 Apr 2011 09:12:35 +0000 (11:12 +0200)]
ffplay: fix weird brace placement in video_image_display()

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoffplay: rename output_picture2() to output_picture()
Stefano Sabatini [Sun, 2 May 2010 22:03:49 +0000 (00:03 +0200)]
ffplay: rename output_picture2() to output_picture()

The "2" suffix is confusing.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoffplay: remove useless intermediary variable dst_pix_fmt in queue_picture()
Stefano Sabatini [Mon, 11 Apr 2011 23:32:38 +0000 (01:32 +0200)]
ffplay: remove useless intermediary variable dst_pix_fmt in queue_picture()

Simplify.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoffplay: avoid forward declaration for packet_queue_put()
Stefano Sabatini [Mon, 11 Apr 2011 23:31:42 +0000 (01:31 +0200)]
ffplay: avoid forward declaration for packet_queue_put()

Define the function before it is used. Simplify.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoffplay: compact expression in compute_mod()
Stefano Sabatini [Sun, 2 May 2010 20:23:48 +0000 (22:23 +0200)]
ffplay: compact expression in compute_mod()

Prefer "return X ? Y : Z" over "if (x) return Y; else return Z",
reduce line count.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agocompute rects duration in ASS decoder
Aurelien Jacobs [Thu, 16 Dec 2010 08:16:33 +0000 (09:16 +0100)]
compute rects duration in ASS decoder

Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
9 years agoadd avcodec_get_subtitle_defaults() to initialize AVSubtitle struct
Aurelien Jacobs [Tue, 5 Apr 2011 07:04:48 +0000 (09:04 +0200)]
add avcodec_get_subtitle_defaults() to initialize AVSubtitle struct

Call this new function before decode() to replace the custom and
inconsistant initialization in various decoders.
This function is equivalent to avcodec_get_frame_defaults() for AVFrame.

Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
9 years agoAdd unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().
Diego Biurrun [Sun, 10 Apr 2011 19:12:08 +0000 (21:12 +0200)]
Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().

When HAVE_7REGS was not defined these functions had an empty body
causing the following warnings during compilation.
In file included from libswscale/x86/yuv2rgb_mmx.c:58:
libswscale/x86/yuv2rgb_template.c: In function ‘yuva420_rgb32_MMX’:
libswscale/x86/yuv2rgb_template.c:412: warning: no return statement in function returning non-void
libswscale/x86/yuv2rgb_template.c: In function ‘yuva420_bgr32_MMX’:
libswscale/x86/yuv2rgb_template.c:457: warning: no return statement in function returning non-void

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agoFix compilation of timefilter test program.
Diego Biurrun [Sun, 10 Apr 2011 19:22:45 +0000 (21:22 +0200)]
Fix compilation of timefilter test program.

The printf function is forbidden in library code, but not in test programs,
so #undefine the printf macro that disables the system printf function.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agoAdd support for AMR-WB encoding via libvo-amrwbenc
Martin Storsjö [Tue, 29 Dec 2009 14:48:09 +0000 (16:48 +0200)]
Add support for AMR-WB encoding via libvo-amrwbenc

The wrapper code is based on the libamr wrapper removed in SVN rev 19365.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoAdd an AAC encoder by using the libvo-aacenc library
Martin Storsjö [Sun, 19 Dec 2010 19:40:23 +0000 (21:40 +0200)]
Add an AAC encoder by using the libvo-aacenc library

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agooggdec: use av_freep() instead of av_free()
Michael Niedermayer [Mon, 11 Apr 2011 09:49:07 +0000 (11:49 +0200)]
oggdec: use av_freep() instead of av_free()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovsrc_buffer.h: add file doxy
Stefano Sabatini [Mon, 11 Apr 2011 09:29:35 +0000 (11:29 +0200)]
vsrc_buffer.h: add file doxy

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agovsrc_buffer.h: add multiple inclusion guards
Stefano Sabatini [Sun, 3 Apr 2011 15:46:43 +0000 (17:46 +0200)]
vsrc_buffer.h: add multiple inclusion guards

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agovsrc_buffer: tweak error message in init()
Stefano Sabatini [Sun, 3 Apr 2011 14:48:33 +0000 (16:48 +0200)]
vsrc_buffer: tweak error message in init()

Change:
Expected 7 arguments, but only %d found in '%s'\n
to:
Expected 7 arguments, but %d found in '%s'\n

as the user may provide more than 7 arguments, in that case the error
is not misleading.

9 years agog722: Return 8 bits per sample for g722 in av_get_bits_per_sample
Martin Storsjö [Sun, 10 Apr 2011 17:06:50 +0000 (20:06 +0300)]
g722: Return 8 bits per sample for g722 in av_get_bits_per_sample

This fixes a failing assert in ff_raw_read_header (in
fate-g722dec-1), where bits_per_coded_sample is set using this
function and is required to have a positive value.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Mon, 11 Apr 2011 02:02:45 +0000 (04:02 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  avio: add more documentation for AVIOContext.
  Parse sprite data for WMVP and WVP2, and decode sprites for the latter
  Replace outdated info on the FAQ
  Redefine sameq
  pad: fix example explanation
  gradfun: add notice from the MPlayer manual
  eval: add support for trunc, ceil, and floor functions
  documentation: add setdar and setsar description to filters.texi
  avio: document some members of AVIOContext.
  avio: document avio_close().
  avio: cosmetics, vertically align comments.
  avio: cosmetics, group the reading functions.
  avio: cosmetics, merge all the FF_API_OLD_AVIO blocks.
  avio: cosmetics, move AVIOContext to start of the file.
  avio: update file header.
  os: fix OpenBSD/PowerPC compilation
  pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
  oggdec: fix demuxing chained audio streams
  fix typo

Conflicts:
doc/filters.texi
libavformat/avio.h
libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "fbdev: simplify logic in fbdev_read_packet()"
Michael Niedermayer [Sun, 10 Apr 2011 22:37:00 +0000 (00:37 +0200)]
Revert "fbdev: simplify logic in fbdev_read_packet()"

This change is buggy.

This reverts commit d46c9f83cf495c901e6128ce1042190f620b89c4.

9 years agoffmpeg: rename configure_filters() to configure_video_filters()
Stefano Sabatini [Sun, 3 Apr 2011 19:54:57 +0000 (21:54 +0200)]
ffmpeg: rename configure_filters() to configure_video_filters()

Mostly useful for the audio-filters branch, to make more apparent the
distinction between configure_audio_filters() and
configure_video_filters().

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agolavfi: add fieldorder filter
Mark Himsley [Sun, 10 Apr 2011 17:18:03 +0000 (19:18 +0200)]
lavfi: add fieldorder filter

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agofbdev: simplify logic in fbdev_read_packet()
Stefano Sabatini [Sat, 12 Mar 2011 14:24:54 +0000 (15:24 +0100)]
fbdev: simplify logic in fbdev_read_packet()

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoH264: Allow templating hl_decode_mb based on pixel_size.
Michael Niedermayer [Sun, 10 Apr 2011 18:44:14 +0000 (20:44 +0200)]
H264: Allow templating hl_decode_mb based on pixel_size.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoH264: factor if() out of coef decoding loop of decode_cabac_residual_internal()
Michael Niedermayer [Sun, 10 Apr 2011 17:53:43 +0000 (19:53 +0200)]
H264: factor if() out of coef decoding loop of decode_cabac_residual_internal()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoH264: Split out hl_motion and template it, this seems a bit faster
Michael Niedermayer [Sun, 10 Apr 2011 15:04:13 +0000 (17:04 +0200)]
H264: Split out hl_motion and template it, this seems a bit faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoH264: replace pixel_size by pixel_shift
Michael Niedermayer [Sun, 10 Apr 2011 14:12:56 +0000 (16:12 +0200)]
H264: replace pixel_size by pixel_shift
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: Print bpp Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Apr 2011 22:28:57 +0000 (00:28 +0200)]
h264: Print bpp Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

9 years agoEnable decoding of high bit depth h264.
Oskar Arvidsson [Tue, 29 Mar 2011 15:49:00 +0000 (17:49 +0200)]
Enable decoding of high bit depth h264.

This patch completes the high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:59 +0000 (17:48 +0200)]
Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.

This patch lets e.g. dsputil_init chose dsp functions with respect to
the bit depth to decode. The naming scheme of bit depth dependent
functions is <base name>_<bit depth>[_<prefix>] (i.e. the old
clear_blocks_c is now named clear_blocks_8_c).

Note: Some of the functions for high bit depth is not dependent on the
bit depth, but only on the pixel size. This leaves some room for
optimizing binary size.

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdd support for higher QP values in h264.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:58 +0000 (17:48 +0200)]
Add support for higher QP values in h264.

In high bit depth, the QP values may now be up to (51 + 6*(bit_depth-8)).

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoH264: fix prefetch
Michael Niedermayer [Sun, 10 Apr 2011 14:12:18 +0000 (16:12 +0200)]
H264: fix prefetch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdd the notion of pixel size in h264 related functions.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:57 +0000 (17:48 +0200)]
Add the notion of pixel size in h264 related functions.

In high bit depth the pixels will not be stored in uint8_t like in the
normal case, but in uint16_t. The pixel size is thus 1 in normal bit
depth and 2 in high bit depth.

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMake the h264 loop filter bit depth aware.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:56 +0000 (17:48 +0200)]
Make the h264 loop filter bit depth aware.

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoTemplate dsputil_internal.h with respect to pixel size, etc.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:55 +0000 (17:48 +0200)]
Template dsputil_internal.h with respect to pixel size, etc.

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoTemplate h264idct_internal.h with respect to pixel size, etc.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:54 +0000 (17:48 +0200)]
Template h264idct_internal.h with respect to pixel size, etc.

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoTemplate h264pred_internal.h with respect to bit depth, etc.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:53 +0000 (17:48 +0200)]
Template h264pred_internal.h with respect to bit depth, etc.

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoTemplate h264dsp_internal.h with respect to pixel size, etc.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:52 +0000 (17:48 +0200)]
Template h264dsp_internal.h with respect to pixel size, etc.

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMove some functions in dsputil.c into a new file dsputil_internal.h.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:51 +0000 (17:48 +0200)]
Move some functions in dsputil.c into a new file dsputil_internal.h.

The functions moved are used when decoding h264.
Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMove the functions in h264idct into a new file h264idct_internal.h.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:50 +0000 (17:48 +0200)]
Move the functions in h264idct into a new file h264idct_internal.h.

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMove the functions in h264pred.c into a new file h264pred_internal.h.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:49 +0000 (17:48 +0200)]
Move the functions in h264pred.c into a new file h264pred_internal.h.

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMove the functions in h264dsp.c into a new file h264dsp_internal.h
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:48 +0000 (17:48 +0200)]
Move the functions in h264dsp.c into a new file h264dsp_internal.h

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdd pixel formats for 9- and 10-bit yuv420p.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:47 +0000 (17:48 +0200)]
Add pixel formats for 9- and 10-bit yuv420p.

Also add support for these formats in libswscale.

Needed for high bit depth h264 decoding.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoChoose h264 chroma dc dequant function dynamically.
Oskar Arvidsson [Tue, 29 Mar 2011 15:48:46 +0000 (17:48 +0200)]
Choose h264 chroma dc dequant function dynamically.

Needed for high bit depth h264 decoding.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoH264: Fix slice threads
Michael Niedermayer [Sun, 10 Apr 2011 12:26:59 +0000 (14:26 +0200)]
H264: Fix slice threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavio: add more documentation for AVIOContext.
Anton Khirnov [Sun, 10 Apr 2011 06:14:26 +0000 (08:14 +0200)]
avio: add more documentation for AVIOContext.

9 years agoFix input buffer size check in adpcm_ea decoder.
Reimar Döffinger [Thu, 7 Apr 2011 23:19:21 +0000 (01:19 +0200)]
Fix input buffer size check in adpcm_ea decoder.

Unfortunately the output buffer size check assumes that the
input buffer is never over-consumed, thus this actually
also allowed to write outside the output buffer if "lucky".

9 years agoParse sprite data for WMVP and WVP2, and decode sprites for the latter
Alberto Delmás [Fri, 8 Apr 2011 18:00:48 +0000 (20:00 +0200)]
Parse sprite data for WMVP and WVP2, and decode sprites for the latter

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoReplace outdated info on the FAQ
Lou Logan [Sat, 9 Apr 2011 11:50:07 +0000 (13:50 +0200)]
Replace outdated info on the FAQ

FAQ could use some work. This updates a few little details.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoRedefine sameq
Lou Logan [Sat, 9 Apr 2011 11:50:05 +0000 (13:50 +0200)]
Redefine sameq

I think the documentation of sameq is causing confusion and misuse of
this option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agopad: fix example explanation
Stefano Sabatini [Sat, 9 Apr 2011 11:50:01 +0000 (13:50 +0200)]
pad: fix example explanation

"row" and "column" term positions in the explanation were inverted.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agogradfun: add notice from the MPlayer manual
Stefano Sabatini [Sat, 9 Apr 2011 11:49:57 +0000 (13:49 +0200)]
gradfun: add notice from the MPlayer manual

Add notice telling that the filter is designed for playback only.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoeval: add support for trunc, ceil, and floor functions
Stefano Sabatini [Sat, 9 Apr 2011 11:49:54 +0000 (13:49 +0200)]
eval: add support for trunc, ceil, and floor functions

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agodocumentation: add setdar and setsar description to filters.texi
Stefano Sabatini [Sat, 9 Apr 2011 11:49:48 +0000 (13:49 +0200)]
documentation: add setdar and setsar description to filters.texi

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoavio: document some members of AVIOContext.
Anton Khirnov [Sat, 9 Apr 2011 10:20:04 +0000 (12:20 +0200)]
avio: document some members of AVIOContext.

9 years agoavio: document avio_close().
Anton Khirnov [Sat, 9 Apr 2011 10:43:51 +0000 (12:43 +0200)]
avio: document avio_close().

9 years agoavio: cosmetics, vertically align comments.
Anton Khirnov [Sat, 9 Apr 2011 10:21:36 +0000 (12:21 +0200)]
avio: cosmetics, vertically align comments.

9 years agoavio: cosmetics, group the reading functions.
Anton Khirnov [Sat, 9 Apr 2011 06:55:53 +0000 (08:55 +0200)]
avio: cosmetics, group the reading functions.

9 years agoavio: cosmetics, merge all the FF_API_OLD_AVIO blocks.
Anton Khirnov [Sat, 9 Apr 2011 06:52:35 +0000 (08:52 +0200)]
avio: cosmetics, merge all the FF_API_OLD_AVIO blocks.

9 years agoavio: cosmetics, move AVIOContext to start of the file.
Anton Khirnov [Sat, 9 Apr 2011 06:44:14 +0000 (08:44 +0200)]
avio: cosmetics, move AVIOContext to start of the file.

9 years agoavio: update file header.
Anton Khirnov [Sat, 9 Apr 2011 06:30:15 +0000 (08:30 +0200)]
avio: update file header.

9 years agoos: fix OpenBSD/PowerPC compilation
Brad [Sat, 2 Apr 2011 21:16:59 +0000 (17:16 -0400)]
os: fix OpenBSD/PowerPC compilation

When attempting to re-enable the AltiVec support it was noticed
that we need to undefine _POSIX_C_SOURCE to appease the headers
for ff_get_cpu_flags_ppc() to be able to compile.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agopixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
Peter Ross [Sat, 9 Apr 2011 11:49:45 +0000 (13:49 +0200)]
pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE

PIX_FMT_BGR48LE is used by PhantomCINE demuxer.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agooggdec: fix demuxing chained audio streams
Clément Bœsch [Mon, 4 Apr 2011 22:29:01 +0000 (00:29 +0200)]
oggdec: fix demuxing chained audio streams

Chained ogg served by icecast and mpd should demux
properly now.

Fixes issue2337

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agofix typo
Compn [Sat, 9 Apr 2011 11:49:56 +0000 (13:49 +0200)]
fix typo

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoAdd "Did you provide a clear git commit log message?" to the patch checklist
Ronald S. Bultje [Sat, 9 Apr 2011 22:06:28 +0000 (00:06 +0200)]
Add "Did you provide a clear git commit log message?" to the patch checklist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agox11: fix memleak
Carl Eugen Hoyos [Fri, 1 Apr 2011 15:56:45 +0000 (15:56 +0000)]
x11: fix memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoreplace movw instruction in ac3dsp_armv6.S
pin xue [Sat, 9 Apr 2011 08:05:11 +0000 (16:05 +0800)]
replace movw instruction in ac3dsp_armv6.S

AS      libavcodec/arm/ac3dsp_armv6.o
ffmpeg-src/libavcodec/arm/ac3dsp_armv6.S: Assembler messages:
ffmpeg-src/libavcodec/arm/ac3dsp_armv6.S:40: Error: selected processor
does not support `movw r8,#0x1fe0'
make[1]: *** [libavcodec/arm/ac3dsp_armv6.o] Error 1

MOVW is ARMv7 way to load constant:
   * movw, or move wide, will move a 16-bit constant into a register,
implicitly zeroing the top 16 bits of the target register.
   * movt, or move top, will move a 16-bit constant into the top half
of a given register without altering the bottom 16 bits
To load 32 bit constant, movw  lower16; movt upper16; is better than
ldr if available, because:
While this approach takes two instructions, it does not require any
extra space to store the constant so both the movw/movt method and the
ldr method will end up using the same amount of memory. Memory
bandwidth is precious in and the movw/movt approach avoids an extra
read on the data side, not to mention the read could have missed the
cache.

But here it is armv6 optimization, so that we have to use ldr.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Sun, 10 Apr 2011 01:31:53 +0000 (03:31 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  daud: Don't write packets that are too large to have their size expressed in the bytestream.
DUPLICATE  pthread: validate_thread_parameters() ignored slice-threading being intentionally off
DUPLICATE  Use consistent condition for whether to run slice-threading execute function.
  avformat.h: fix a misplaced #endif
DUPLCIATE  vaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge.
DUPLICATE  vaapi: filter out DELAYED_PIC_REF flag to determine field.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodaud: Don't write packets that are too large to have their size expressed in the...
Alex Converse [Fri, 8 Apr 2011 21:35:17 +0000 (14:35 -0700)]
daud: Don't write packets that are too large to have their size expressed in the bytestream.

9 years agoAbort Ogg header parsing when we encounter a data packet.
Reimar Döffinger [Thu, 7 Apr 2011 23:17:21 +0000 (01:17 +0200)]
Abort Ogg header parsing when we encounter a data packet.

Fixes ticket #15.

9 years agopthread: validate_thread_parameters() ignored slice-threading being intentionally off
Alexander Strange [Sun, 3 Apr 2011 19:54:14 +0000 (15:54 -0400)]
pthread: validate_thread_parameters() ignored slice-threading being intentionally off

The thread_type API allows you to request only FF_THREAD_FRAME (instead of
FRAME | SLICE), but it was being ignored.
We don't implement both of them at the same time, so there isn't an effect
on current codecs, except that you can request no kinds of threading now
(a bit useless).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoUse consistent condition for whether to run slice-threading execute function.
Reimar Döffinger [Sat, 2 Apr 2011 00:24:46 +0000 (20:24 -0400)]
Use consistent condition for whether to run slice-threading execute function.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoavformat.h: fix a misplaced #endif
Anton Khirnov [Sat, 9 Apr 2011 05:30:33 +0000 (07:30 +0200)]
avformat.h: fix a misplaced #endif

9 years agovaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge.
Gwenole Beauchesne [Tue, 29 Mar 2011 08:52:15 +0000 (10:52 +0200)]
vaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge.

(cherry picked from commit a18e7b4fb77d3799cf21110b5e6dda4691a295b3)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
9 years agovaapi: filter out DELAYED_PIC_REF flag to determine field.
Gwenole Beauchesne [Tue, 29 Mar 2011 09:07:29 +0000 (11:07 +0200)]
vaapi: filter out DELAYED_PIC_REF flag to determine field.

This fixes ticket #23.

(cherry picked from commit 621f4c98df4ee9fd604a614f31e09eef9dd7d3ca)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>