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;
&& 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){
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;
+ 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 */
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;
}