summaryrefslogtreecommitdiff
path: root/libavcodec/aac_ac3_parser.h
Commit message (Collapse)AuthorAge
* lavc/aac_ac3_parser: fix potential overflow when averaging bitrateAlexander Strasser2020-08-12
| | | | | | | The new code is analog to how it's done in our mpegaudio parser. Acked-by: Jun Zhao <barryjzhao@tencent.com> Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* lavc/aac_ac3_parser: improve the raw AAC file bit rate calculationJun Zhao2020-06-26
| | | | | | | | | | | | | | | | | | | Now we just use one ADTS raw frame to calculate the bit rate, it's lead to a larger error when get the duration from bit rate, the improvement cumulate Nth ADTS frames to get the average bit rate. e,g used the command get the duration like: ffprobe -show_entries format=duration -i fate-suite/aac/foo.aac before this improvement dump the duration=2.173935 after this improvement dump the duration=1.979267 in fact, the real duration can be get by command like: ffmpeg -i fate-suite/aac/foo.aac -f null /dev/null with time=00:00:01.97 Also update the fate-adtstoasc_ticket3715. Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
* Merge commit '6258d362b82934a2c27557e0984aed372d98091a'Michael Niedermayer2013-08-28
|\ | | | | | | | | | | | | * commit '6258d362b82934a2c27557e0984aed372d98091a': ac3: Do not clash with normal AVERROR Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ac3: Do not clash with normal AVERRORLuca Barbato2013-08-27
| | | | | | | | | | The parsing function return AVERROR and AAC_AC3_PARSE_ERROR values, make sure they are not misunderstood.
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-07
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: Readd #define _SVID_SOURCE Fix av_get_channel_layout_string() for positions >31 configure: Store vda lib flags in extralibs instead of ldflags Make channel layout masks unsigned dca: ARMv6 optimised decode_blockcode() nullenc: drop AVFMT_RAWPICTURE from the flags frame-mt: return consumed packet size in ff_thread_decode_frame aacdec: add more fate tests covering SBR and PS MK(BE)TAG: avoid undefined shifts Conflicts: configure libavcodec/arm/dca.h libavcodec/dca.c libavcodec/mlp_parser.c libavcodec/version.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavutil/audioconvert.c libavutil/avutil.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Make channel layout masks unsignedMans Rullgard2011-11-25
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-25
| | | | | | | | and decoder, and vice-versa for the AC-3 encoder.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Add channel layout support to the AC-3 decoder and AC-3 parser.Justin Ruggles2009-04-19
| | | | Originally committed as revision 18622 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow AC-3 parser to modify codec_id.Joakim Plate2009-02-19
| | | | | | 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-19
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorise enum of AC3 error types to be usable by AAC in the ADTS patch thatAlex Converse2009-01-07
| | | | | | | | will follow Patch by Alex Converse ( alex converse gmail com ) Originally committed as revision 16479 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-31
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: make all references to AC-3 capitalized and hyphenatedJustin Ruggles2008-08-03
| | | | Originally committed as revision 14523 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Close parse context.David Liu2008-06-25
| | | | | | Patch by David LIU david liu st com Originally committed as revision 13962 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add necessary #includes in headersMåns Rullgård2008-05-03
| | | | Originally committed as revision 13043 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add new_frame_start and need_next_header.Michael Niedermayer2008-04-19
| | | | | | 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-19
| | | | Originally committed as revision 12894 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove AACAC3FrameFlagMichael Niedermayer2008-04-18
| | | | Originally committed as revision 12888 to svn://svn.ffmpeg.org/ffmpeg/trunk
* undo changes in aac_ac3_parserBartlomiej Wolowiec2008-04-09
| | | | Originally committed as revision 12778 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Corrections of errors in aac_ac3_parserBartlomiej Wolowiec2008-04-07
| | | | 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-05
| | | | | | decoder Originally committed as revision 12758 to svn://svn.ffmpeg.org/ffmpeg/trunk
* removal of stream_type in AACAC3ParseContext and adding AACAC3FrameFlagBartlomiej Wolowiec2008-03-28
| | | | Originally committed as revision 12622 to svn://svn.ffmpeg.org/ffmpeg/trunk
* using stream type in eac3 parserBartlomiej Wolowiec2008-03-24
| | | | Originally committed as revision 12570 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Pass AACAC3ParseContext to sync() instead of individual arguments. Patch byJustin Ruggles2008-03-23
| | | | | | Bartlomiej Wolowiec (bartek wolowiec gmail com) Originally committed as revision 12564 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun2007-10-17
| | | | Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
* include all prerequisites in header filesMåns Rullgård2007-06-16
| | | | Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: rename for consistency after previous aac and ac3 parsers moveAurelien Jacobs2007-05-08
| | | | Originally committed as revision 8942 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move aac and ac3 parsers in their own filesAurelien Jacobs2007-05-08
Originally committed as revision 8941 to svn://svn.ffmpeg.org/ffmpeg/trunk