summaryrefslogtreecommitdiffstats
path: root/libavcodec/aac_ac3_parser.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/aac_ac3_parser: account for data already in the parsing bufferHendrik Leppkes2018-04-151-0/+3
| | | | | | | | | | | If a frame starts very close to a packet boundary, the start code may already have been added to the parsing buffer, indicated by a small negative value of "i", while the header is still being tracked in the "state" variable. Reduce the remaining size accordingly, otherwise trying to find the next frame could skip over the frame header and lump two frames together as one.
* avcodec/eac3: add support for dependent streamPaul B Mahol2018-03-291-3/+6
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge commit 'dd3aa85b68c017c419acb0c39ff6aa890ce89e87'James Almer2017-10-301-14/+2
|\ | | | | | | | | | | | | * commit 'dd3aa85b68c017c419acb0c39ff6aa890ce89e87': aac_ac3_parser: Drop in-parser downmix functionality Merged-by: James Almer <jamrial@gmail.com>
| * aac_ac3_parser: Drop in-parser downmix functionalityVittorio Giovara2017-04-271-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | lavc/aac_ac3_parser: reindentRodger Combs2016-02-271-22/+23
| |
* | lavc/aac_ac3_parser: avoid zeroing codec parameters if we haven't read a frameRodger Combs2016-02-271-0/+4
| | | | | | | | This caused issues when seeking in some unusual MPEGTS files
* | Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c'Hendrik Leppkes2015-09-051-8/+0
|\ \ | |/ | | | | | | | | | | * commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c': lavc: Drop deprecated request_channels related functions Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Drop deprecated request_channels related functionsVittorio Giovara2015-08-281-8/+0
| | | | | | | | Deprecated in 04/2011.
* | Merge commit 'b53285462263ef8a795f0e289abd5799b4c57652'Michael Niedermayer2013-11-231-3/+17
|\ \ | |/ | | | | | | | | | | * commit 'b53285462263ef8a795f0e289abd5799b4c57652': ac3: implement request_channel_layout. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ac3: implement request_channel_layout.Tim Walker2013-11-221-3/+17
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '69d4dbfd1faa99563065329656bbe597d612ca03'Michael Niedermayer2013-11-191-7/+3
|\ \ | |/ | | | | | | | | | | * commit '69d4dbfd1faa99563065329656bbe597d612ca03': aac_ac3_parser: simplify an expression Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac_ac3_parser: simplify an expressionTim Walker2013-11-191-7/+3
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-161-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't include common.h from avutil.hMartin Storsjö2012-08-151-0/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-3/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-211-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (36 commits) adpcmenc: Use correct frame_size for Yamaha ADPCM. avcodec: add ff_samples_to_time_base() convenience function to internal.h adx parser: set duration mlp parser: set duration instead of frame_size gsm parser: set duration mpegaudio parser: set duration instead of frame_size (e)ac3 parser: set duration instead of frame_size flac parser: set duration instead of frame_size avcodec: add duration field to AVCodecParserContext avutil: add av_rescale_q_rnd() to allow different rounding pnmdec: remove useless .pix_fmts libmp3lame: support float and s32 sample formats libmp3lame: renaming, rearrangement, alignment, and comments libmp3lame: use the LAME default bit rate libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing libmp3lame: cosmetics: remove some pointless comments libmp3lame: convert some debugging code to av_dlog() libmp3lame: remove outdated comment. libmp3lame: do not set coded_frame->key_frame. libmp3lame: improve error handling in MP3lame_encode_init() ... Conflicts: doc/APIchanges libavcodec/libmp3lame.c libavcodec/pcxenc.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/sgienc.c libavcodec/utils.c libavformat/hls.c libavutil/avutil.h libswscale/x86/swscale_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * (e)ac3 parser: set duration instead of frame_sizeJustin Ruggles2012-02-201-1/+1
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-261-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom. 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. Use audio_service_type to set stream disposition. Add APIchanges entry for audio_service_type. Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream. configure: in check_ld, place new -l flags before existing ones support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl doc: update build system documentation aacenc: indentation aacenc: fix the side calculation in search_for_ms vp8.c: rename EDGE_* to VP8_EDGE_*. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavcodec/vp8.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parserJustin Ruggles2011-03-251-0/+1
| | | | | | | | and decoder, and vice-versa for the AC-3 encoder.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Cosmetics: Re-indent after last commit.Alex Converse2010-03-041-13/+13
| | | | Originally committed as revision 22195 to svn://svn.ffmpeg.org/ffmpeg/trunk
* AAC parser: Don't write channels, sample rate, and frame size each frame.Alex Converse2010-03-041-3/+11
| | | | | | Thanks to backwards compatible HE-AAC signalling these values are unreliable. Originally committed as revision 22194 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics after last commitAlex Converse2009-05-131-3/+1
| | | | Originally committed as revision 18816 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow parsing and decoding of ADTS AAC files with channel config = 0Alex Converse2009-05-131-0/+2
| | | | Originally committed as revision 18815 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add channel layout support to the AC-3 decoder and AC-3 parser.Justin Ruggles2009-04-191-0/+1
| | | | Originally committed as revision 18622 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow AC-3 parser to modify codec_id.Joakim Plate2009-02-191-0/+3
| | | | | | Patch by Joakim Plate (elupus A ecce D se). Originally committed as revision 17447 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-2/+2
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reset state after some frame header is found.Michael Niedermayer2008-10-291-0/+1
| | | | | | Fixes issue704 Originally committed as revision 15742 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix all the recent problems Justin had run into with the AC3 parser,Michael Niedermayer2008-09-221-1/+1
| | | | | | including issue 459. Originally committed as revision 15381 to svn://svn.ffmpeg.org/ffmpeg/trunk
* create a separate codec_id for E-AC-3Justin Ruggles2008-09-011-1/+2
| | | | Originally committed as revision 15143 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: make all references to AC-3 capitalized and hyphenatedJustin Ruggles2008-08-031-2/+2
| | | | Originally committed as revision 14523 to svn://svn.ffmpeg.org/ffmpeg/trunk
* This fixes the code so it is correct on both sides of the if().Michael Niedermayer2008-04-191-1/+3
| | | | Originally committed as revision 12902 to svn://svn.ffmpeg.org/ffmpeg/trunk
* indentMichael Niedermayer2008-04-191-14/+14
| | | | Originally committed as revision 12901 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 100l I broke AC3 in MPEG seeking.Michael Niedermayer2008-04-191-1/+1
| | | | Originally committed as revision 12898 to svn://svn.ffmpeg.org/ffmpeg/trunk
* part 1 of EAC3 supportMichael Niedermayer2008-04-191-1/+4
| | | | Originally committed as revision 12896 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add new_frame_start and need_next_header.Michael Niedermayer2008-04-191-1/+2
| | | | | | based on a patch by Bartlomiej Originally committed as revision 12895 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change aac and ac3 parsers to use ff_combine_frame().Michael Niedermayer2008-04-191-37/+32
| | | | Originally committed as revision 12894 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove AACAC3FrameFlagMichael Niedermayer2008-04-181-2/+1
| | | | Originally committed as revision 12888 to svn://svn.ffmpeg.org/ffmpeg/trunk
* undo changes in aac_ac3_parserBartlomiej Wolowiec2008-04-091-39/+34
| | | | Originally committed as revision 12778 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correction of typo in aac_ac3_parserBartlomiej Wolowiec2008-04-081-1/+1
| | | | Originally committed as revision 12768 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Corrections of errors in aac_ac3_parserBartlomiej Wolowiec2008-04-071-1/+8
| | | | Originally committed as revision 12759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* change of aac_ac3_parser, so it is able to send complete portion of data to ↵Bartlomiej Wolowiec2008-04-051-34/+32
| | | | | | decoder Originally committed as revision 12758 to svn://svn.ffmpeg.org/ffmpeg/trunk
* removal of stream_type in AACAC3ParseContext and adding AACAC3FrameFlagBartlomiej Wolowiec2008-03-281-1/+2
| | | | Originally committed as revision 12622 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Pass AACAC3ParseContext to sync() instead of individual arguments. Patch byJustin Ruggles2008-03-231-8/+7
| | | | | | Bartlomiej Wolowiec (bartek wolowiec gmail com) Originally committed as revision 12564 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add downmixing support to libfaad decoderJustin Ruggles2008-01-051-3/+4
| | | | Originally committed as revision 11422 to svn://svn.ffmpeg.org/ffmpeg/trunk
* do not set channels before checking request_channelsJustin Ruggles2008-01-051-1/+2
| | | | Originally committed as revision 11414 to svn://svn.ffmpeg.org/ffmpeg/trunk
* adjust output channels based on AVCodecContext.request_channels in AC3 parserJustin Ruggles2008-01-051-0/+7
| | | | Originally committed as revision 11412 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: indentation after last commitJustin Ruggles2008-01-031-1/+1
| | | | Originally committed as revision 11387 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove workaround which is no longer needed due toJustin Ruggles2008-01-031-7/+0
| | | | | | AVCodecContext.request_channels Originally committed as revision 11386 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud