X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fidroq.c;h=b8ee176ab9cbe851c7384176a0ca74aafe14cd3f;hb=3d18b282e0ecf21b02f3210446f6081b40fc4074;hp=d87cfb30808aa295fe5e4c451386735e1442c5f6;hpb=bc874daea8273e2471f5a6f914cdc9cf97371a1c;p=ffmpeg diff --git a/libavformat/idroq.c b/libavformat/idroq.c index d87cfb30808..b8ee176ab9c 100644 --- a/libavformat/idroq.c +++ b/libavformat/idroq.c @@ -2,19 +2,21 @@ * Id RoQ (.roq) File Demuxer * Copyright (c) 2003 The ffmpeg Project * - * This library is free software; you can redistribute it and/or + * 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * 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 this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** @@ -27,12 +29,6 @@ #include "avformat.h" -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ - (((uint8_t*)(x))[2] << 16) | \ - (((uint8_t*)(x))[1] << 8) | \ - ((uint8_t*)(x))[0]) - #define RoQ_MAGIC_NUMBER 0x1084 #define RoQ_CHUNK_PREAMBLE_SIZE 8 #define RoQ_AUDIO_SAMPLE_RATE 22050 @@ -65,8 +61,8 @@ static int roq_probe(AVProbeData *p) if (p->buf_size < 6) return 0; - if ((LE_16(&p->buf[0]) != RoQ_MAGIC_NUMBER) || - (LE_32(&p->buf[2]) != 0xFFFFFFFF)) + if ((AV_RL16(&p->buf[0]) != RoQ_MAGIC_NUMBER) || + (AV_RL32(&p->buf[2]) != 0xFFFFFFFF)) return 0; return AVPROBE_SCORE_MAX; @@ -84,38 +80,34 @@ static int roq_read_header(AVFormatContext *s, unsigned int chunk_type; /* get the main header */ - if (get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) != + if (get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) != RoQ_CHUNK_PREAMBLE_SIZE) return AVERROR_IO; - roq->framerate = LE_16(&preamble[6]); + roq->framerate = AV_RL16(&preamble[6]); roq->frame_pts_inc = 90000 / roq->framerate; - /* set the pts reference (1 pts = 1/90000) */ - s->pts_num = 1; - s->pts_den = 90000; - /* init private context parameters */ - roq->width = roq->height = roq->audio_channels = roq->video_pts = + roq->width = roq->height = roq->audio_channels = roq->video_pts = roq->audio_frame_count = 0; /* scan the first n chunks searching for A/V parameters */ for (i = 0; i < RoQ_CHUNKS_TO_SCAN; i++) { - if (get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) != + if (get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) != RoQ_CHUNK_PREAMBLE_SIZE) return AVERROR_IO; - chunk_type = LE_16(&preamble[0]); - chunk_size = LE_32(&preamble[2]); + chunk_type = AV_RL16(&preamble[0]); + chunk_size = AV_RL32(&preamble[2]); switch (chunk_type) { case RoQ_INFO: /* fetch the width and height; reuse the preamble bytes */ - if (get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) != + if (get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) != RoQ_CHUNK_PREAMBLE_SIZE) return AVERROR_IO; - roq->width = LE_16(&preamble[0]); - roq->height = LE_16(&preamble[2]); + roq->width = AV_RL16(&preamble[0]); + roq->height = AV_RL16(&preamble[2]); break; case RoQ_QUAD_CODEBOOK: @@ -135,7 +127,7 @@ static int roq_read_header(AVFormatContext *s, break; default: - av_log(s, AV_LOG_ERROR, " unknown RoQ chunk type (%04X)\n", LE_16(&preamble[0])); + av_log(s, AV_LOG_ERROR, " unknown RoQ chunk type (%04X)\n", AV_RL16(&preamble[0])); return AVERROR_INVALIDDATA; break; } @@ -152,27 +144,30 @@ static int roq_read_header(AVFormatContext *s, st = av_new_stream(s, 0); if (!st) return AVERROR_NOMEM; + /* set the pts reference (1 pts = 1/90000) */ + av_set_pts_info(st, 33, 1, 90000); roq->video_stream_index = st->index; - st->codec.codec_type = CODEC_TYPE_VIDEO; - st->codec.codec_id = CODEC_ID_ROQ; - st->codec.codec_tag = 0; /* no fourcc */ - st->codec.width = roq->width; - st->codec.height = roq->height; + st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_id = CODEC_ID_ROQ; + st->codec->codec_tag = 0; /* no fourcc */ + st->codec->width = roq->width; + st->codec->height = roq->height; if (roq->audio_channels) { st = av_new_stream(s, 0); if (!st) return AVERROR_NOMEM; + av_set_pts_info(st, 33, 1, 90000); roq->audio_stream_index = st->index; - st->codec.codec_type = CODEC_TYPE_AUDIO; - st->codec.codec_id = CODEC_ID_ROQ_DPCM; - st->codec.codec_tag = 0; /* no tag */ - st->codec.channels = roq->audio_channels; - st->codec.sample_rate = RoQ_AUDIO_SAMPLE_RATE; - st->codec.bits_per_sample = 16; - st->codec.bit_rate = st->codec.channels * st->codec.sample_rate * - st->codec.bits_per_sample; - st->codec.block_align = st->codec.channels * st->codec.bits_per_sample; + st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_id = CODEC_ID_ROQ_DPCM; + st->codec->codec_tag = 0; /* no tag */ + st->codec->channels = roq->audio_channels; + st->codec->sample_rate = RoQ_AUDIO_SAMPLE_RATE; + st->codec->bits_per_sample = 16; + st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * + st->codec->bits_per_sample; + st->codec->block_align = st->codec->channels * st->codec->bits_per_sample; } return 0; @@ -194,15 +189,17 @@ static int roq_read_packet(AVFormatContext *s, while (!packet_read) { if (url_feof(&s->pb)) - return -EIO; + return AVERROR_IO; /* get the next chunk preamble */ - if ((ret = get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE)) != + if ((ret = get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE)) != RoQ_CHUNK_PREAMBLE_SIZE) - return -EIO; + return AVERROR_IO; - chunk_type = LE_16(&preamble[0]); - chunk_size = LE_32(&preamble[2]); + chunk_type = AV_RL16(&preamble[0]); + chunk_size = AV_RL32(&preamble[2]); + if(chunk_size > INT_MAX) + return AVERROR_INVALIDDATA; switch (chunk_type) { @@ -216,23 +213,21 @@ static int roq_read_packet(AVFormatContext *s, codebook_offset = url_ftell(pb) - RoQ_CHUNK_PREAMBLE_SIZE; codebook_size = chunk_size; url_fseek(pb, codebook_size, SEEK_CUR); - if (get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) != + if (get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) != RoQ_CHUNK_PREAMBLE_SIZE) - return -EIO; - chunk_size = LE_32(&preamble[2]) + RoQ_CHUNK_PREAMBLE_SIZE * 2 + + return AVERROR_IO; + chunk_size = AV_RL32(&preamble[2]) + RoQ_CHUNK_PREAMBLE_SIZE * 2 + codebook_size; /* rewind */ url_fseek(pb, codebook_offset, SEEK_SET); /* load up the packet */ - if (av_new_packet(pkt, chunk_size)) - return -EIO; + ret= av_get_packet(pb, pkt, chunk_size); + if (ret != chunk_size) + return AVERROR_IO; pkt->stream_index = roq->video_stream_index; pkt->pts = roq->video_pts; - ret = get_buffer(pb, pkt->data, chunk_size); - if (ret != chunk_size) - ret = -EIO; roq->video_pts += roq->frame_pts_inc; packet_read = 1; @@ -243,7 +238,7 @@ static int roq_read_packet(AVFormatContext *s, case RoQ_QUAD_VQ: /* load up the packet */ if (av_new_packet(pkt, chunk_size + RoQ_CHUNK_PREAMBLE_SIZE)) - return -EIO; + return AVERROR_IO; /* copy over preamble */ memcpy(pkt->data, preamble, RoQ_CHUNK_PREAMBLE_SIZE); @@ -259,10 +254,11 @@ static int roq_read_packet(AVFormatContext *s, roq->audio_frame_count += (chunk_size / roq->audio_channels); } + pkt->pos= url_ftell(pb); ret = get_buffer(pb, pkt->data + RoQ_CHUNK_PREAMBLE_SIZE, chunk_size); if (ret != chunk_size) - ret = -EIO; + ret = AVERROR_IO; packet_read = 1; break; @@ -284,7 +280,7 @@ static int roq_read_close(AVFormatContext *s) return 0; } -static AVInputFormat roq_iformat = { +AVInputFormat roq_demuxer = { "RoQ", "Id RoQ format", sizeof(RoqDemuxContext), @@ -293,9 +289,3 @@ static AVInputFormat roq_iformat = { roq_read_packet, roq_read_close, }; - -int roq_init(void) -{ - av_register_input_format(&roq_iformat); - return 0; -}