/*
* Sony Playstation (PSX) STR File Demuxer
- * Copyright (c) 2003 The ffmpeg Project
+ * 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
*/
* 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')
/* 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)
{
AVIOContext *pb = s->pb;
StrDemuxContext *str = s->priv_data;
if(str->channels[channel].video_stream_index < 0){
/* allocate a new AVStream */
- st = av_new_stream(s, 0);
+ st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
- av_set_pts_info(st, 64, 1, 15);
+ 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]);
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codecpar->codec_id = AV_CODEC_ID_MDEC;
+ st->codecpar->codec_tag = 0; /* no fourcc */
+ st->codecpar->width = AV_RL16(§or[0x28]);
+ st->codecpar->height = AV_RL16(§or[0x2A]);
}
/* if this is the first sector of the frame, allocate a pkt */
if(pkt->size != sector_count*VIDEO_DATA_CHUNK_SIZE){
if(pkt->data)
av_log(s, AV_LOG_ERROR, "missmatching sector_count\n");
- av_free_packet(pkt);
+ av_packet_unref(pkt);
if (av_new_packet(pkt, sector_count*VIDEO_DATA_CHUNK_SIZE))
return AVERROR(EIO);
*ret_pkt = *pkt;
pkt->data= NULL;
pkt->size= -1;
+ pkt->buf = NULL;
return 0;
}
if(str->channels[channel].audio_stream_index < 0){
int fmt = sector[0x13];
/* allocate a new AVStream */
- st = av_new_stream(s, 0);
+ 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;
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = AV_CODEC_ID_ADPCM_XA;
+ st->codecpar->codec_tag = 0; /* no fourcc */
+ if (fmt & 1) {
+ st->codecpar->channels = 2;
+ st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
+ } else {
+ st->codecpar->channels = 1;
+ st->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
+ }
+ st->codecpar->sample_rate = (fmt&4)?18900:37800;
+ // st->codecpar->bit_rate = 0; //FIXME;
+ st->codecpar->block_align = 128;
- av_set_pts_info(st, 64, 128, st->codec->sample_rate);
+ avpriv_set_pts_info(st, 64, 18 * 224 / st->codecpar->channels,
+ st->codecpar->sample_rate);
+ st->start_time = 0;
}
pkt = ret_pkt;
if (av_new_packet(pkt, 2304))
pkt->stream_index =
str->channels[channel].audio_stream_index;
+ pkt->duration = 1;
return 0;
- break;
default:
av_log(s, AV_LOG_WARNING, "Unknown sector type %02X\n", sector[0x12]);
/* drop the sector and move on */
int i;
for(i=0; i<32; i++){
if(str->channels[i].tmp_pkt.data)
- av_free_packet(&str->channels[i].tmp_pkt);
+ av_packet_unref(&str->channels[i].tmp_pkt);
}
return 0;
}
AVInputFormat ff_str_demuxer = {
- "psxstr",
- NULL_IF_CONFIG_SMALL("Sony Playstation STR format"),
- sizeof(StrDemuxContext),
- str_probe,
- str_read_header,
- str_read_packet,
- str_read_close,
+ .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,
};
projects / ffmpeg / blobdiff