* qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			83 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			83 lines
		
	
	
		
			2.1 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 "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->channels    = 1;
 | |
|     st->codec->sample_rate = 8000;
 | |
| 
 | |
|     avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
 | |
| 
 | |
|     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",
 | |
|     .flags = AVFMT_GENERIC_INDEX
 | |
| };
 |