X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fpsxstr.c;h=d22de0887f921cfd014c52145bb3c9a5cf3af2af;hb=b89f8774f2778c5aad4633a98e3a12597344730a;hp=d24cd06c588ef2ca8778601520a636097a056dec;hpb=c1f6eca124815fcaaf989ea3d01d6184d6b49ac4;p=ffmpeg diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index d24cd06c588..d22de0887f9 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -2,25 +2,25 @@ * Sony Playstation (PSX) STR File Demuxer * Copyright (c) 2003 The ffmpeg Project * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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, + * Libav 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 + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file psxstr.c + * @file * PSX STR file demuxer * by Mike Melanson (melanson@pcisys.net) * This module handles streams that have been ripped from Sony Playstation @@ -29,18 +29,18 @@ * RIFF headers, followed by CD sectors. */ +#include "libavutil/intreadwrite.h" #include "avformat.h" - -//#define PRINTSTUFF +#include "internal.h" #define RIFF_TAG MKTAG('R', 'I', 'F', 'F') #define CDXA_TAG MKTAG('C', 'D', 'X', 'A') -#define RAW_CD_SECTOR_SIZE 2352 +#define RAW_CD_SECTOR_SIZE 2352 #define RAW_CD_SECTOR_DATA_SIZE 2304 -#define VIDEO_DATA_CHUNK_SIZE 0x7E0 -#define VIDEO_DATA_HEADER_SIZE 0x38 -#define RIFF_HEADER_SIZE 0x2C +#define VIDEO_DATA_CHUNK_SIZE 0x7E0 +#define VIDEO_DATA_HEADER_SIZE 0x38 +#define RIFF_HEADER_SIZE 0x2C #define CDXA_TYPE_MASK 0x0E #define CDXA_TYPE_DATA 0x08 @@ -52,6 +52,7 @@ typedef struct StrChannel { /* video parameters */ int video_stream_index; + AVPacket tmp_pkt; /* audio parameters */ int audio_stream_index; @@ -61,36 +62,33 @@ typedef struct StrDemuxContext { /* a STR file can contain up to 32 channels of data */ StrChannel channels[32]; - - /* only decode the first audio and video channels encountered */ - int video_channel; - int audio_channel; - - int64_t pts; - - AVPacket tmp_pkt; } StrDemuxContext; static const char sync_header[12] = {0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00}; static int str_probe(AVProbeData *p) { - int start; + uint8_t *sector= p->buf; - /* need at least 0x38 bytes to validate */ - if (p->buf_size < 0x38) + if (p->buf_size < RAW_CD_SECTOR_SIZE) return 0; if ((AV_RL32(&p->buf[0]) == RIFF_TAG) && (AV_RL32(&p->buf[8]) == CDXA_TAG)) { /* RIFF header seen; skip 0x2C bytes */ - start = RIFF_HEADER_SIZE; - } else - start = 0; + sector += RIFF_HEADER_SIZE; + } /* look for CD sync header (00, 0xFF x 10, 00) */ - if (memcmp(p->buf+start,sync_header,sizeof(sync_header))) + if (memcmp(sector,sync_header,sizeof(sync_header))) + return 0; + + if(sector[0x11] >= 32) + return 0; + if( (sector[0x12] & CDXA_TYPE_MASK) != CDXA_TYPE_VIDEO + && (sector[0x12] & CDXA_TYPE_MASK) != CDXA_TYPE_AUDIO + && (sector[0x12] & CDXA_TYPE_MASK) != CDXA_TYPE_DATA) return 0; /* MPEG files (like those ripped from VCDs) can also look like this; @@ -98,118 +96,31 @@ static int str_probe(AVProbeData *p) return 50; } -#if 0 -static void dump(unsigned char *buf,size_t len) -{ - int i; - for(i=0;ipb; + AVIOContext *pb = s->pb; StrDemuxContext *str = s->priv_data; - AVStream *st; unsigned char sector[RAW_CD_SECTOR_SIZE]; int start; int i; - int channel; - - /* initialize context members */ - str->pts = 0; - str->audio_channel = -1; /* assume to audio or video */ - str->video_channel = -1; - /* skip over any RIFF header */ - if (get_buffer(pb, sector, RIFF_HEADER_SIZE) != RIFF_HEADER_SIZE) + if (avio_read(pb, sector, RIFF_HEADER_SIZE) != RIFF_HEADER_SIZE) return AVERROR(EIO); if (AV_RL32(§or[0]) == RIFF_TAG) start = RIFF_HEADER_SIZE; else start = 0; - url_fseek(pb, start, SEEK_SET); - - /* check through the first 32 sectors for individual channels */ - for (i = 0; i < 32; i++) { - if (get_buffer(pb, sector, RAW_CD_SECTOR_SIZE) != RAW_CD_SECTOR_SIZE) - return AVERROR(EIO); - -//printf("%02x %02x %02x %02x\n",sector[0x10],sector[0x11],sector[0x12],sector[0x13]); - - channel = sector[0x11]; - if (channel >= 32) - return AVERROR_INVALIDDATA; - - switch (sector[0x12] & CDXA_TYPE_MASK) { - - case CDXA_TYPE_DATA: - case CDXA_TYPE_VIDEO: - /* check if this channel gets to be the dominant video channel */ - if (str->video_channel == -1) { - /* qualify the magic number */ - if (AV_RL32(§or[0x18]) != STR_MAGIC) - break; - str->video_channel = channel; - - /* allocate a new AVStream */ - st = av_new_stream(s, 0); - if (!st) - return AVERROR(ENOMEM); - av_set_pts_info(st, 64, 1, 15); + avio_seek(pb, start, SEEK_SET); - str->channels[channel].video_stream_index = st->index; - - st->codec->codec_type = CODEC_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_MDEC; - st->codec->codec_tag = 0; /* no fourcc */ - st->codec->width = AV_RL16(§or[0x28]); - st->codec->height = AV_RL16(§or[0x2A]); - } - break; - - case CDXA_TYPE_AUDIO: - /* check if this channel gets to be the dominant audio channel */ - if (str->audio_channel == -1) { - int fmt; - str->audio_channel = channel; - - /* allocate a new AVStream */ - st = av_new_stream(s, 0); - if (!st) - return AVERROR(ENOMEM); - - str->channels[channel].audio_stream_index = st->index; - - fmt = sector[0x13]; - st->codec->codec_type = CODEC_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_ADPCM_XA; - st->codec->codec_tag = 0; /* no fourcc */ - st->codec->channels = (fmt&1)?2:1; - st->codec->sample_rate = (fmt&4)?18900:37800; - // st->codec->bit_rate = 0; //FIXME; - st->codec->block_align = 128; - - av_set_pts_info(st, 64, 128, st->codec->sample_rate); - } - break; - - default: - /* ignore */ - break; - } + for(i=0; i<32; i++){ + str->channels[i].video_stream_index= + str->channels[i].audio_stream_index= -1; } - /* back to the start */ - url_fseek(pb, start, SEEK_SET); + s->ctx_flags |= AVFMTCTX_NOHEADER; return 0; } @@ -217,15 +128,16 @@ static int str_read_header(AVFormatContext *s, static int str_read_packet(AVFormatContext *s, AVPacket *ret_pkt) { - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; StrDemuxContext *str = s->priv_data; unsigned char sector[RAW_CD_SECTOR_SIZE]; int channel; AVPacket *pkt; + AVStream *st; while (1) { - if (get_buffer(pb, sector, RAW_CD_SECTOR_SIZE) != RAW_CD_SECTOR_SIZE) + if (avio_read(pb, sector, RAW_CD_SECTOR_SIZE) != RAW_CD_SECTOR_SIZE) return AVERROR(EIO); channel = sector[0x11]; @@ -236,8 +148,7 @@ static int str_read_packet(AVFormatContext *s, case CDXA_TYPE_DATA: case CDXA_TYPE_VIDEO: - /* check if this the video channel we care about */ - if (channel == str->video_channel) { + { int current_sector = AV_RL16(§or[0x1C]); int sector_count = AV_RL16(§or[0x1E]); @@ -247,12 +158,27 @@ static int str_read_packet(AVFormatContext *s, && current_sector < sector_count && sector_count*VIDEO_DATA_CHUNK_SIZE >=frame_size)){ av_log(s, AV_LOG_ERROR, "Invalid parameters %d %d %d\n", current_sector, sector_count, frame_size); - return AVERROR_INVALIDDATA; + break; + } + + if(str->channels[channel].video_stream_index < 0){ + /* allocate a new AVStream */ + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + avpriv_set_pts_info(st, 64, 1, 15); + + str->channels[channel].video_stream_index = st->index; + + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + st->codec->codec_id = CODEC_ID_MDEC; + st->codec->codec_tag = 0; /* no fourcc */ + st->codec->width = AV_RL16(§or[0x28]); + st->codec->height = AV_RL16(§or[0x2A]); } -// printf("%d %d %d\n",current_sector,sector_count,frame_size); /* if this is the first sector of the frame, allocate a pkt */ - pkt = &str->tmp_pkt; + pkt = &str->channels[channel].tmp_pkt; if(pkt->size != sector_count*VIDEO_DATA_CHUNK_SIZE){ if(pkt->data) @@ -261,15 +187,9 @@ static int str_read_packet(AVFormatContext *s, if (av_new_packet(pkt, sector_count*VIDEO_DATA_CHUNK_SIZE)) return AVERROR(EIO); - pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE; + pkt->pos= avio_tell(pb) - RAW_CD_SECTOR_SIZE; pkt->stream_index = str->channels[channel].video_stream_index; - // pkt->pts = str->pts; - - /* if there is no audio, adjust the pts after every video - * frame; assume 15 fps */ - if (str->audio_channel != -1) - str->pts += (90000 / 15); } memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE, @@ -288,33 +208,40 @@ static int str_read_packet(AVFormatContext *s, break; case CDXA_TYPE_AUDIO: -#ifdef PRINTSTUFF -printf (" dropping audio sector\n"); -#endif -#if 1 - /* check if this the video channel we care about */ - if (channel == str->audio_channel) { - pkt = ret_pkt; - if (av_new_packet(pkt, 2304)) - return AVERROR(EIO); - memcpy(pkt->data,sector+24,2304); - - pkt->stream_index = - str->channels[channel].audio_stream_index; - //pkt->pts = str->pts; - return 0; + if(str->channels[channel].audio_stream_index < 0){ + int fmt = sector[0x13]; + /* allocate a new AVStream */ + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + str->channels[channel].audio_stream_index = st->index; + + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_id = CODEC_ID_ADPCM_XA; + st->codec->codec_tag = 0; /* no fourcc */ + st->codec->channels = (fmt&1)?2:1; + st->codec->sample_rate = (fmt&4)?18900:37800; + // st->codec->bit_rate = 0; //FIXME; + st->codec->block_align = 128; + + avpriv_set_pts_info(st, 64, 128, st->codec->sample_rate); } -#endif - break; + pkt = ret_pkt; + if (av_new_packet(pkt, 2304)) + return AVERROR(EIO); + memcpy(pkt->data,sector+24,2304); + + pkt->stream_index = + str->channels[channel].audio_stream_index; + return 0; default: + av_log(s, AV_LOG_WARNING, "Unknown sector type %02X\n", sector[0x12]); /* drop the sector and move on */ -#ifdef PRINTSTUFF -printf (" dropping other sector\n"); -#endif break; } - if (url_feof(pb)) + if (pb->eof_reached) return AVERROR(EIO); } } @@ -322,16 +249,21 @@ printf (" dropping other sector\n"); static int str_read_close(AVFormatContext *s) { StrDemuxContext *str = s->priv_data; + int i; + for(i=0; i<32; i++){ + if(str->channels[i].tmp_pkt.data) + av_free_packet(&str->channels[i].tmp_pkt); + } return 0; } -AVInputFormat str_demuxer = { - "psxstr", - NULL_IF_CONFIG_SMALL("Sony Playstation STR format"), - sizeof(StrDemuxContext), - str_probe, - str_read_header, - str_read_packet, - str_read_close, +AVInputFormat ff_str_demuxer = { + .name = "psxstr", + .long_name = NULL_IF_CONFIG_SMALL("Sony Playstation STR format"), + .priv_data_size = sizeof(StrDemuxContext), + .read_probe = str_probe, + .read_header = str_read_header, + .read_packet = str_read_packet, + .read_close = str_read_close, };