* commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea': Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer G.723.1 demuxer and decoder Add a shift parameter to celp_lp_synthesis_filter() libopenjpeg: K&R formatting cosmetics yadif: use emms_c() instead of inline assembly for emms invocations. ac3: don't use different names for option tables in the template file. lavfi: use const for AVFilterPad declarations in all filters. adpcm: don't duplicate identical AVSampleFmt array for each encoder. configure: cosmetics: Group test dependencies together configure: add more passthrough flags in tms470 filter configure: move flag filtering functions out of if/else blocks Conflicts: Changelog configure doc/general.texi libavcodec/Makefile libavcodec/ac3enc_fixed.c libavcodec/allcodecs.c libavcodec/eac3enc.c libavcodec/g723_1.c libavcodec/g723_1_data.h libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/v210dec.h libavcodec/version.h libavfilter/af_anull.c libavfilter/asrc_anullsrc.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_copy.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_pixdesctest.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vf_showinfo.c libavfilter/vf_slicify.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/Makefile libavformat/allformats.c libavformat/g723_1.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			86 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			86 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * G.723.1 demuxer
 | |
|  * Copyright (c) 2010 Mohamed Naufal Basheer
 | |
|  *
 | |
|  * 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
 | |
|  */
 | |
| 
 | |
| /**
 | |
|  * @file
 | |
|  * G.723.1 demuxer
 | |
|  */
 | |
| 
 | |
| #include "libavutil/audioconvert.h"
 | |
| #include "avformat.h"
 | |
| #include "internal.h"
 | |
| 
 | |
| static const uint8_t frame_size[4] = { 24, 20, 4, 1 };
 | |
| 
 | |
| static int g723_1_init(AVFormatContext *s)
 | |
| {
 | |
|     AVStream *st;
 | |
| 
 | |
|     st = avformat_new_stream(s, NULL);
 | |
|     if (!st)
 | |
|         return AVERROR(ENOMEM);
 | |
| 
 | |
|     st->codec->codec_type     = AVMEDIA_TYPE_AUDIO;
 | |
|     st->codec->codec_id       = CODEC_ID_G723_1;
 | |
|     st->codec->channel_layout = AV_CH_LAYOUT_MONO;
 | |
|     st->codec->channels       = 1;
 | |
|     st->codec->sample_rate    = 8000;
 | |
| 
 | |
|     avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
 | |
|     st->start_time = 0;
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static int g723_1_read_packet(AVFormatContext *s, AVPacket *pkt)
 | |
| {
 | |
|     int size, byte, ret;
 | |
| 
 | |
|     pkt->pos = avio_tell(s->pb);
 | |
|     byte     = avio_r8(s->pb);
 | |
|     size     = frame_size[byte & 3];
 | |
| 
 | |
|     ret = av_new_packet(pkt, size);
 | |
|     if (ret < 0)
 | |
|         return ret;
 | |
| 
 | |
|     pkt->data[0]      = byte;
 | |
|     pkt->duration     = 240;
 | |
|     pkt->stream_index = 0;
 | |
| 
 | |
|     ret = avio_read(s->pb, pkt->data + 1, size - 1);
 | |
|     if (ret < size - 1) {
 | |
|         av_free_packet(pkt);
 | |
|         return ret < 0 ? ret : AVERROR_EOF;
 | |
|     }
 | |
| 
 | |
|     return pkt->size;
 | |
| }
 | |
| 
 | |
| AVInputFormat ff_g723_1_demuxer = {
 | |
|     .name        = "g723_1",
 | |
|     .long_name   = NULL_IF_CONFIG_SMALL("G.723.1 format"),
 | |
|     .read_header = g723_1_init,
 | |
|     .read_packet = g723_1_read_packet,
 | |
|     .extensions  = "tco,rco,g723_1",
 | |
|     .flags       = AVFMT_GENERIC_INDEX
 | |
| };
 |