ffmpeg.git
7 years agolavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft

7 years agolavf: remove disabled FF_API_FLAG_RTP_HINT cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_FLAG_RTP_HINT cruft

7 years agolavf: remove disabled FF_API_SDP_CREATE cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_SDP_CREATE cruft

7 years agolavf: remove disabled FF_API_GUESS_IMG2_CODEC cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_GUESS_IMG2_CODEC cruft

7 years agolavf: remove disabled FF_API_PKT_DUMP cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_PKT_DUMP cruft

7 years agolavf: remove disabled FF_API_FIND_INFO_TAG cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_FIND_INFO_TAG cruft

7 years agolavf: remove disabled FF_API_PARSE_DATE cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_PARSE_DATE cruft

7 years agolavf: remove disabled FF_API_DUMP_FORMAT cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_DUMP_FORMAT cruft

7 years agolavf: remove disabled FF_API_FORMAT_PARAMETERS cruft
Anton Khirnov [Thu, 12 Jan 2012 12:38:58 +0000 (13:38 +0100)]
lavf: remove disabled FF_API_FORMAT_PARAMETERS cruft

Also remove now unused AVFormatParameters struct and
AVOutputFormat.set_parameters().

7 years agolavf: remove disabled FF_API_OLD_METADATA2 cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_OLD_METADATA2 cruft

7 years agolavf: remove disabled FF_API_OLD_AVIO cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_OLD_AVIO cruft

7 years agolavf: increase major version from 53 to 54.
Anton Khirnov [Thu, 12 Jan 2012 10:21:02 +0000 (11:21 +0100)]
lavf: increase major version from 53 to 54.

7 years agolavf: remove AVFormatParameters from AVFormatContext.read_header signature
Anton Khirnov [Thu, 12 Jan 2012 12:20:36 +0000 (13:20 +0100)]
lavf: remove AVFormatParameters from AVFormatContext.read_header signature

7 years agolavc: remove disabled FF_API_AVFRAME_AGE cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_AVFRAME_AGE cruft.

7 years agolavc: remove disabled FF_API_DATA_POINTERS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_DATA_POINTERS cruft.

7 years agolavc: remove disabled FF_API_TIFFENC_COMPLEVEL cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_TIFFENC_COMPLEVEL cruft.

7 years agolavc: remove disabled FF_API_INTERNAL_CONTEXT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_INTERNAL_CONTEXT cruft.

7 years agolavc: remove disabled FF_API_PARSE_FRAME cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_PARSE_FRAME cruft.

7 years agolavc: remove disabled FF_API_GET_ALPHA_INFO cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_GET_ALPHA_INFO cruft.

7 years agolavc: remove disabled FF_API_MJPEG_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_MJPEG_GLOBAL_OPTS cruft.

7 years agolavc: remove disabled FF_API_SNOW_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_SNOW_GLOBAL_OPTS cruft.

7 years agolavc: remove disabled FF_API_LAME_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_LAME_GLOBAL_OPTS cruft.

7 years agolavc: remove disabled FF_API_AVCODEC_INIT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_AVCODEC_INIT cruft.

7 years agolavc: remove disabled FF_API_ER cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_ER cruft.

7 years agolavc: remove disabled FF_API_DRC_SCALE cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_DRC_SCALE cruft.

7 years agolavc: remove disabled FF_API_AVCODEC_OPEN cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_AVCODEC_OPEN cruft.

7 years agolavc: remove disabled FF_API_ALLOC_CONTEXT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_ALLOC_CONTEXT cruft.

7 years agolavc: remove disabled FF_API_GET_PIX_FMT_NAME cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_GET_PIX_FMT_NAME cruft.

7 years agolavc: remove disabled FF_API_FLAC_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_FLAC_GLOBAL_OPTS cruft.

7 years agolavc: remove disabled FF_API_OLD_FF_PICT_TYPES cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_OLD_FF_PICT_TYPES cruft.

7 years agolavc: remove disabled FF_API_THREAD_INIT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_THREAD_INIT cruft.

7 years agolavc: remove disabled FF_API_ANTIALIAS_ALGO cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_ANTIALIAS_ALGO cruft.

7 years agolavc: remove disabled FF_API_OLD_AUDIOCONVERT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_OLD_AUDIOCONVERT cruft.

7 years agolavc: remove disabled FF_API_OLD_SAMPLE_FMT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_OLD_SAMPLE_FMT cruft.

7 years agolavc: remove disabled FF_API_PALETTE_CONTROL cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_PALETTE_CONTROL cruft.

7 years agolavc: remove disabled FF_API_MPEGVIDEO_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_MPEGVIDEO_GLOBAL_OPTS cruft.

7 years agolavc: remove disabled FF_API_X264_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_X264_GLOBAL_OPTS cruft.

7 years agolavc: remove the deprecated opt.h header.
Anton Khirnov [Sun, 22 Jan 2012 09:48:52 +0000 (10:48 +0100)]
lavc: remove the deprecated opt.h header.

7 years agolavc: remove the deprecated "ab" option.
Anton Khirnov [Sun, 22 Jan 2012 09:47:48 +0000 (10:47 +0100)]
lavc: remove the deprecated "ab" option.

7 years agocodec-regression: use private options instead of deprecated codec flags.
Anton Khirnov [Sun, 22 Jan 2012 11:49:31 +0000 (12:49 +0100)]
codec-regression: use private options instead of deprecated codec flags.

7 years agolavc: increase major version to 54.
Anton Khirnov [Thu, 12 Jan 2012 10:17:23 +0000 (11:17 +0100)]
lavc: increase major version to 54.

The lavf-ffm test results change because ffmenc writes
AVCodecContext.flags/flags2 and the defaults for those change.

7 years agocmdutils: fix options starting with 'no'.
Alexandra Khirnova [Fri, 27 Jan 2012 08:59:00 +0000 (08:59 +0000)]
cmdutils: fix options starting with 'no'.

E.g. non_linear_quant mpeg2video private option.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agox86inc.asm: fix typo.
Ronald S. Bultje [Fri, 27 Jan 2012 02:50:12 +0000 (10:50 +0800)]
x86inc.asm: fix typo.

Assemblers don't understand ! in %if statements.

7 years agoswscale: convert rgb/bgr24ToY/UV_mmx functions from inline asm to yasm.
Ronald S. Bultje [Fri, 27 Jan 2012 02:52:55 +0000 (10:52 +0800)]
swscale: convert rgb/bgr24ToY/UV_mmx functions from inline asm to yasm.

Also implement sse2/ssse3/avx versions.

7 years agoconfig.asm: change %ifdef directives to %if directives.
Ronald S. Bultje [Mon, 23 Jan 2012 09:45:58 +0000 (17:45 +0800)]
config.asm: change %ifdef directives to %if directives.

This allows combining multiple conditionals in a single statement.

7 years agoRevert "sws/pixfmt/pixdesc: add support for yuva444p"
Alex Converse [Fri, 27 Jan 2012 02:06:57 +0000 (18:06 -0800)]
Revert "sws/pixfmt/pixdesc: add support for yuva444p"

This reverts commit fc115c80b7bf6f1f5a937ee7f6e14630d99eb4dd.

Tests are broken.

7 years agofrwu: check if allocation was successful
Paul B Mahol [Fri, 27 Jan 2012 01:13:48 +0000 (01:13 +0000)]
frwu: check if allocation was successful

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agovc1dec.c: Don't use uninitialized values of dmv_[x, y]
Mashiat Sarker Shakkhar [Thu, 26 Jan 2012 23:53:24 +0000 (15:53 -0800)]
vc1dec.c: Don't use uninitialized values of dmv_[x, y]

MVDATA may or may not be transmitted. If it is not, both
dmv_x and dmv_y is to be assumed zero.

This may not trigger wrong picture in all systems, but
it's a bug nevertheless. Fixes SA10116.vc1 on my 64-bit
Windows 7.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agosws/pixfmt/pixdesc: add support for yuva444p
Paul B Mahol [Fri, 27 Jan 2012 00:43:23 +0000 (00:43 +0000)]
sws/pixfmt/pixdesc: add support for yuva444p

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agomjpegbdec: Fix overflow in SOS.
Alex Converse [Wed, 25 Jan 2012 21:39:24 +0000 (13:39 -0800)]
mjpegbdec: Fix overflow in SOS.

Based in part by a fix from Michael Niedermayer <michaelni@gmx.at>

Fixes CVE-2011-3947

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7 years agolibavutil: Remove pointless file test program.
Diego Biurrun [Wed, 25 Jan 2012 19:13:17 +0000 (20:13 +0100)]
libavutil: Remove pointless file test program.

7 years ago8bps: K&R formatting cosmetics
Paul B Mahol [Thu, 26 Jan 2012 19:21:15 +0000 (19:21 +0000)]
8bps: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agosmacker: Sanity check huffman tables found in the headers.
Alex Converse [Thu, 26 Jan 2012 00:12:42 +0000 (16:12 -0800)]
smacker: Sanity check huffman tables found in the headers.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agosmacker: remove dead store
Alex Converse [Thu, 26 Jan 2012 00:22:05 +0000 (16:22 -0800)]
smacker: remove dead store

7 years agoqdm2: Check data block size for bytes to bits overflow.
Alex Converse [Wed, 25 Jan 2012 23:27:11 +0000 (15:27 -0800)]
qdm2: Check data block size for bytes to bits overflow.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agomxfdec: Fix files with essence containers larger than 2 GiB.
Tomas Härdin [Thu, 26 Jan 2012 12:21:45 +0000 (13:21 +0100)]
mxfdec: Fix files with essence containers larger than 2 GiB.

For such files, accumulating into an int would cause an overflow.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agomxfdec: Employ correct printf conversion specifiers for POSIX int types.
Jean First [Thu, 26 Jan 2012 12:21:42 +0000 (13:21 +0100)]
mxfdec: Employ correct printf conversion specifiers for POSIX int types.

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agovc1: always read the bfraction element for interlaced fields
Hendrik Leppkes [Fri, 13 Jan 2012 17:43:08 +0000 (18:43 +0100)]
vc1: always read the bfraction element for interlaced fields

Previously, it would not be read if refdist_flag was not set, however
according to the spec and the reference decoder, it should always be read.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
7 years agofate: add XWD image regression test
Paul B Mahol [Wed, 25 Jan 2012 20:15:34 +0000 (20:15 +0000)]
fate: add XWD image regression test

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agolavf: prevent infinite loops while flushing in avformat_find_stream_info
Janne Grunau [Wed, 18 Jan 2012 09:59:32 +0000 (10:59 +0100)]
lavf: prevent infinite loops while flushing in avformat_find_stream_info

If no data was seen for a stream decoder are returning 0 when fed with
empty packets for flushing. We can stop flushing when the decoder does
not return delayed delayed frames anymore. Changes try_decode_frame()
return value to got_picture or negative error.

CC: libav-stable@libav.org
7 years agomatroskadec: Pad AAC extradata.
Alex Converse [Wed, 25 Jan 2012 22:34:21 +0000 (14:34 -0800)]
matroskadec: Pad AAC extradata.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoismindex: Fix build on mingw
Martin Storsjö [Wed, 25 Jan 2012 11:47:38 +0000 (13:47 +0200)]
ismindex: Fix build on mingw

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agowma: Clip WMA1 and WMA2 frame length to 11 bits.
Alex Converse [Wed, 25 Jan 2012 02:43:43 +0000 (18:43 -0800)]
wma: Clip WMA1 and WMA2 frame length to 11 bits.

The MDCT buffers in the decoder are only sized for up to 11 bits. The
reverse engineered documentation for WMA1/2 headers say that that for
all samplerates above 32kHz 11 bits are used. 12 and 13 bit support
were added for WMAPro. I was unable to make any Microsoft tools generate
a test file at a samplerate above 48kHz.

Discovered by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

CC: libav-stable@libav.org
7 years agomovenc: Don't require frame_size to be set for modes other than mov
Martin Storsjö [Mon, 23 Jan 2012 12:56:56 +0000 (14:56 +0200)]
movenc: Don't require frame_size to be set for modes other than mov

The field frame_size isn't written to the output anywhere except
than in mov.

This facilitates stream copy from formats that don't set frame_size.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodoc: Update APIchanges with info on muxer flushing
Martin Storsjö [Wed, 25 Jan 2012 10:43:19 +0000 (12:43 +0200)]
doc: Update APIchanges with info on muxer flushing

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Reindent a block
Martin Storsjö [Wed, 25 Jan 2012 10:40:05 +0000 (12:40 +0200)]
movenc: Reindent a block

Also add some space around operators and wrap a comment
that extends past the 80 char "limit"/guideline.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agotools: Remove some unnecessary #undefs.
Diego Biurrun [Wed, 25 Jan 2012 19:11:32 +0000 (20:11 +0100)]
tools: Remove some unnecessary #undefs.

7 years agorv20: prevent calling ff_h263_decode_mba() with unset height/width
Janne Grunau [Tue, 24 Jan 2012 20:50:50 +0000 (21:50 +0100)]
rv20: prevent calling ff_h263_decode_mba() with unset height/width

Prevents a crash of VLC during playback of a invalid matroska file,
found by John Villamil <johnv@matasano.com>.

CC: libav-stable@libav.org
7 years agotools: K&R reformatting cosmetics
Diego Biurrun [Wed, 25 Jan 2012 14:03:18 +0000 (15:03 +0100)]
tools: K&R reformatting cosmetics

7 years agoIgnore generated aviocat and ismindex tools.
Diego Biurrun [Wed, 25 Jan 2012 13:56:24 +0000 (14:56 +0100)]
Ignore generated aviocat and ismindex tools.

7 years agobuild: Automatically include architecture-specific library Makefile snippets.
Diego Biurrun [Wed, 25 Jan 2012 12:35:19 +0000 (13:35 +0100)]
build: Automatically include architecture-specific library Makefile snippets.

7 years agoindeo5: prevent null pointer dereference on broken files
Janne Grunau [Mon, 23 Jan 2012 20:33:34 +0000 (21:33 +0100)]
indeo5: prevent null pointer dereference on broken files

Found by John Villamil <johnv@matasano.com>

7 years agopktdumper: Use usleep instead of sleep
Martin Storsjö [Wed, 25 Jan 2012 11:47:47 +0000 (13:47 +0200)]
pktdumper: Use usleep instead of sleep

MinGW doesn't have sleep, only _sleep (which is deprecated),
Sleep (which is defined in winbase.h and not in the standard
C headers) and usleep.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agocosmetics: Remove some unnecessary block braces.
Diego Biurrun [Wed, 18 Jan 2012 17:47:59 +0000 (18:47 +0100)]
cosmetics: Remove some unnecessary block braces.

7 years agoDrop unnecessary prefix from *sink* variable and struct names.
Diego Biurrun [Thu, 19 Jan 2012 15:10:13 +0000 (16:10 +0100)]
Drop unnecessary prefix from *sink* variable and struct names.

7 years agoAdd a tool for creating smooth streaming manifests
Martin Storsjö [Mon, 9 Jan 2012 16:27:33 +0000 (18:27 +0200)]
Add a tool for creating smooth streaming manifests

It can also optionally split the file into individual fragments,
which allows it to be served from any web server without any
server side support.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovdec: Calculate an average bit rate for fragmented streams, too
Martin Storsjö [Fri, 13 Jan 2012 12:40:24 +0000 (14:40 +0200)]
movdec: Calculate an average bit rate for fragmented streams, too

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Write the sample rate instead of time scale in the stsd atom
Martin Storsjö [Mon, 9 Jan 2012 09:05:33 +0000 (11:05 +0200)]
movenc: Write the sample rate instead of time scale in the stsd atom

For ismv/isma, the time scale might not be the same as the sample
rate.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Add a separate ismv/isma (smooth streaming) muxer
Martin Storsjö [Mon, 9 Jan 2012 15:58:26 +0000 (17:58 +0200)]
movenc: Add a separate ismv/isma (smooth streaming) muxer

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Allow the caller to decide on fragmentation
Martin Storsjö [Fri, 20 Jan 2012 17:29:33 +0000 (19:29 +0200)]
movenc: Allow the caller to decide on fragmentation

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolibavformat: Add a flag for muxers that support write_packet(NULL) for flushing
Martin Storsjö [Fri, 20 Jan 2012 17:27:33 +0000 (19:27 +0200)]
libavformat: Add a flag for muxers that support write_packet(NULL) for flushing

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Add support for writing fragmented mov files
Martin Storsjö [Thu, 5 Jan 2012 11:57:05 +0000 (13:57 +0200)]
movenc: Add support for writing fragmented mov files

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Add a separate start_pts
Martin Storsjö [Fri, 6 Jan 2012 23:32:53 +0000 (01:32 +0200)]
movenc: Add a separate start_pts

This fixes calculation of trackDuration if the MOVIentry array
is cleared. This is required by the fragmentation support in the
next patch.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodsputil: use vertical component for drawing bottom edge.
Ronald S. Bultje [Wed, 25 Jan 2012 09:17:52 +0000 (17:17 +0800)]
dsputil: use vertical component for drawing bottom edge.

Current code only writes 8 pixels of vertical edge for YUV422, which
causes MC artifacts when subsequent frames use data from that edge.

7 years agoaacenc: Fix identification padding when the bitstream is already aligned.
Alex Converse [Mon, 23 Jan 2012 21:08:32 +0000 (13:08 -0800)]
aacenc: Fix identification padding when the bitstream is already aligned.

7 years agoaacenc: Write correct length for long identification strings.
Michael Niedermayer [Mon, 23 Jan 2012 21:05:03 +0000 (13:05 -0800)]
aacenc: Write correct length for long identification strings.

When the length is the escape value (15), the new length is calculated by
15 + get_bits(8) - 1.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agoaud: remove unneeded field, audio_stream_index from context
Justin Ruggles [Tue, 24 Jan 2012 16:46:58 +0000 (11:46 -0500)]
aud: remove unneeded field, audio_stream_index from context

There is only one stream, so it will always be index 0.
This also allows for removal of the private context.

7 years agoaud: fix time stamp calculation for ADPCM IMA WS
Justin Ruggles [Tue, 24 Jan 2012 16:43:54 +0000 (11:43 -0500)]
aud: fix time stamp calculation for ADPCM IMA WS

also allows for removing some unused context fields

7 years agoaud: simplify header parsing
Justin Ruggles [Tue, 24 Jan 2012 16:40:23 +0000 (11:40 -0500)]
aud: simplify header parsing

also allows for removing some unused context fields

7 years agoaud: set pts_wrap_bits to 64.
Justin Ruggles [Tue, 24 Jan 2012 16:28:02 +0000 (11:28 -0500)]
aud: set pts_wrap_bits to 64.

Time stamps are not read from the bitstream, so no wrapping is needed.

7 years agocosmetics: indentation
Justin Ruggles [Tue, 24 Jan 2012 16:41:37 +0000 (11:41 -0500)]
cosmetics: indentation

7 years agoaud: support Westwood SND1 audio in AUD files.
Justin Ruggles [Tue, 24 Jan 2012 16:09:05 +0000 (11:09 -0500)]
aud: support Westwood SND1 audio in AUD files.

Fixes decoding of the handful of "death scream" samples from
"Command and Conquer" that use SND1. e.g.
http://samples.libav.org/game-formats/westwood-aud/nuyell1.aud
http://samples.libav.org/game-formats/westwood-aud/nuyell7.aud

7 years agoadpcm_ima_ws: fix stereo decoding
Justin Ruggles [Mon, 23 Jan 2012 17:23:27 +0000 (12:23 -0500)]
adpcm_ima_ws: fix stereo decoding

Stereo ADPCM IMA WS is planar for VQA version 3 and 2-sample interleaved for
VQA version 2.

7 years agoavcodec: add a new codec_id for CRYO APC IMA ADPCM.
Justin Ruggles [Mon, 23 Jan 2012 19:57:32 +0000 (14:57 -0500)]
avcodec: add a new codec_id for CRYO APC IMA ADPCM.

The stereo layout and extradata is significantly different from that in
Westwood IMA ADPCM, so a separate codec_id is warranted.

7 years agovqa: remove unused context fields, audio_samplerate and audio_bits
Justin Ruggles [Mon, 23 Jan 2012 18:43:54 +0000 (13:43 -0500)]
vqa: remove unused context fields, audio_samplerate and audio_bits

7 years agovqa: clean up audio header parsing
Justin Ruggles [Mon, 23 Jan 2012 18:28:20 +0000 (13:28 -0500)]
vqa: clean up audio header parsing

Fix setting of bit_rate and bits_per_coded_sample.
Ask for sample for unsupported VQA versions.

7 years agovqa: set time base to frame rate as coded in the header.
Justin Ruggles [Mon, 23 Jan 2012 16:38:00 +0000 (11:38 -0500)]
vqa: set time base to frame rate as coded in the header.

According to Multimedia Wiki documentation, the frame rate is not always 15,
and the actual value can be found in the header.

7 years agovqa: set packet duration.
Justin Ruggles [Mon, 23 Jan 2012 16:06:35 +0000 (11:06 -0500)]
vqa: set packet duration.

Also remove unused context field, audio_frame_counter.

7 years agovqa: use 1/sample_rate as the audio stream time base
Justin Ruggles [Mon, 23 Jan 2012 15:55:28 +0000 (10:55 -0500)]
vqa: use 1/sample_rate as the audio stream time base

7 years agovqa: set stream start_time to 0.
Justin Ruggles [Mon, 23 Jan 2012 15:52:49 +0000 (10:52 -0500)]
vqa: set stream start_time to 0.

The format has no coded timestamps and must use packet durations to generate
them.