OSDN Git Service

android-x86/external-ffmpeg.git
13 years agomov: add support for little-endian utf16 chapter names
John Stebbins [Wed, 26 Jan 2011 05:15:49 +0000 (05:15 +0000)]
mov: add support for little-endian utf16 chapter names

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agomovenc: byteswap codec_tag in mov_write_ms_tag
Janne Grunau [Thu, 27 Jan 2011 16:26:20 +0000 (17:26 +0100)]
movenc: byteswap codec_tag in mov_write_ms_tag

based on Alex Converse's "Fix ADPCM MS in mov muxing" patch

13 years agoIn mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it
Baptiste Coudurier [Tue, 25 Jan 2011 15:08:20 +0000 (15:08 +0000)]
In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it

In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoAdd special case for 2nd-order IIR filter.
Justin Ruggles [Thu, 27 Jan 2011 23:58:27 +0000 (23:58 +0000)]
Add special case for 2nd-order IIR filter.

40% faster in ff_iir_filter_flt() when c->order == 2.

13 years agoAdd ff_ to AVHWAccel decoders
Luca Barbato [Thu, 27 Jan 2011 02:56:14 +0000 (03:56 +0100)]
Add ff_ to AVHWAccel decoders

That unbreaks compilation of vaapi and dxva2

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoPrefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
Diego Elio Pettenò [Tue, 25 Jan 2011 22:03:28 +0000 (22:03 +0000)]
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.

13 years agomov: simplify mov_read_chapters() by using avio_get_str16be
Anton Khirnov [Sun, 23 Jan 2011 11:35:23 +0000 (12:35 +0100)]
mov: simplify mov_read_chapters() by using avio_get_str16be

It probably also fixes a memleak or two.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoRevert "mov: simplify mov_read_chapters() by using avio_get_str16be"
Mans Rullgard [Wed, 26 Jan 2011 21:54:42 +0000 (21:54 +0000)]
Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"

This reverts commit c34461b35b68ff1f3d04540e0279383c51be8cee.
The wrong version of the patch was committed.

13 years agoVP8: don't overread edges on fourtap MC.
Ronald S. Bultje [Wed, 26 Jan 2011 20:34:36 +0000 (15:34 -0500)]
VP8: don't overread edges on fourtap MC.

Fix C VP8 H+V MC functions which do two-dimensional 4/6-tap filters to
not overread beyond their edges if the second filter is 4-tap, since
the outer pixels aren't there anymore since
44002d8323023c35f51d523a7d305e45103ba7a1.

13 years agoAdd ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
Diego Elio Pettenò [Tue, 25 Jan 2011 21:40:11 +0000 (21:40 +0000)]
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.

None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMake ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h.
Diego Elio Pettenò [Tue, 25 Jan 2011 00:29:44 +0000 (00:29 +0000)]
Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h.

The iff.h header only declared one function that is now static, the
libavformat/iff.c source file wasn't using it before. Drop the file
entirely.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoAdd ff_ prefix to ac3_common_init().
Justin Ruggles [Tue, 25 Jan 2011 20:07:07 +0000 (20:07 +0000)]
Add ff_ prefix to ac3_common_init().

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoac3: Remove ff_ac3_critical_band_size_tab.
Justin Ruggles [Tue, 25 Jan 2011 20:07:06 +0000 (20:07 +0000)]
ac3: Remove ff_ac3_critical_band_size_tab.

It is only used to generate band_start_tab, which about the same size, at
runtime, so it's simpler just to always hardcode band_start_tab.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMake the avfilter debug functions and macros static to avfilter.c
Diego Elio Pettenò [Tue, 25 Jan 2011 00:29:34 +0000 (00:29 +0000)]
Make the avfilter debug functions and macros static to avfilter.c

This removes ff_get_ref_perms_string, ff_dprintf_ref and ff_dprintf_link
fro the interface of libavfilter.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMark C base versions of FFT functions static to fft.c
Diego Elio Pettenò [Tue, 25 Jan 2011 00:29:43 +0000 (00:29 +0000)]
Mark C base versions of FFT functions static to fft.c

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoPass field order flag to libx264
Marco Gittler [Wed, 26 Jan 2011 02:07:34 +0000 (18:07 -0800)]
Pass field order flag to libx264

Signed-off-by: Jason Garrett-Glaser <jason@x264.com>
13 years agompegtsenc: set reserved bits to 1 in PCR field
Georgi Chorbadzhiyski [Tue, 25 Jan 2011 11:20:03 +0000 (11:20 +0000)]
mpegtsenc: set reserved bits to 1 in PCR field

The reserved bits between PCR base and extension fields must be
set to 1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMake ff_add_wav static to ra144.c
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:35 +0000 (02:59 +0100)]
Make ff_add_wav static to ra144.c

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoMake ff_rtsp_send_cmd_with_content_async static to rtsp.c.
Diego Elio Pettenò [Tue, 25 Jan 2011 00:29:38 +0000 (00:29 +0000)]
Make ff_rtsp_send_cmd_with_content_async static to rtsp.c.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoMake ff_h264_find_frame_end static to h264.c; delete h264_parser.h
Diego Elio Pettenò [Tue, 25 Jan 2011 00:59:30 +0000 (00:59 +0000)]
Make ff_h264_find_frame_end static to h264.c; delete h264_parser.h

The header is empty after making the function static, so delete it and
drop its usage.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoMake ff_ass_subtitle_header static to ass.c
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:31 +0000 (02:59 +0100)]
Make ff_ass_subtitle_header static to ass.c

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoMake ff_sin_tabs constant to rdft.c
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:29 +0000 (02:59 +0100)]
Make ff_sin_tabs constant to rdft.c

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoMake ff_spatial_idwt_{init, slice} static to dwt.c
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:28 +0000 (02:59 +0100)]
Make ff_spatial_idwt_{init, slice} static to dwt.c

Both functions seem to be commanded by the ff_spatial_idwt function
instead.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoMake ff_png_pass_xmin and ff_png_pass_xshift static to png.c.
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:41 +0000 (02:29 +0100)]
Make ff_png_pass_xmin and ff_png_pass_xshift static to png.c.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoRemove unused ff_ac3_parse_header_full function.
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:40 +0000 (02:29 +0100)]
Remove unused ff_ac3_parse_header_full function.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoMake ff_mxf_pixel_layouts static to mxf.c.
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:37 +0000 (02:29 +0100)]
Make ff_mxf_pixel_layouts static to mxf.c.

Also make it an anonymous structure as never it is accessed by name.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoMake ff_h264_decode_rbsp_trailing static to h264.c
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:42 +0000 (02:29 +0100)]
Make ff_h264_decode_rbsp_trailing static to h264.c

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoMake ff_interleave_compare_dts static to utils.c.
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:36 +0000 (02:29 +0100)]
Make ff_interleave_compare_dts static to utils.c.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agomov: simplify mov_read_chapters() by using avio_get_str16be
Anton Khirnov [Sun, 23 Jan 2011 11:38:30 +0000 (12:38 +0100)]
mov: simplify mov_read_chapters() by using avio_get_str16be

It probably also fixes a memleak or two.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoasfdec: remove some commented-out cruft
Anton Khirnov [Sun, 23 Jan 2011 11:38:29 +0000 (12:38 +0100)]
asfdec: remove some commented-out cruft

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agolavf: make a variant of ff_get_str16_nolen public
Anton Khirnov [Sun, 23 Jan 2011 11:38:27 +0000 (12:38 +0100)]
lavf: make a variant of ff_get_str16_nolen public

It will be useful in mp3 demuxer and hopeful some other places.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoarmcc: filter out non-gcc options from ASFLAGS
Mans Rullgard [Tue, 25 Jan 2011 14:45:20 +0000 (14:45 +0000)]
armcc: filter out non-gcc options from ASFLAGS

This allows passing armcc-specific flags with --extra-cflags without
choking the assembler.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoconfigure: add filter_out() function
Mans Rullgard [Tue, 25 Jan 2011 14:44:07 +0000 (14:44 +0000)]
configure: add filter_out() function

This adds a function to filter out words matching a pattern
from a list.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoDon't do edge emulation unless the edge pixels will be used in MC.
Ronald S. Bultje [Tue, 25 Jan 2011 17:25:07 +0000 (12:25 -0500)]
Don't do edge emulation unless the edge pixels will be used in MC.

Do not emulate larger edges than we will actually use for this round of
MC. Decoding goes from avg+SE 29.972+/-0.023sec to 29.856+/-0.023, i.e.
0.12sec or ~0.4% faster.

13 years agoffmetaenc: Use correct format specifiers.
Jai Menon [Tue, 25 Jan 2011 04:55:43 +0000 (22:55 -0600)]
ffmetaenc: Use correct format specifiers.

Use printf format macros from inttypes.h.
Additionally, this fixes a warning when building with clang.

13 years agointfloat_readwrite: include "mathematics.h" for fallback macros
Mans Rullgard [Tue, 25 Jan 2011 03:33:43 +0000 (03:33 +0000)]
intfloat_readwrite: include "mathematics.h" for fallback macros

This allows this file to build on systems lacking NAN or INFINITY
in math.h.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agotty: remove superflous #include <strings.h>
Mans Rullgard [Tue, 25 Jan 2011 03:31:45 +0000 (03:31 +0000)]
tty: remove superflous #include <strings.h>

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoac3: remove ff_ac3_critical_band_size_tab[] external declaration
Mans Rullgard [Tue, 25 Jan 2011 15:48:46 +0000 (15:48 +0000)]
ac3: remove ff_ac3_critical_band_size_tab[] external declaration

This fixes compilation broken by 6ed3b504f984dc6cefde8d57a57726f9d30e5033

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMove ff_ac3_critical_band_size_tab in ac3.c for non-hardcoded tables.
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:36 +0000 (01:59 +0000)]
Move ff_ac3_critical_band_size_tab in ac3.c for non-hardcoded tables.

This symbol is only ever used to calculate the non-hardcoded tables, so
only enable it in that case, and static to the source unit that uses it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoRemove unused ac3_parametric_bit_allocation function.
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:14 +0000 (23:36 +0000)]
Remove unused ac3_parametric_bit_allocation function.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMakefile: fix cleaning of tools in tests directory
Mans Rullgard [Tue, 25 Jan 2011 13:25:18 +0000 (13:25 +0000)]
Makefile: fix cleaning of tools in tests directory

The variable TESTPROGS is reset by the library makefiles,
use another name.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoconfigure: move network tests before results are needed
Daniel Verkamp [Tue, 25 Jan 2011 09:28:01 +0000 (09:28 +0000)]
configure: move network tests before results are needed

This moves network_extralibs setup before use so that the link tests
for network functions work correctly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agompegtsenc: remove unused variables
Georgi Chorbadzhiyski [Tue, 25 Jan 2011 10:58:31 +0000 (12:58 +0200)]
mpegtsenc: remove unused variables

Remove two variables that were not used and caused the following
warnings:

CC      libavformat/mpegtsenc.o
libavformat/mpegtsenc.c: In function 'mpegts_write_section':
libavformat/mpegtsenc.c:72:18: warning: unused variable 'ts'
libavformat/mpegtsenc.c: In function 'mpegts_insert_null_packet':
libavformat/mpegtsenc.c:586:18: warning: unused variable 'ts'

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoFix ALLPROGS_G so that *_g binaries get cleaned properly
Daniel Verkamp [Tue, 25 Jan 2011 07:58:18 +0000 (07:58 +0000)]
Fix ALLPROGS_G so that *_g binaries get cleaned properly

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agolatm: remove superflous #includes
Mans Rullgard [Tue, 25 Jan 2011 03:31:01 +0000 (03:31 +0000)]
latm: remove superflous #includes

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoavidec: make print_tag() a macro and remove related ifdefs
Mans Rullgard [Tue, 25 Jan 2011 02:24:43 +0000 (02:24 +0000)]
avidec: make print_tag() a macro and remove related ifdefs

The dprintf macro is a no-op if DEBUG is not defined, so there
is no need to guard it here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMake RTPFirstDynamicPayloadHandler static to rtpdec.c
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:18 +0000 (23:36 +0000)]
Make RTPFirstDynamicPayloadHandler static to rtpdec.c

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMake ff_realmedia_mp3_dynamic_handler static.
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:35 +0000 (01:29 +0000)]
Make ff_realmedia_mp3_dynamic_handler static.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMake denoise_dct_c() and dct_quantize_trellis_c() static in definitions
Mans Rullgard [Tue, 25 Jan 2011 01:02:19 +0000 (01:02 +0000)]
Make denoise_dct_c() and dct_quantize_trellis_c() static in definitions

1d4da6a460d5b78026e3b854fdd6f469957a054c added static to the
prototypes for these fuctions.  Adding it to the definitions
as well.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoDon't declare a pcm_dvd encoder.
Diego Elio Pettenò [Tue, 25 Jan 2011 00:41:24 +0000 (00:41 +0000)]
Don't declare a pcm_dvd encoder.

The PCM_DVD encoder would be left unused, as allcodecs.c properly declared
it as being decoder-only, but it would still be built into the object file.

Since there is no block of code to properly encode this PCM format, it's
not a full codec.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoDon't check for DEBUG before using dprintf.
Diego Elio 'Flameeyes' Pettenò [Tue, 25 Jan 2011 00:16:36 +0000 (00:16 +0000)]
Don't check for DEBUG before using dprintf.

The dprintf macro is no-op when DEBUG is unset, so there is no need to
put it conditional to DEBUG.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMake local variables static.
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:17 +0000 (23:36 +0000)]
Make local variables static.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMake dvenc.c functions static to the unit.
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:16 +0000 (23:36 +0000)]
Make dvenc.c functions static to the unit.

Also drop some CONFIG_DV_MUXER #ifdefs probably vestigial from before the
split of dvenc and dvdec.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMake denoise_dct_c and dct_quantize_trellis_c static.
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:15 +0000 (23:36 +0000)]
Make denoise_dct_c and dct_quantize_trellis_c static.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMake the ff_lockmgr_cb function pointer static to utils.c
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:13 +0000 (23:36 +0000)]
Make the ff_lockmgr_cb function pointer static to utils.c

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMake this_year static to cmdutils.c
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:12 +0000 (23:36 +0000)]
Make this_year static to cmdutils.c

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoRename sf_table in atrac.c unit to ff_atrac_sf_table.
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:10 +0000 (23:36 +0000)]
Rename sf_table in atrac.c unit to ff_atrac_sf_table.

This ensures a locally-unique name as well as marks the symbol as
FFmpeg-private at least by declaration.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMark qmf_window table static to atrac.c unit.
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:09 +0000 (00:36 +0100)]
Mark qmf_window table static to atrac.c unit.

The table is not used anywhere else on libavcodec.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agox86: fix overflow in h264 8x8 planar prediction
Mans Rullgard [Mon, 24 Jan 2011 23:24:28 +0000 (23:24 +0000)]
x86: fix overflow in h264 8x8 planar prediction

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agofate: add h264 test for extreme cases in planar prediction
Mans Rullgard [Sun, 23 Jan 2011 20:33:18 +0000 (20:33 +0000)]
fate: add h264 test for extreme cases in planar prediction

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoffserver: put gcc attribute under proper ifdef
Mans Rullgard [Sat, 16 Oct 2010 19:56:32 +0000 (20:56 +0100)]
ffserver: put gcc attribute under proper ifdef

13 years agortspdec: Retry with TCP if UDP failed
Martin Storsjö [Mon, 10 Jan 2011 10:45:24 +0000 (12:45 +0200)]
rtspdec: Retry with TCP if UDP failed

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agortspdec: Move rtsp_read_pause up, next to rtsp_read_play
Martin Storsjo [Mon, 24 Jan 2011 09:49:04 +0000 (09:49 +0000)]
rtspdec: Move rtsp_read_pause up, next to rtsp_read_play

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agortsp: Use ff_rtsp_undo_setup in the cleanup code in ff_rtsp_make_request
Martin Storsjo [Mon, 24 Jan 2011 09:49:03 +0000 (09:49 +0000)]
rtsp: Use ff_rtsp_undo_setup in the cleanup code in ff_rtsp_make_request

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agortsp: Split out a function undoing the setup made by ff_rtsp_make_setup_request
Martin Storsjo [Mon, 24 Jan 2011 09:49:02 +0000 (09:49 +0000)]
rtsp: Split out a function undoing the setup made by ff_rtsp_make_setup_request

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agortsp: Make make_setup_request a nonstatic function
Martin Storsjo [Mon, 24 Jan 2011 09:49:01 +0000 (09:49 +0000)]
rtsp: Make make_setup_request a nonstatic function

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoUse av_fast_malloc instead of av_realloc.
Reimar Döffinger [Mon, 24 Jan 2011 18:35:20 +0000 (19:35 +0100)]
Use av_fast_malloc instead of av_realloc.

This should be faster, is less code and fixes issue 2524
(allocation error would lead to crash).
(cherry picked from commit e7b95918fca1c3d057d35f77ba58ee2d00d03151)

13 years agoHandle input or output len of 0 properly in lzo decoder.
Reimar Döffinger [Mon, 24 Jan 2011 17:51:00 +0000 (18:51 +0100)]
Handle input or output len of 0 properly in lzo decoder.

(cherry picked from commit 7d5082600ee63d879c2a325974ea09c8ace05019)

13 years agoapplehttp: Fix the key check in handle_variant_args
Martin Storsjö [Sun, 23 Jan 2011 21:39:02 +0000 (23:39 +0200)]
applehttp: Fix the key check in handle_variant_args

The key string is supposed to contain the equals character,
too.  Since the checked string was wrong, and the return value
check was wrong too, it incorrectly seemed to work right before.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoreindent after last commit
Kostya [Sat, 22 Jan 2011 13:44:10 +0000 (13:44 +0000)]
reindent after last commit

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoExtend WavPack demuxer and decoder to support >2 channel audio
Kostya [Sat, 22 Jan 2011 13:43:15 +0000 (13:43 +0000)]
Extend WavPack demuxer and decoder to support >2 channel audio

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoDo not set audio_resample to 0 if audio_sync_method is > 1.
Stefano Sabatini [Sun, 23 Jan 2011 01:06:59 +0000 (02:06 +0100)]
Do not set audio_resample to 0 if audio_sync_method is > 1.

If audio_sync_method is >1 the resampler is used for audio drift
compensation, and do_audio_out() was causing an assert failure because
audio_resample was not set.

Fix issue 2516, which was introduced by SVN r25939.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoARM: NEON: fix overflow in h264 16x16 planar pred
Mans Rullgard [Sun, 23 Jan 2011 20:41:59 +0000 (20:41 +0000)]
ARM: NEON: fix overflow in h264 16x16 planar pred

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoAdd CFLAGS needed by PathScale compiler
Mans Rullgard [Sun, 23 Jan 2011 23:13:33 +0000 (23:13 +0000)]
Add CFLAGS needed by PathScale compiler

The PathScale compiler miscompiles wrapping arithmetic without
these flags.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoDisable symbol versioning on some BSDs
Mans Rullgard [Sun, 23 Jan 2011 20:48:51 +0000 (20:48 +0000)]
Disable symbol versioning on some BSDs

Dragonfly, NetBSD, and OpenBSD do not support symbol versioning
although our link test passes.  Disable it explicitly for these
systems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMIPS: use inline asm only when supported by compiler
Mans Rullgard [Thu, 7 Oct 2010 00:25:31 +0000 (01:25 +0100)]
MIPS: use inline asm only when supported by compiler

13 years agoaacenc: fix typo in sync extension constant in 8ae0fa2
Janne Grunau [Sun, 23 Jan 2011 14:45:19 +0000 (15:45 +0100)]
aacenc: fix typo in sync extension constant in 8ae0fa2

13 years agoRemove redundant checks against MIN_CACHE_BITS
Mans Rullgard [Sun, 23 Jan 2011 02:22:34 +0000 (02:22 +0000)]
Remove redundant checks against MIN_CACHE_BITS

With the removal of the libmpeg2 bitstream reader, MIN_CACHE_BITS
is always >= 25, so tests against smaller values can be removed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoget_bits: move tracing macros to end of file
Mans Rullgard [Sun, 23 Jan 2011 14:01:43 +0000 (14:01 +0000)]
get_bits: move tracing macros to end of file

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoSanitise get_bits macros, part 2
Mans Rullgard [Sun, 23 Jan 2011 01:56:27 +0000 (01:56 +0000)]
Sanitise get_bits macros, part 2

These whitespace changes improve the readability of the get_bits
macros.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoSanitise get_bits macros, part 1
Mans Rullgard [Sun, 23 Jan 2011 01:24:46 +0000 (01:24 +0000)]
Sanitise get_bits macros, part 1

Some of the macros in get_bits.h include a final semicolon,
some do not.  This removes these or adds do {} while(0) around
the macros as appropriate and adds semicolons where needed in
calling code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoRemove "libmpeg2" bitstream reader
Mans Rullgard [Sun, 23 Jan 2011 01:18:13 +0000 (01:18 +0000)]
Remove "libmpeg2" bitstream reader

Using the libmpeg2 reader causes errors in a multitude of places,
including MPEG and H264 codecs.  As the advantage of this reader
is questionable, removing it seems the sensible course of action,
especially considering the simplifications this allows elsewhere
with the bit cache size increasing from 17 to 25 bits as minimum.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMakefile: simplify test tools handling
Mans Rullgard [Thu, 20 Jan 2011 02:07:55 +0000 (02:07 +0000)]
Makefile: simplify test tools handling

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoffserver: cleanup
Reinhard Tartler [Sun, 23 Jan 2011 07:53:40 +0000 (08:53 +0100)]
ffserver: cleanup

remove the trivial function do_switch_stream as it doesn't help to make
the code easier to understand.

13 years agoac3enc: use dsputil functions in apply_window()
Justin Ruggles [Thu, 13 Jan 2011 20:28:06 +0000 (15:28 -0500)]
ac3enc: use dsputil functions in apply_window()

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoChange DSPContext.vector_fmul() from dst=dst*src to dest=src0*src1.
Justin Ruggles [Thu, 13 Jan 2011 20:28:06 +0000 (15:28 -0500)]
Change DSPContext.vector_fmul() from dst=dst*src to dest=src0*src1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoReindent.
Ronald S. Bultje [Sat, 22 Jan 2011 14:42:57 +0000 (14:42 +0000)]
Reindent.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoFix crash on resolution change (issue 2393).
Ronald S. Bultje [Sat, 22 Jan 2011 14:42:56 +0000 (14:42 +0000)]
Fix crash on resolution change (issue 2393).

Don't free RBSP tables (containing decoded NAL units) on resolution
change, because we actually need this data to decode the frame after
reiniting (with new resolution). Fixed issue 2393.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoMake LOCAL_ALIGNED macro fully C99 compatible
Mans Rullgard [Thu, 20 Jan 2011 02:04:54 +0000 (02:04 +0000)]
Make LOCAL_ALIGNED macro fully C99 compatible

C99 variadic macros require more arguments than there are named
parameters in the definition.  This means we must use an extra
indirection to avoid having two different macros for arrays with
one resp more than one dimension.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoRemove H.264 encoder fragments
Alex Converse [Sat, 22 Jan 2011 03:49:55 +0000 (03:49 +0000)]
Remove H.264 encoder fragments

It's incomplete, no one is working on it, and when someone asks about
working on it we advise them not to.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoaacenc: mark SBR absent
Alex Converse [Sat, 22 Jan 2011 05:23:43 +0000 (05:23 +0000)]
aacenc: mark SBR absent

Use backwards compatible explicit signalling to denote the absence of
SBR.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoAmend documentation for the image2 demuxer, to better reflect the current behavior.
Stefano Sabatini [Fri, 21 Jan 2011 12:54:14 +0000 (13:54 +0100)]
Amend documentation for the image2 demuxer, to better reflect the current behavior.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoRemove outdated and confusing comment.
Stefano Sabatini [Sat, 22 Jan 2011 11:07:03 +0000 (11:07 +0000)]
Remove outdated and confusing comment.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago10l: reverse the biquad coefficients.
Justin Ruggles [Fri, 21 Jan 2011 20:59:20 +0000 (20:59 +0000)]
10l: reverse the biquad coefficients.

I did not notice that the filter implementation uses a reversed history state.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agostreamid does not work with newaudio, newvideo, newsubtitle
Mike Scheutzow [Sat, 15 Jan 2011 16:11:55 +0000 (16:11 +0000)]
streamid does not work with newaudio, newvideo, newsubtitle

fixes issue2465.

The problem is that the ffmpeg (the app) -streamid option did not work
with -newaudio/-newvideo/-newsubtitle.

The cause was a conflict between the feature where streamid values were
reset to default for each output filename, and the implementation of
-new*, which requires that the -new* option be specified after the
target filename.

My patch changes the ffmpeg behavior so that user-specified streamid
values apply to all the following output files on the command line
(rather than just the next output filename.)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agofate: add lossless h264 test
Mans Rullgard [Thu, 20 Jan 2011 22:20:39 +0000 (22:20 +0000)]
fate: add lossless h264 test

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agolibfaac: add recognized profiles array
Anssi Hannula [Fri, 21 Jan 2011 21:58:54 +0000 (21:58 +0000)]
libfaac: add recognized profiles array

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agomp3enc: support for id3v2.3 tags using a per-muxer AVOption
Anton Khirnov [Fri, 21 Jan 2011 19:54:35 +0000 (19:54 +0000)]
mp3enc: support for id3v2.3 tags using a per-muxer AVOption

fixes issue2562.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agoid3v2: split tables for various ID3v2 versions
Anton Khirnov [Fri, 21 Jan 2011 19:54:34 +0000 (19:54 +0000)]
id3v2: split tables for various ID3v2 versions

This is needed for upcoming ID3v2.3 muxing support.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
13 years agomp3enc: handle errors in id3v2_put_ttag
Anton Khirnov [Sat, 22 Jan 2011 01:00:13 +0000 (02:00 +0100)]
mp3enc: handle errors in id3v2_put_ttag

make the initialization of put clearer

this are the differences between
[FFmpeg-devel] [PATCH 1/3] mp3enc: add support for writing UTF-16 tags
and the already applied 187e23478bc5c066ff8eef562925471ac179644e

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>