* qatar/master: (44 commits) replacement Indeo 3 decoder gsm demuxer: do not allocate packet twice. flvenc: use first packet delay as global delay. ac3enc: doxygen update. imc: return error codes instead of 0 for error conditions. imc: return meaningful error codes instead of -1 imc: do not set channel layout for stereo imc: validate channel count imc: check for ff_fft_init() failure imc: check output buffer size before decoding imc: use DSPContext.bswap16_buf() to byte-swap packet data rtsp: add allowed_media_types option libgsm: add flush function to reset the decoder state when seeking libgsm: simplify decoding by using a loop gsm: log error message when packet is too small libgsmdec: do not needlessly set *data_size to 0 gsmdec: do not needlessly set *data_size to 0 gsmdec: add flush function to reset the decoder state when seeking libgsmdec: check output buffer size before decoding gsmdec: log error message when output buffer is too small. ... Conflicts: Changelog ffplay.c libavcodec/indeo3.c libavcodec/mjpeg_parser.c libavcodec/vp3.c libavformat/cutils.c libavformat/id3v2.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			70 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			70 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Audio and Video frame extraction
 | |
|  * Copyright (c) 2003 Fabrice Bellard
 | |
|  * Copyright (c) 2003 Michael Niedermayer
 | |
|  *
 | |
|  * This file is part of FFmpeg.
 | |
|  *
 | |
|  * FFmpeg is free software; you can redistribute it and/or
 | |
|  * modify it under the terms of the GNU Lesser General Public
 | |
|  * License as published by the Free Software Foundation; either
 | |
|  * version 2.1 of the License, or (at your option) any later version.
 | |
|  *
 | |
|  * FFmpeg is distributed in the hope that it will be useful,
 | |
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
|  * Lesser General Public License for more details.
 | |
|  *
 | |
|  * You should have received a copy of the GNU Lesser General Public
 | |
|  * License along with FFmpeg; if not, write to the Free Software
 | |
|  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | |
|  */
 | |
| 
 | |
| #include "parser.h"
 | |
| #include "aac_ac3_parser.h"
 | |
| #include "aacadtsdec.h"
 | |
| #include "get_bits.h"
 | |
| #include "mpeg4audio.h"
 | |
| 
 | |
| static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info,
 | |
|         int *need_next_header, int *new_frame_start)
 | |
| {
 | |
|     GetBitContext bits;
 | |
|     AACADTSHeaderInfo hdr;
 | |
|     int size;
 | |
|     union {
 | |
|         uint64_t u64;
 | |
|         uint8_t  u8[8];
 | |
|     } tmp;
 | |
| 
 | |
|     tmp.u64 = av_be2ne64(state);
 | |
|     init_get_bits(&bits, tmp.u8+8-AAC_ADTS_HEADER_SIZE, AAC_ADTS_HEADER_SIZE * 8);
 | |
| 
 | |
|     if ((size = avpriv_aac_parse_header(&bits, &hdr)) < 0)
 | |
|         return 0;
 | |
|     *need_next_header = 0;
 | |
|     *new_frame_start  = 1;
 | |
|     hdr_info->sample_rate = hdr.sample_rate;
 | |
|     hdr_info->channels    = ff_mpeg4audio_channels[hdr.chan_config];
 | |
|     hdr_info->samples     = hdr.samples;
 | |
|     hdr_info->bit_rate    = hdr.bit_rate;
 | |
|     return size;
 | |
| }
 | |
| 
 | |
| static av_cold int aac_parse_init(AVCodecParserContext *s1)
 | |
| {
 | |
|     AACAC3ParseContext *s = s1->priv_data;
 | |
|     s->header_size = AAC_ADTS_HEADER_SIZE;
 | |
|     s->sync = aac_sync;
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| 
 | |
| AVCodecParser ff_aac_parser = {
 | |
|     .codec_ids      = { CODEC_ID_AAC },
 | |
|     .priv_data_size = sizeof(AACAC3ParseContext),
 | |
|     .parser_init    = aac_parse_init,
 | |
|     .parser_parse   = ff_aac_ac3_parse,
 | |
|     .parser_close   = ff_parse_close,
 | |
| };
 |