* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3': avconv: fix bitrate report when writing to /dev/null avfilter: fix graphparser memleaks on error paths rawdec: remove ff_raw_read_header pcmdec: remove dependency from rawdec g722: refactor out of rawdec.c rawvideo: use a specific read_header Conflicts: ffmpeg.c libavformat/Makefile libavformat/rawdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			163 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			163 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * RAW demuxers
 | 
						|
 * Copyright (c) 2001 Fabrice Bellard
 | 
						|
 * Copyright (c) 2005 Alex Beregszaszi
 | 
						|
 *
 | 
						|
 * 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 "internal.h"
 | 
						|
#include "avio_internal.h"
 | 
						|
#include "rawdec.h"
 | 
						|
#include "libavutil/opt.h"
 | 
						|
#include "libavutil/parseutils.h"
 | 
						|
#include "libavutil/pixdesc.h"
 | 
						|
#include "libavutil/avassert.h"
 | 
						|
 | 
						|
#define RAW_PACKET_SIZE 1024
 | 
						|
 | 
						|
int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt)
 | 
						|
{
 | 
						|
    int ret, size;
 | 
						|
 | 
						|
    size = RAW_PACKET_SIZE;
 | 
						|
 | 
						|
    if (av_new_packet(pkt, size) < 0)
 | 
						|
        return AVERROR(ENOMEM);
 | 
						|
 | 
						|
    pkt->pos= avio_tell(s->pb);
 | 
						|
    pkt->stream_index = 0;
 | 
						|
    ret = ffio_read_partial(s->pb, pkt->data, size);
 | 
						|
    if (ret < 0) {
 | 
						|
        av_free_packet(pkt);
 | 
						|
        return ret;
 | 
						|
    }
 | 
						|
    av_shrink_packet(pkt, ret);
 | 
						|
    return ret;
 | 
						|
}
 | 
						|
 | 
						|
int ff_raw_audio_read_header(AVFormatContext *s)
 | 
						|
{
 | 
						|
    AVStream *st = avformat_new_stream(s, NULL);
 | 
						|
    if (!st)
 | 
						|
        return AVERROR(ENOMEM);
 | 
						|
    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
 | 
						|
    st->codec->codec_id = s->iformat->raw_codec_id;
 | 
						|
    st->need_parsing = AVSTREAM_PARSE_FULL_RAW;
 | 
						|
    st->start_time = 0;
 | 
						|
    /* the parameters will be extracted from the compressed bitstream */
 | 
						|
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
/* MPEG-1/H.263 input */
 | 
						|
int ff_raw_video_read_header(AVFormatContext *s)
 | 
						|
{
 | 
						|
    AVStream *st;
 | 
						|
    FFRawVideoDemuxerContext *s1 = s->priv_data;
 | 
						|
    AVRational framerate;
 | 
						|
    int ret = 0;
 | 
						|
 | 
						|
 | 
						|
    st = avformat_new_stream(s, NULL);
 | 
						|
    if (!st) {
 | 
						|
        ret = AVERROR(ENOMEM);
 | 
						|
        goto fail;
 | 
						|
    }
 | 
						|
 | 
						|
    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
 | 
						|
    st->codec->codec_id = s->iformat->raw_codec_id;
 | 
						|
    st->need_parsing = AVSTREAM_PARSE_FULL_RAW;
 | 
						|
 | 
						|
    if ((ret = av_parse_video_rate(&framerate, s1->framerate)) < 0) {
 | 
						|
        av_log(s, AV_LOG_ERROR, "Could not parse framerate: %s.\n", s1->framerate);
 | 
						|
        goto fail;
 | 
						|
    }
 | 
						|
 | 
						|
    st->codec->time_base = av_inv_q(framerate);
 | 
						|
    avpriv_set_pts_info(st, 64, 1, 1200000);
 | 
						|
 | 
						|
fail:
 | 
						|
    return ret;
 | 
						|
}
 | 
						|
 | 
						|
/* Note: Do not forget to add new entries to the Makefile as well. */
 | 
						|
 | 
						|
#define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
 | 
						|
#define DEC AV_OPT_FLAG_DECODING_PARAM
 | 
						|
const AVOption ff_rawvideo_options[] = {
 | 
						|
    { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, DEC},
 | 
						|
    { NULL },
 | 
						|
};
 | 
						|
 | 
						|
#if CONFIG_LATM_DEMUXER
 | 
						|
AVInputFormat ff_latm_demuxer = {
 | 
						|
    .name           = "latm",
 | 
						|
    .long_name      = NULL_IF_CONFIG_SMALL("raw LOAS/LATM"),
 | 
						|
    .read_header    = ff_raw_audio_read_header,
 | 
						|
    .read_packet    = ff_raw_read_partial_packet,
 | 
						|
    .flags          = AVFMT_GENERIC_INDEX,
 | 
						|
    .extensions     = "latm",
 | 
						|
    .raw_codec_id   = AV_CODEC_ID_AAC_LATM,
 | 
						|
};
 | 
						|
#endif
 | 
						|
 | 
						|
#if CONFIG_MJPEG_DEMUXER
 | 
						|
FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", NULL, "mjpg,mjpeg,mpo", AV_CODEC_ID_MJPEG)
 | 
						|
#endif
 | 
						|
 | 
						|
#if CONFIG_MLP_DEMUXER
 | 
						|
AVInputFormat ff_mlp_demuxer = {
 | 
						|
    .name           = "mlp",
 | 
						|
    .long_name      = NULL_IF_CONFIG_SMALL("raw MLP"),
 | 
						|
    .read_header    = ff_raw_audio_read_header,
 | 
						|
    .read_packet    = ff_raw_read_partial_packet,
 | 
						|
    .flags          = AVFMT_GENERIC_INDEX,
 | 
						|
    .extensions     = "mlp",
 | 
						|
    .raw_codec_id   = AV_CODEC_ID_MLP,
 | 
						|
};
 | 
						|
#endif
 | 
						|
 | 
						|
#if CONFIG_TRUEHD_DEMUXER
 | 
						|
AVInputFormat ff_truehd_demuxer = {
 | 
						|
    .name           = "truehd",
 | 
						|
    .long_name      = NULL_IF_CONFIG_SMALL("raw TrueHD"),
 | 
						|
    .read_header    = ff_raw_audio_read_header,
 | 
						|
    .read_packet    = ff_raw_read_partial_packet,
 | 
						|
    .flags          = AVFMT_GENERIC_INDEX,
 | 
						|
    .extensions     = "thd",
 | 
						|
    .raw_codec_id   = AV_CODEC_ID_TRUEHD,
 | 
						|
};
 | 
						|
#endif
 | 
						|
 | 
						|
#if CONFIG_SHORTEN_DEMUXER
 | 
						|
AVInputFormat ff_shorten_demuxer = {
 | 
						|
    .name           = "shn",
 | 
						|
    .long_name      = NULL_IF_CONFIG_SMALL("raw Shorten"),
 | 
						|
    .read_header    = ff_raw_audio_read_header,
 | 
						|
    .read_packet    = ff_raw_read_partial_packet,
 | 
						|
    .flags          = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK,
 | 
						|
    .extensions     = "shn",
 | 
						|
    .raw_codec_id   = AV_CODEC_ID_SHORTEN,
 | 
						|
};
 | 
						|
#endif
 | 
						|
 | 
						|
#if CONFIG_VC1_DEMUXER
 | 
						|
FF_DEF_RAWVIDEO_DEMUXER(vc1, "raw VC-1", NULL, "vc1", AV_CODEC_ID_VC1)
 | 
						|
#endif
 |