1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Commit Graph

41 Commits

Author SHA1 Message Date
Vittorio Giovara
dd3aa85b68 aac_ac3_parser: Drop in-parser downmix functionality
request_channel_layout is a decoder option and it makes no sense
to have it in a parser.

This feature was needed in the past when the decoder was allowed
to reuse the avctx from the demuxer. Nowadays the decoder receives
only the parameters from it, already containing the real channel
layout (and the correct request_channel_layout option).

After initialization the decoder overwrites the channel layout
with the downmixed one that is actually output, so there is no need
to preserve this functionality in the parser.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2017-04-27 14:19:50 -04:00
Vittorio Giovara
dc70c19476 lavc: Drop deprecated request_channels related functions
Deprecated in 04/2011.
2015-08-28 16:01:16 +02:00
Tim Walker
b532854622 ac3: implement request_channel_layout.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-22 23:27:33 +01:00
Tim Walker
69d4dbfd1f aac_ac3_parser: simplify an expression
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-19 02:02:53 +01:00
Martin Storsjö
1d9c2dc89a Don't include common.h from avutil.h
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-15 22:32:06 +03:00
Anton Khirnov
36ef5369ee Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
Justin Ruggles
16e54ac725 (e)ac3 parser: set duration instead of frame_size 2012-02-20 15:08:40 -05:00
Justin Ruggles
be18738801 Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser
and decoder, and vice-versa for the AC-3 encoder.
2011-03-25 16:59:00 -04:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Alex Converse
65bec42e33 Cosmetics: Re-indent after last commit.
Originally committed as revision 22195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 02:32:48 +00:00
Alex Converse
ca1fa4144f AAC parser: Don't write channels, sample rate, and frame size each frame.
Thanks to backwards compatible HE-AAC signalling these values are unreliable.

Originally committed as revision 22194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 02:30:51 +00:00
Alex Converse
f2e5c8b96a Cosmetics after last commit
Originally committed as revision 18816 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 17:59:46 +00:00
Alex Converse
90350d73f8 Allow parsing and decoding of ADTS AAC files with channel config = 0
Originally committed as revision 18815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 17:57:58 +00:00
Justin Ruggles
bfeca7beb6 Add channel layout support to the AC-3 decoder and AC-3 parser.
Originally committed as revision 18622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-19 15:05:32 +00:00
Joakim Plate
4cff8dc88f Allow AC-3 parser to modify codec_id.
Patch by Joakim Plate (elupus A ecce D se).

Originally committed as revision 17447 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-19 00:28:19 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Michael Niedermayer
bf2cdefc6a Reset state after some frame header is found.
Fixes issue704

Originally committed as revision 15742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-29 21:08:14 +00:00
Michael Niedermayer
8dbd9cb695 Fix all the recent problems Justin had run into with the AC3 parser,
including issue 459.

Originally committed as revision 15381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-22 03:00:26 +00:00
Justin Ruggles
2988c93d94 create a separate codec_id for E-AC-3
Originally committed as revision 15143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 14:33:54 +00:00
Justin Ruggles
14b7062829 cosmetics: make all references to AC-3 capitalized and hyphenated
Originally committed as revision 14523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 16:42:32 +00:00
Michael Niedermayer
8870cf8277 This fixes the code so it is correct on both sides of the if().
Originally committed as revision 12902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19 11:14:55 +00:00
Michael Niedermayer
7bc5f6e53e indent
Originally committed as revision 12901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19 10:48:50 +00:00
Michael Niedermayer
e4d5a18558 100l I broke AC3 in MPEG seeking.
Originally committed as revision 12898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19 02:58:36 +00:00
Michael Niedermayer
8629e7562d part 1 of EAC3 support
Originally committed as revision 12896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19 02:28:24 +00:00
Michael Niedermayer
133ac890fb Add new_frame_start and need_next_header.
based on a patch by Bartlomiej

Originally committed as revision 12895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19 01:59:55 +00:00
Michael Niedermayer
454064ad1e Change aac and ac3 parsers to use ff_combine_frame().
Originally committed as revision 12894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19 01:50:40 +00:00
Michael Niedermayer
8c731c9743 remove AACAC3FrameFlag
Originally committed as revision 12888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-18 03:09:01 +00:00
Bartlomiej Wolowiec
469d8816d6 undo changes in aac_ac3_parser
Originally committed as revision 12778 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-09 22:11:21 +00:00
Bartlomiej Wolowiec
e9089a5240 Correction of typo in aac_ac3_parser
Originally committed as revision 12768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-08 06:18:36 +00:00
Bartlomiej Wolowiec
c09ed33e18 Corrections of errors in aac_ac3_parser
Originally committed as revision 12759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 20:54:08 +00:00
Bartlomiej Wolowiec
0a5754c3b7 change of aac_ac3_parser, so it is able to send complete portion of data to decoder
Originally committed as revision 12758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-05 20:09:36 +00:00
Bartlomiej Wolowiec
be1e2a2bfa removal of stream_type in AACAC3ParseContext and adding AACAC3FrameFlag
Originally committed as revision 12622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 19:59:58 +00:00
Justin Ruggles
c599e297e7 Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
Bartlomiej Wolowiec (bartek wolowiec gmail com)

Originally committed as revision 12564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-23 15:43:29 +00:00
Justin Ruggles
ef7f2bb782 add downmixing support to libfaad decoder
Originally committed as revision 11422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-05 21:08:20 +00:00
Justin Ruggles
6cd325c106 do not set channels before checking request_channels
Originally committed as revision 11414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-05 15:18:15 +00:00
Justin Ruggles
f228eb737b adjust output channels based on AVCodecContext.request_channels in AC3 parser
Originally committed as revision 11412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-05 05:36:00 +00:00
Justin Ruggles
5706c0becd cosmetics: indentation after last commit
Originally committed as revision 11387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-03 22:42:37 +00:00
Justin Ruggles
bd03aa1556 remove workaround which is no longer needed due to
AVCodecContext.request_channels

Originally committed as revision 11386 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-03 22:41:59 +00:00
Michael Niedermayer
211dd1e81f factorize code and add safety check to prevent memcpying negative amounts
Originally committed as revision 10722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-13 09:58:39 +00:00
Aurelien Jacobs
679c2294cb cosmetics: rename for consistency after previous aac and ac3 parsers move
Originally committed as revision 8942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-08 23:29:07 +00:00
Aurelien Jacobs
99ff31dc75 move aac and ac3 parsers in their own files
Originally committed as revision 8941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-08 23:25:31 +00:00