X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fpsxstr.c;h=e662ed788dcd80638050655b251798e59f63372f;hb=a28468d0daf4be14761c16a3ddd33266b2380123;hp=707674fd4a138ee1b850e9c34e5edc34fa3a4e66;hpb=d0b76b98c4fde9ae773cc50b6fe50563e448dade;p=ffmpeg diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index 707674fd4a1..e662ed788dc 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,7 +29,11 @@ * RIFF headers, followed by CD sectors. */ +#include "libavutil/channel_layout.h" +#include "libavutil/internal.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" +#include "internal.h" #define RIFF_TAG MKTAG('R', 'I', 'F', 'F') #define CDXA_TAG MKTAG('C', 'D', 'X', 'A') @@ -66,124 +70,58 @@ static const char sync_header[12] = {0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf 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; * only return half certainty */ - return 50; + return AVPROBE_SCORE_EXTENSION; } -static int str_read_header(AVFormatContext *s, - AVFormatParameters *ap) +static int str_read_header(AVFormatContext *s) { - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; StrDemuxContext *str = s->priv_data; - AVStream *st; unsigned char sector[RAW_CD_SECTOR_SIZE]; int start; int i; - int channel; /* 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); + avio_seek(pb, start, SEEK_SET); for(i=0; i<32; i++){ str->channels[i].video_stream_index= str->channels[i].audio_stream_index= -1; } - /* 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); - - channel = sector[0x11]; - if (channel >= 32) - return AVERROR_INVALIDDATA; - - switch (sector[0x12] & CDXA_TYPE_MASK) { - - case CDXA_TYPE_DATA: - case CDXA_TYPE_VIDEO: - /* qualify the magic number */ - if (AV_RL32(§or[0x18]) != STR_MAGIC) - break; - if(str->channels[channel].video_stream_index != -1) - break; - - /* allocate a new AVStream */ - st = av_new_stream(s, 0); - if (!st) - return AVERROR(ENOMEM); - av_set_pts_info(st, 64, 1, 15); - - 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: - { - int fmt; - - if(str->channels[channel].audio_stream_index != -1) - break; - - /* 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; - } - } - - /* back to the start */ - url_fseek(pb, start, SEEK_SET); + s->ctx_flags |= AVFMTCTX_NOHEADER; return 0; } @@ -191,15 +129,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]; @@ -220,7 +159,23 @@ 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 = AV_CODEC_ID_MDEC; + st->codec->codec_tag = 0; /* no fourcc */ + st->codec->width = AV_RL16(§or[0x28]); + st->codec->height = AV_RL16(§or[0x2A]); } /* if this is the first sector of the frame, allocate a pkt */ @@ -233,7 +188,7 @@ 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; } @@ -247,6 +202,12 @@ static int str_read_packet(AVFormatContext *s, *ret_pkt = *pkt; pkt->data= NULL; pkt->size= -1; + pkt->buf = NULL; +#if FF_API_DESTRUCT_PACKET +FF_DISABLE_DEPRECATION_WARNINGS + pkt->destruct = NULL; +FF_ENABLE_DEPRECATION_WARNINGS +#endif return 0; } @@ -254,21 +215,49 @@ static int str_read_packet(AVFormatContext *s, break; case CDXA_TYPE_AUDIO: - 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; - break; + 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 = AV_CODEC_ID_ADPCM_XA; + st->codec->codec_tag = 0; /* no fourcc */ + if (fmt & 1) { + st->codec->channels = 2; + st->codec->channel_layout = AV_CH_LAYOUT_STEREO; + } else { + st->codec->channels = 1; + st->codec->channel_layout = AV_CH_LAYOUT_MONO; + } + 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, 18 * 224 / st->codec->channels, + st->codec->sample_rate); + st->start_time = 0; + } + 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->duration = 1; + return 0; default: + av_log(s, AV_LOG_WARNING, "Unknown sector type %02X\n", sector[0x12]); /* drop the sector and move on */ break; } - if (url_feof(pb)) + if (pb->eof_reached) return AVERROR(EIO); } } @@ -276,16 +265,22 @@ static int str_read_packet(AVFormatContext *s, 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"), + .priv_data_size = sizeof(StrDemuxContext), + .read_probe = str_probe, + .read_header = str_read_header, + .read_packet = str_read_packet, + .read_close = str_read_close, + .flags = AVFMT_NO_BYTE_SEEK, };