*/
/**
- * @file psxstr.c
+ * @file libavformat/psxstr.c
* PSX STR file demuxer
* by Mike Melanson (melanson@pcisys.net)
* This module handles streams that have been ripped from Sony Playstation
* RIFF headers, followed by CD sectors.
*/
+#include "libavutil/intreadwrite.h"
#include "avformat.h"
-//#define PRINTSTUFF
-
#define RIFF_TAG MKTAG('R', 'I', 'F', 'F')
#define CDXA_TAG MKTAG('C', 'D', 'X', 'A')
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;
return 50;
}
-#if 0
-static void dump(unsigned char *buf,size_t len)
-{
- int i;
- for(i=0;i<len;i++) {
- if ((i&15)==0) av_log(NULL, AV_LOG_DEBUG, "%04x ",i);
- av_log(NULL, AV_LOG_DEBUG, "%02x ",buf[i]);
- if ((i&15)==15) av_log(NULL, AV_LOG_DEBUG, "\n");
- }
- av_log(NULL, AV_LOG_DEBUG, "\n");
-}
-#endif
-
static int str_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
ByteIOContext *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)
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);
-
-//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:
- /* 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;
}
unsigned char sector[RAW_CD_SECTOR_SIZE];
int channel;
AVPacket *pkt;
+ AVStream *st;
while (1) {
&& 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 = 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]);
}
-// 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->channels[channel].tmp_pkt;
break;
case CDXA_TYPE_AUDIO:
-#ifdef PRINTSTUFF
-printf (" dropping audio sector\n");
-#endif
-#if 1
- 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;
-#endif
+ if(str->channels[channel].audio_stream_index < 0){
+ int fmt = sector[0x13];
+ /* allocate a new AVStream */
+ st = av_new_stream(s, 0);
+ if (!st)
+ return AVERROR(ENOMEM);
+
+ str->channels[channel].audio_stream_index = st->index;
+
+ 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);
+ }
+ 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;
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;
}
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;
}
projects / frescor / ffmpeg.git / blobdiff