Michael Niedermayer
6747b0be9b
mlp: fix channel order.
...
This fixes a regression introduced with todays merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Tim Walker
ed1b01131e
mlp: implement support for AVCodecContext.request_channel_layout.
...
Also wrap usage of AVCodecContext.request_channels in FF_API_REQUEST_CHANNELS directives.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years ago
Tim Walker
b0c7e3ffd0
mlp_parser: account for AVCodecContext.request_channels when setting the channel layout.
...
Allows users to configure the output based on what's actually decoded, rather than the full native layout.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years ago
Tim Walker
99ccd2ba10
mlp: store the channel layout for each substream.
...
Also stop storing the channel arrangement in the header info, as it's unused outside of ff_mlp_read_major_sync.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org
12 years ago
Justin Ruggles
a903f8f087
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
...
Also reorder some other #include when applicable.
12 years ago
Michael Niedermayer
df727d408c
mlp_parser: print error when ff_combine_frame() fails to add the current buffer
...
Fixes part of CID602338
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
2a672652bb
mlp_parser: dont override existing channel geometry.
...
This prevents race conditions
And partly fixes Ticket1726
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Tim Walker
3844572887
mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel.
...
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years ago
Anton Khirnov
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
13 years ago
Michael Niedermayer
5c44c2de80
mlp_parser: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Tim Walker
0a9efe4c6e
mlp_parser: fix the channel mask value used for the top surround channel
...
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
13 years ago
Tim Walker
6bbaf6e0dd
mlpdec_parser: fix a few channel layouts.
...
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
13 years ago
Justin Ruggles
b3a4c7e0f1
mlp parser: set duration instead of frame_size
13 years ago
Michael Niedermayer
e146ad95d7
mlp_parser: Fix infinite loop with 0 bytes_left.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Hendrik Leppkes
b7bf93b923
mlp: Use correct speaker locations in TrueHD channel layout.
...
(cherry picked from commit d7787835ad737d4f4d8b6f17e04d981632eeaa91)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Mans Rullgard
cc276c85d1
Make channel layout masks unsigned
...
It makes more sense for a bit mask to use an unsigned type.
The change should be source and binary compatible on all
supported systems, hence micro version bump.
Fixes a few invalid shifts.
Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago
Anton Khirnov
5511ad14fe
lavc: use designated initialisers for parsers.
13 years ago
Justin Ruggles
82be06bbb3
mlpdec: return meaningful error codes instead of -1
13 years ago
Carl Eugen Hoyos
0aac0403c5
Map mlp surround channels to FFmpeg rear channels.
...
This allows more 3rd party applications to correctly read
the resulting wav files.
14 years ago
Carl Eugen Hoyos
9b53bb8b3b
Only ask once in the code for a TrueHD sample with strange channel layout.
14 years ago
Carl Eugen Hoyos
280a789fe2
Make MLP/TrueHD channel layout functions visible to the decoder.
14 years ago
Anton Khirnov
6f3d3eacf6
lavc: add missing audioconvert includes
14 years ago
Carl Eugen Hoyos
2a0bd2bfc9
Make a plausibility check when setting channel layout for TrueHD.
...
TrueHD supports more channels than FFmpeg, so a valid sample
could set the channel layout to a value that represents less
channels than the sample actually consists of.
14 years ago
John Stebbins
4b6f097b21
mlp_parse.c: set AVCodecContext channel_layout
...
The channel layout isn't getting set for mlp and truehd audio.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Diego Elio Pettenò
e7e2df27f8
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>
(cherry picked from commit d36beb3f69
)
14 years ago
Diego Elio Pettenò
d36beb3f69
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>
14 years ago
Stefano Sabatini
5d6e4c160a
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
...
SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Diego Biurrun
ba87f0801d
Remove explicit filename from Doxygen @file commands.
...
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Jai Menon
8790961d7e
mlp_parser: Fix memleak.
...
ff_combine_frame() is called, which allocates ParseContext->buffer if needed,
so ff_parse_close() must be called to free it.
Patch by jai.
Originally committed as revision 22005 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Reimar Döffinger
7e2ef1b9e1
Fix possible crashes in mlp parser, it tries to go back 7 bytes after
...
finding the 4-byte signature.
Add a check that ignores the signature if we do not have enough previous
data to go back at least 7 bytes.
Originally committed as revision 21487 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Stefano Sabatini
9106a698e7
Rename bitstream.h to get_bits.h.
...
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Ramiro Polla
9ba4821d93
Split TrueHD decoder from MLP
...
Originally committed as revision 18045 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Diego Biurrun
bad5537e2c
Use full internal pathname in doxygen @file directives.
...
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Ramiro Polla
ee1a8f6290
mlp: support bit-depths greater than 16 by default.
...
Originally committed as revision 16026 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Mathieu Velten
97679e6e38
mlp: Fix compilation under CONFIG_AUDIO_NONSHORT.
...
Patch by Mathieu Velten < matmaul at gmail dot com >
Originally committed as revision 16021 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Laurent Aimar
7a2efd2e44
mlp: initialize all CRC tables in a common function.
...
This way the decoder does not have to depend on the parser being initialized
before.
Patch by Laurent Aimar <fenrir at via dot ecp dot fr>.
Originally committed as revision 15986 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Ramiro Polla
ce15710f55
mlp: Split common code from parser and decoder to be used by encoder.
...
Originally committed as revision 14733 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Ramiro Polla
ee5b34d56e
mlp_parser: Initialize crc data in its own function.
...
Originally committed as revision 14722 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Diego Biurrun
0e74e1ff3c
Add required stdint.h header #include.
...
Originally committed as revision 14077 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Diego Biurrun
9906a2be76
spelling cosmetics
...
Originally committed as revision 14076 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Ramiro Polla
5faf3a4449
Clarify comment about parity nibble.
...
Originally committed as revision 14047 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Ramiro Polla
49de8d1e9c
Make ff_mlp_read_major_sync() take a GetBitContext instead of buffers.
...
Originally committed as revision 14044 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Ramiro Polla
ae10e1fd3d
Seek the file forwards instead of backwards when sync is lost.
...
Originally committed as revision 14014 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Ramiro Polla
c624c2195f
Make it a little easier to spot that the code is not dealing only with
...
substream headers.
Originally committed as revision 13961 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Diego Biurrun
245976da2a
Use full path for #includes from another directory.
...
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Diego Biurrun
f2c68f9c7e
cosmetics: spelling fixes
...
Originally committed as revision 11155 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Ian Caulfield
6b493b2f2f
MLP/TrueHD parser
...
Patch by Ian Caulfield, ian D caulfield <at> gmail D com
Thread: [PATCH] MLP/TrueHD decoder, 12 Oct 14:26
Originally committed as revision 11109 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago