X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2F4xm.c;h=bf2d7384b5273c8ef37fa946a7076030e096096c;hb=13ff92d19706d17f876ff676591dace0b3e34794;hp=b45fd05b1d2b0acf7427c27b0e61d33ad9d2c82e;hpb=5a634a69521ce53b1e6535ab0de5c1608b8060a8;p=ffmpeg diff --git a/libavformat/4xm.c b/libavformat/4xm.c index b45fd05b1d2..bf2d7384b52 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -2,116 +2,108 @@ * 4X Technologies .4xm File Demuxer (no muxer) * 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 */ /** - * @file 4xm.c + * @file * 4X Technologies file demuxer * by Mike Melanson (melanson@pcisys.net) * for more information on the .4xm file format, visit: * http://www.pcisys.net/~melanson/codecs/ */ +#include "libavutil/intreadwrite.h" #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 BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) -#define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ - (((uint8_t*)(x))[1] << 16) | \ - (((uint8_t*)(x))[2] << 8) | \ - ((uint8_t*)(x))[3]) - -#define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ - ( (long)(unsigned char)(ch3) | \ - ( (long)(unsigned char)(ch2) << 8 ) | \ - ( (long)(unsigned char)(ch1) << 16 ) | \ - ( (long)(unsigned char)(ch0) << 24 ) ) - -#define RIFF_TAG FOURCC_TAG('R', 'I', 'F', 'F') -#define _4XMV_TAG FOURCC_TAG('4', 'X', 'M', 'V') -#define LIST_TAG FOURCC_TAG('L', 'I', 'S', 'T') -#define HEAD_TAG FOURCC_TAG('H', 'E', 'A', 'D') -#define TRK__TAG FOURCC_TAG('T', 'R', 'K', '_') -#define MOVI_TAG FOURCC_TAG('M', 'O', 'V', 'I') -#define VTRK_TAG FOURCC_TAG('V', 'T', 'R', 'K') -#define STRK_TAG FOURCC_TAG('S', 'T', 'R', 'K') -#define name_TAG FOURCC_TAG('n', 'a', 'm', 'e') -#define vtrk_TAG FOURCC_TAG('v', 't', 'r', 'k') -#define strk_TAG FOURCC_TAG('s', 't', 'r', 'k') -#define ifrm_TAG FOURCC_TAG('i', 'f', 'r', 'm') -#define pfrm_TAG FOURCC_TAG('p', 'f', 'r', 'm') -#define cfrm_TAG FOURCC_TAG('c', 'f', 'r', 'm') -#define snd__TAG FOURCC_TAG('s', 'n', 'd', '_') -#define _TAG FOURCC_TAG('', '', '', '') +#define RIFF_TAG MKTAG('R', 'I', 'F', 'F') +#define FOURXMV_TAG MKTAG('4', 'X', 'M', 'V') +#define LIST_TAG MKTAG('L', 'I', 'S', 'T') +#define HEAD_TAG MKTAG('H', 'E', 'A', 'D') +#define TRK__TAG MKTAG('T', 'R', 'K', '_') +#define MOVI_TAG MKTAG('M', 'O', 'V', 'I') +#define VTRK_TAG MKTAG('V', 'T', 'R', 'K') +#define STRK_TAG MKTAG('S', 'T', 'R', 'K') +#define std__TAG MKTAG('s', 't', 'd', '_') +#define name_TAG MKTAG('n', 'a', 'm', 'e') +#define vtrk_TAG MKTAG('v', 't', 'r', 'k') +#define strk_TAG MKTAG('s', 't', 'r', 'k') +#define ifrm_TAG MKTAG('i', 'f', 'r', 'm') +#define pfrm_TAG MKTAG('p', 'f', 'r', 'm') +#define cfrm_TAG MKTAG('c', 'f', 'r', 'm') +#define ifr2_TAG MKTAG('i', 'f', 'r', '2') +#define pfr2_TAG MKTAG('p', 'f', 'r', '2') +#define cfr2_TAG MKTAG('c', 'f', 'r', '2') +#define snd__TAG MKTAG('s', 'n', 'd', '_') #define vtrk_SIZE 0x44 #define strk_SIZE 0x28 #define GET_LIST_HEADER() \ - fourcc_tag = get_be32(pb); \ - size = get_le32(pb); \ + fourcc_tag = avio_rl32(pb); \ + size = avio_rl32(pb); \ if (fourcc_tag != LIST_TAG) \ return AVERROR_INVALIDDATA; \ - fourcc_tag = get_be32(pb); + fourcc_tag = avio_rl32(pb); typedef struct AudioTrack { int sample_rate; int bits; int channels; + int stream_index; + int adpcm; + int64_t audio_pts; } AudioTrack; typedef struct FourxmDemuxContext { int width; int height; + int video_stream_index; int track_count; AudioTrack *tracks; - int selected_track; + + int64_t video_pts; + float fps; } FourxmDemuxContext; static int fourxm_probe(AVProbeData *p) { - if ((BE_32(&p->buf[0]) != RIFF_TAG) || - (BE_32(&p->buf[8]) != _4XMV_TAG)) + if ((AV_RL32(&p->buf[0]) != RIFF_TAG) || + (AV_RL32(&p->buf[8]) != FOURXMV_TAG)) return 0; -printf (" detected .4xm file\n"); - return AVPROBE_SCORE_MAX; } static int fourxm_read_header(AVFormatContext *s, - AVFormatParameters *ap) + AVFormatParameters *ap) { - ByteIOContext *pb = &s->pb; + AVIOContext *pb = s->pb; unsigned int fourcc_tag; unsigned int size; int header_size; - FourxmDemuxContext *fourxm = (FourxmDemuxContext *)s->priv_data; + FourxmDemuxContext *fourxm = s->priv_data; unsigned char *header; - int i; - int current_track = -1; + int i, ret; AVStream *st; fourxm->track_count = 0; fourxm->tracks = NULL; - fourxm->selected_track = 0; + fourxm->fps = 1.0; /* skip the first 3 32-bit numbers */ url_fseek(pb, 12, SEEK_CUR); @@ -119,141 +111,217 @@ static int fourxm_read_header(AVFormatContext *s, /* check for LIST-HEAD */ GET_LIST_HEADER(); header_size = size - 4; - if (fourcc_tag != HEAD_TAG) + if (fourcc_tag != HEAD_TAG || header_size < 0) return AVERROR_INVALIDDATA; /* allocate space for the header and load the whole thing */ header = av_malloc(header_size); if (!header) - return AVERROR_NOMEM; - if (get_buffer(pb, header, header_size) != header_size) - return AVERROR_IO; + return AVERROR(ENOMEM); + if (avio_read(pb, header, header_size) != header_size){ + av_free(header); + return AVERROR(EIO); + } /* take the lazy approach and search for any and all vtrk and strk chunks */ for (i = 0; i < header_size - 8; i++) { - fourcc_tag = BE_32(&header[i]); - size = LE_32(&header[i + 4]); + fourcc_tag = AV_RL32(&header[i]); + size = AV_RL32(&header[i + 4]); - if (fourcc_tag == vtrk_TAG) { + if (fourcc_tag == std__TAG) { + fourxm->fps = av_int2flt(AV_RL32(&header[i + 12])); + } else if (fourcc_tag == vtrk_TAG) { /* check that there is enough data */ if (size != vtrk_SIZE) { - av_free(header); - return AVERROR_INVALIDDATA; + ret= AVERROR_INVALIDDATA; + goto fail; + } + fourxm->width = AV_RL32(&header[i + 36]); + fourxm->height = AV_RL32(&header[i + 40]); + + /* allocate a new AVStream */ + st = av_new_stream(s, 0); + if (!st){ + ret= AVERROR(ENOMEM); + goto fail; } - fourxm->width = LE_32(&header[i + 36]); - fourxm->height = LE_32(&header[i + 40]); + av_set_pts_info(st, 60, 1, fourxm->fps); + + fourxm->video_stream_index = st->index; + + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + st->codec->codec_id = CODEC_ID_4XM; + st->codec->extradata_size = 4; + st->codec->extradata = av_malloc(4); + AV_WL32(st->codec->extradata, AV_RL32(&header[i + 16])); + st->codec->width = fourxm->width; + st->codec->height = fourxm->height; + i += 8 + size; } else if (fourcc_tag == strk_TAG) { + int current_track; /* check that there is enough data */ if (size != strk_SIZE) { - av_free(header); - return AVERROR_INVALIDDATA; + ret= AVERROR_INVALIDDATA; + goto fail; + } + current_track = AV_RL32(&header[i + 8]); + if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) - 1){ + av_log(s, AV_LOG_ERROR, "current_track too large\n"); + ret= -1; + goto fail; } - current_track = LE_32(&header[i + 8]); if (current_track + 1 > fourxm->track_count) { fourxm->track_count = current_track + 1; - fourxm->tracks = av_realloc(fourxm->tracks, + fourxm->tracks = av_realloc(fourxm->tracks, fourxm->track_count * sizeof(AudioTrack)); if (!fourxm->tracks) { - av_free(header); - return AVERROR_NOMEM; + ret= AVERROR(ENOMEM); + goto fail; } } - fourxm->tracks[current_track].channels = LE_32(&header[i + 36]); - fourxm->tracks[current_track].sample_rate = LE_32(&header[i + 40]); - fourxm->tracks[current_track].bits = LE_32(&header[i + 44]); + fourxm->tracks[current_track].adpcm = AV_RL32(&header[i + 12]); + fourxm->tracks[current_track].channels = AV_RL32(&header[i + 36]); + fourxm->tracks[current_track].sample_rate = AV_RL32(&header[i + 40]); + fourxm->tracks[current_track].bits = AV_RL32(&header[i + 44]); + fourxm->tracks[current_track].audio_pts = 0; + if( fourxm->tracks[current_track].channels <= 0 + || fourxm->tracks[current_track].sample_rate <= 0 + || fourxm->tracks[current_track].bits < 0){ + av_log(s, AV_LOG_ERROR, "audio header invalid\n"); + ret= -1; + goto fail; + } i += 8 + size; + + /* allocate a new AVStream */ + st = av_new_stream(s, current_track); + if (!st){ + ret= AVERROR(ENOMEM); + goto fail; + } + + av_set_pts_info(st, 60, 1, fourxm->tracks[current_track].sample_rate); + + fourxm->tracks[current_track].stream_index = st->index; + + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_tag = 0; + st->codec->channels = fourxm->tracks[current_track].channels; + st->codec->sample_rate = fourxm->tracks[current_track].sample_rate; + st->codec->bits_per_coded_sample = fourxm->tracks[current_track].bits; + st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * + st->codec->bits_per_coded_sample; + st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; + if (fourxm->tracks[current_track].adpcm){ + st->codec->codec_id = CODEC_ID_ADPCM_4XM; + }else if (st->codec->bits_per_coded_sample == 8){ + st->codec->codec_id = CODEC_ID_PCM_U8; + }else + st->codec->codec_id = CODEC_ID_PCM_S16LE; } } - av_free(header); - /* skip over the LIST-MOVI chunk (which is where the stream should be */ GET_LIST_HEADER(); - if (fourcc_tag != MOVI_TAG) - return AVERROR_INVALIDDATA; - - if (current_track > -1) { - st = av_new_stream(s, 0); - if (!st) - return AVERROR_NOMEM; - - st->codec.codec_type = CODEC_TYPE_AUDIO; - st->codec.codec_tag = 1; - st->codec.channels = fourxm->tracks[current_track].channels; - st->codec.sample_rate = fourxm->tracks[current_track].sample_rate; - st->codec.bits_per_sample = fourxm->tracks[current_track].bits; - 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; - if (st->codec.bits_per_sample == 8) - st->codec.codec_id = CODEC_ID_PCM_U8; - else - st->codec.codec_id = CODEC_ID_PCM_S16LE; + if (fourcc_tag != MOVI_TAG){ + ret= AVERROR_INVALIDDATA; + goto fail; } + av_free(header); + /* initialize context members */ + fourxm->video_pts = -1; /* first frame will push to 0 */ + return 0; +fail: + av_freep(&fourxm->tracks); + av_free(header); + return ret; } static int fourxm_read_packet(AVFormatContext *s, - AVPacket *pkt) + AVPacket *pkt) { FourxmDemuxContext *fourxm = s->priv_data; - ByteIOContext *pb = &s->pb; + AVIOContext *pb = s->pb; unsigned int fourcc_tag; - unsigned int size; + unsigned int size, out_size; int ret = 0; - int track_number; + unsigned int track_number; int packet_read = 0; + unsigned char header[8]; + int audio_frame_count; while (!packet_read) { - fourcc_tag = get_be32(pb); - size = get_le32(pb); - if (fourcc_tag == LIST_TAG) { - /* skip the LIST-FRAM tag and get the next fourcc */ - get_be32(pb); - fourcc_tag = get_be32(pb); - size = get_le32(pb); - } - + if ((ret = avio_read(s->pb, header, 8)) < 0) + return ret; + fourcc_tag = AV_RL32(&header[0]); + size = AV_RL32(&header[4]); if (url_feof(pb)) - return -EIO; - + return AVERROR(EIO); switch (fourcc_tag) { - case ifrm_TAG: -printf (" %cfrm chunk\n", (char)(fourcc_tag >> 24) & 0xFF); -url_fseek(pb, size, SEEK_CUR); + case LIST_TAG: + /* this is a good time to bump the video pts */ + fourxm->video_pts ++; + + /* skip the LIST-* tag and move on to the next fourcc */ + avio_rl32(pb); break; + + case ifrm_TAG: case pfrm_TAG: -printf (" %cfrm chunk\n", (char)(fourcc_tag >> 24) & 0xFF); -url_fseek(pb, size, SEEK_CUR); - break; - case cfrm_TAG:{ -int unknown= get_le32(pb); -int id= get_le32(pb); -int whole= get_le32(pb); -static int stats[1000]; -stats[id] += size - 12; -printf(" cfrm chunk id:%d size:%d whole:%d until now:%d\n", id, size, whole, stats[id]); -url_fseek(pb, size-12, SEEK_CUR); + case cfrm_TAG: + case ifr2_TAG: + case pfr2_TAG: + case cfr2_TAG: + /* allocate 8 more bytes than 'size' to account for fourcc + * and size */ + if (size + 8 < size || av_new_packet(pkt, size + 8)) + return AVERROR(EIO); + pkt->stream_index = fourxm->video_stream_index; + pkt->pts = fourxm->video_pts; + pkt->pos = url_ftell(s->pb); + memcpy(pkt->data, header, 8); + ret = avio_read(s->pb, &pkt->data[8], size); + + if (ret < 0){ + av_free_packet(pkt); + }else + packet_read = 1; break; - } + case snd__TAG: -printf (" snd_ chunk, "); - track_number = get_le32(pb); - size = get_le32(pb); - if (track_number == fourxm->selected_track) { -printf ("correct track, dispatching...\n"); - if (av_new_packet(pkt, size)) - return -EIO; - ret = get_buffer(&s->pb, pkt->data, size); - if (ret < 0) - av_free_packet(pkt); + track_number = avio_rl32(pb); + out_size= avio_rl32(pb); + size-=8; + + if (track_number < fourxm->track_count && fourxm->tracks[track_number].channels>0) { + ret= av_get_packet(s->pb, pkt, size); + if(ret<0) + return AVERROR(EIO); + pkt->stream_index = + fourxm->tracks[track_number].stream_index; + pkt->pts = fourxm->tracks[track_number].audio_pts; packet_read = 1; + + /* pts accounting */ + audio_frame_count = size; + if (fourxm->tracks[track_number].adpcm) + audio_frame_count -= + 2 * (fourxm->tracks[track_number].channels); + audio_frame_count /= + fourxm->tracks[track_number].channels; + if (fourxm->tracks[track_number].adpcm){ + audio_frame_count *= 2; + }else + audio_frame_count /= + (fourxm->tracks[track_number].bits / 8); + fourxm->tracks[track_number].audio_pts += audio_frame_count; + } else { -printf ("wrong track, skipping...\n"); url_fseek(pb, size, SEEK_CUR); } break; @@ -263,31 +331,24 @@ printf ("wrong track, skipping...\n"); break; } } - return ret; } static int fourxm_read_close(AVFormatContext *s) { - FourxmDemuxContext *fourxm = (FourxmDemuxContext *)s->priv_data; + FourxmDemuxContext *fourxm = s->priv_data; - av_free(fourxm->tracks); + av_freep(&fourxm->tracks); return 0; } -static AVInputFormat fourxm_iformat = { +AVInputFormat ff_fourxm_demuxer = { "4xm", - "4X Technologies format", + NULL_IF_CONFIG_SMALL("4X Technologies format"), sizeof(FourxmDemuxContext), fourxm_probe, fourxm_read_header, fourxm_read_packet, fourxm_read_close, }; - -int fourxm_init(void) -{ - av_register_input_format(&fourxm_iformat); - return 0; -}