* qatar/master: (29 commits) fate: add golomb-test golomb-test: K&R formatting cosmetics h264: Split h264-test off into a separate file - golomb-test.c. h264-test: cleanup: drop timer invocations, commented out code and other cruft h264-test: Remove unused DSP and AVCodec contexts and related init calls. adpcm: Add missing stdint.h #include to fix standalone header compilation. lavf: add functions for accessing the fourcc<->CodecID mapping tables. lavc: set AVCodecContext.codec in avcodec_get_context_defaults3(). lavc: make avcodec_close() work properly on unopened codecs. lavc: add avcodec_is_open(). lavf: rename AVInputFormat.value to raw_codec_id. lavf: remove the pointless value field from flv and iv8 lavc/lavf: remove unnecessary symbols from the symbol version script. lavc: reorder AVCodec fields. lavf: reorder AVInput/OutputFormat fields. mp3dec: Fix a heap-buffer-overflow adpcmenc: remove some unneeded casts adpcmenc: use int16_t and uint8_t instead of short and unsigned char. adpcmenc: fix adpcm_ms extradata allocation adpcmenc: return proper AVERROR codes instead of -1 ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/adpcmenc.c libavcodec/avcodec.h libavcodec/h264.c libavcodec/libavcodec.v libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/options.c libavformat/Makefile libavformat/avformat.h libavformat/flvdec.c libavformat/libavformat.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			74 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			74 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * RAW video demuxer
 | 
						|
 * Copyright (c) 2001 Fabrice Bellard
 | 
						|
 *
 | 
						|
 * 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 "avformat.h"
 | 
						|
#include "rawdec.h"
 | 
						|
 | 
						|
static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
 | 
						|
{
 | 
						|
    int packet_size, ret, width, height;
 | 
						|
    AVStream *st = s->streams[0];
 | 
						|
 | 
						|
    width = st->codec->width;
 | 
						|
    height = st->codec->height;
 | 
						|
 | 
						|
    packet_size = avpicture_get_size(st->codec->pix_fmt, width, height);
 | 
						|
    if (packet_size < 0)
 | 
						|
        return -1;
 | 
						|
 | 
						|
    ret= av_get_packet(s->pb, pkt, packet_size);
 | 
						|
    pkt->pts=
 | 
						|
    pkt->dts= pkt->pos / packet_size;
 | 
						|
 | 
						|
    pkt->stream_index = 0;
 | 
						|
    if (ret < 0)
 | 
						|
        return ret;
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
#define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
 | 
						|
#define DEC AV_OPT_FLAG_DECODING_PARAM
 | 
						|
static const AVOption rawvideo_options[] = {
 | 
						|
    { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
 | 
						|
    { "pixel_format", "", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = "yuv420p"}, 0, 0, DEC },
 | 
						|
    { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, DEC },
 | 
						|
    { NULL },
 | 
						|
};
 | 
						|
 | 
						|
static const AVClass rawvideo_demuxer_class = {
 | 
						|
    .class_name = "rawvideo demuxer",
 | 
						|
    .item_name  = av_default_item_name,
 | 
						|
    .option     = rawvideo_options,
 | 
						|
    .version    = LIBAVUTIL_VERSION_INT,
 | 
						|
};
 | 
						|
 | 
						|
AVInputFormat ff_rawvideo_demuxer = {
 | 
						|
    .name           = "rawvideo",
 | 
						|
    .long_name      = NULL_IF_CONFIG_SMALL("raw video format"),
 | 
						|
    .priv_data_size = sizeof(FFRawVideoDemuxerContext),
 | 
						|
    .read_header    = ff_raw_read_header,
 | 
						|
    .read_packet    = rawvideo_read_packet,
 | 
						|
    .flags= AVFMT_GENERIC_INDEX,
 | 
						|
    .extensions = "yuv,cif,qcif,rgb",
 | 
						|
    .raw_codec_id   = CODEC_ID_RAWVIDEO,
 | 
						|
    .priv_class = &rawvideo_demuxer_class,
 | 
						|
};
 |