* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/avstring.h"
#include "avformat.h"
#include "rm.h"
-#include "avstring.h"
static inline void get_strl(ByteIOContext *pb, char *buf, int buf_size, int len)
{
get_strl(pb, buf, buf_size, get_byte(pb));
}
-static int rm_read_audio_stream_info(AVFormatContext *s, AVStream *st,
- int read_all)
+static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb,
+ AVStream *st, int read_all)
{
RMContext *rm = s->priv_data;
- ByteIOContext *pb = &s->pb;
char buf[256];
uint32_t version;
int i;
}
rm->audiobuf = av_malloc(rm->audio_framesize * sub_packet_h);
- } else if ((!strcmp(buf, "cook")) || (!strcmp(buf, "atrc"))) {
+ } else if ((!strcmp(buf, "cook")) || (!strcmp(buf, "atrc")) || (!strcmp(buf, "sipr"))) {
int codecdata_length, i;
get_be16(pb); get_byte(pb);
if (((version >> 16) & 0xff) == 5)
return -1;
}
+ if(sub_packet_size <= 0){
+ av_log(s, AV_LOG_ERROR, "sub_packet_size is invalid\n");
+ return -1;
+ }
+
if (!strcmp(buf, "cook")) st->codec->codec_id = CODEC_ID_COOK;
+ else if (!strcmp(buf, "sipr")) st->codec->codec_id = CODEC_ID_SIPR;
else st->codec->codec_id = CODEC_ID_ATRAC3;
st->codec->extradata_size= codecdata_length;
st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
return 0;
}
-static int
-ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st)
+int
+ff_rm_read_mdpr_codecdata (AVFormatContext *s, ByteIOContext *pb,
+ AVStream *st, int codec_data_size)
{
- ByteIOContext *pb = &s->pb;
unsigned int v;
- int codec_data_size, size;
+ int size;
int64_t codec_pos;
- codec_data_size = get_be32(pb);
+ av_set_pts_info(st, 64, 1, 1000);
codec_pos = url_ftell(pb);
v = get_be32(pb);
if (v == MKTAG(0xfd, 'a', 'r', '.')) {
/* ra type header */
- if (rm_read_audio_stream_info(s, st, 0))
+ if (rm_read_audio_stream_info(s, pb, st, 0))
return -1;
} else {
int fps, fps2;
if ( st->codec->codec_tag != MKTAG('R', 'V', '1', '0')
&& st->codec->codec_tag != MKTAG('R', 'V', '2', '0')
&& st->codec->codec_tag != MKTAG('R', 'V', '3', '0')
- && st->codec->codec_tag != MKTAG('R', 'V', '4', '0'))
+ && st->codec->codec_tag != MKTAG('R', 'V', '4', '0')
+ && st->codec->codec_tag != MKTAG('R', 'V', 'T', 'R'))
goto fail1;
st->codec->width = get_be16(pb);
st->codec->height = get_be16(pb);
return -1;
}
st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!st->codec->extradata)
+ return AVERROR(ENOMEM);
get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
// av_log(NULL, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2);
st = av_new_stream(s, 0);
if (!st)
return -1;
- return rm_read_audio_stream_info(s, st, 1);
+ return rm_read_audio_stream_info(s, s->pb, st, 1);
}
static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
{
RMContext *rm = s->priv_data;
AVStream *st;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
unsigned int tag;
- int tag_size, i;
+ int tag_size;
unsigned int start_time, duration;
char buf[128];
int flags = 0;
for(;;) {
if (url_feof(pb))
- goto fail;
+ return -1;
tag = get_le32(pb);
tag_size = get_be32(pb);
get_be16(pb);
tag_size);
#endif
if (tag_size < 10 && tag != MKTAG('D', 'A', 'T', 'A'))
- goto fail;
+ return -1;
switch(tag) {
case MKTAG('P', 'R', 'O', 'P'):
/* file header */
case MKTAG('M', 'D', 'P', 'R'):
st = av_new_stream(s, 0);
if (!st)
- goto fail;
+ return AVERROR(ENOMEM);
st->id = get_be16(pb);
get_be32(pb); /* max bit rate */
st->codec->bit_rate = get_be32(pb); /* bit rate */
get_str8(pb, buf, sizeof(buf)); /* desc */
get_str8(pb, buf, sizeof(buf)); /* mimetype */
st->codec->codec_type = CODEC_TYPE_DATA;
- av_set_pts_info(st, 64, 1, 1000);
- if (ff_rm_read_mdpr_codecdata(s, st) < 0)
+ if (ff_rm_read_mdpr_codecdata(s, s->pb, st, get_be32(pb)) < 0)
return -1;
break;
case MKTAG('D', 'A', 'T', 'A'):
get_be32(pb); /* next data header */
rm->curpic_num = -1;
return 0;
-
- fail:
- for(i=0;i<s->nb_streams;i++) {
- av_free(s->streams[i]);
- }
- return AVERROR(EIO);
}
static int get_num(ByteIOContext *pb, int *len)
n = get_be16(pb);
(*len)-=2;
-// n &= 0x7FFF;
+ n &= 0x7FFF;
if (n >= 0x4000) {
return n - 0x4000;
} else {
static int sync(AVFormatContext *s, int64_t *timestamp, int *flags, int *stream_index, int64_t *pos){
RMContext *rm = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int len, num, res, i;
AVStream *st;
uint32_t state=0xFFFFFFFF;
while(!url_feof(pb)){
- *pos= url_ftell(pb);
+ *pos= url_ftell(pb) - 3;
if(rm->remaining_len > 0){
num= rm->current_stream;
len= rm->remaining_len;
return -1;
}
-static int rm_assemble_video_frame(AVFormatContext *s, RMContext *rm, AVPacket *pkt, int len)
+static int rm_assemble_video_frame(AVFormatContext *s, ByteIOContext *pb,
+ RMContext *rm, AVPacket *pkt, int len)
{
- ByteIOContext *pb = &s->pb;
int hdr, seq, pic_num, len2, pos;
int type;
if((seq & 0x7F) == 1 || rm->curpic_num != pic_num){
rm->slices = ((hdr & 0x3F) << 1) + 1;
rm->videobufsize = len2 + 8*rm->slices + 1;
- if(!(rm->videobuf = av_realloc(rm->videobuf, rm->videobufsize)))
+ av_free(rm->videobuf);
+ if(!(rm->videobuf = av_malloc(rm->videobufsize)))
return AVERROR(ENOMEM);
rm->videobufpos = 8*rm->slices + 1;
rm->cur_slice = 0;
return 1;
if (get_buffer(pb, rm->videobuf + rm->videobufpos, len) != len)
return AVERROR(EIO);
- rm->videobufpos += len,
+ rm->videobufpos += len;
rm->remaining_len-= len;
if(type == 2 || (rm->videobufpos) == rm->videobufsize){
}
}
-static int
-ff_rm_parse_packet (AVFormatContext *s, AVStream *st, int len, AVPacket *pkt,
+int
+ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb,
+ AVStream *st, int len, AVPacket *pkt,
int *seq, int *flags, int64_t *timestamp)
{
- ByteIOContext *pb = &s->pb;
RMContext *rm = s->priv_data;
if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
rm->current_stream= st->id;
- if(rm_assemble_video_frame(s, rm, pkt, len) == 1)
+ if(rm_assemble_video_frame(s, pb, rm, pkt, len) == 1)
return -1; //got partial frame
} else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
if ((st->codec->codec_id == CODEC_ID_RA_288) ||
(st->codec->codec_id == CODEC_ID_COOK) ||
- (st->codec->codec_id == CODEC_ID_ATRAC3)) {
+ (st->codec->codec_id == CODEC_ID_ATRAC3) ||
+ (st->codec->codec_id == CODEC_ID_SIPR)) {
int x;
int sps = rm->sub_packet_size;
int cfs = rm->coded_framesize;
av_get_packet(pb, pkt, rm->sub_packet_lengths[0]);
*flags = 2; // Mark first packet as keyframe
}
- } else
+ } else {
av_get_packet(pb, pkt, len);
rm_ac3_swap_bytes(st, pkt);
-
+ }
} else
av_get_packet(pb, pkt, len);
return 0;
}
-static void
-ff_rm_retrieve_cache (AVFormatContext *s, AVStream *st, AVPacket *pkt)
+void
+ff_rm_retrieve_cache (AVFormatContext *s, ByteIOContext *pb,
+ AVStream *st, AVPacket *pkt)
{
- ByteIOContext *pb = &s->pb;
RMContext *rm = s->priv_data;
assert (rm->audio_pkt_cnt > 0);
static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
{
RMContext *rm = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVStream *st;
int i, len;
int64_t timestamp, pos;
if (rm->audio_pkt_cnt) {
// If there are queued audio packet return them first
st = s->streams[rm->audio_stream_num];
- ff_rm_retrieve_cache(s, st, pkt);
+ ff_rm_retrieve_cache(s, s->pb, st, pkt);
} else if (rm->old_format) {
st = s->streams[0];
if (st->codec->codec_id == CODEC_ID_RA_288) {
return AVERROR(EIO);
st = s->streams[i];
- if (ff_rm_parse_packet (s, st, len, pkt, &seq, &flags, ×tamp) < 0)
+ if (ff_rm_parse_packet (s, s->pb, st, len, pkt, &seq, &flags, ×tamp) < 0)
goto resync;
- if(flags&2){
- if((seq&0x7F) == 1)
- av_add_index_entry(st, pos, timestamp, 0, 0, AVINDEX_KEYFRAME);
- }
+ if((flags&2) && (seq&0x7F) == 1)
+ av_add_index_entry(st, pos, timestamp, 0, 0, AVINDEX_KEYFRAME);
}
return 0;
if(rm->old_format)
return AV_NOPTS_VALUE;
- url_fseek(&s->pb, pos, SEEK_SET);
+ url_fseek(s->pb, pos, SEEK_SET);
rm->remaining_len=0;
for(;;){
int seq=1;
st = s->streams[stream_index2];
if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
- h= get_byte(&s->pb); len--;
+ h= get_byte(s->pb); len--;
if(!(h & 0x40)){
- seq = get_byte(&s->pb); len--;
+ seq = get_byte(s->pb); len--;
}
}
break;
}
- url_fskip(&s->pb, len);
+ url_fskip(s->pb, len);
}
*ppos = pos;
return dts;
AVInputFormat rm_demuxer = {
"rm",
- "rm format",
+ NULL_IF_CONFIG_SMALL("RM format"),
sizeof(RMContext),
rm_probe,
rm_read_header,
NULL,
rm_read_dts,
};
+
+AVInputFormat rdt_demuxer = {
+ "rdt",
+ NULL_IF_CONFIG_SMALL("RDT demuxer"),
+ sizeof(RMContext),
+ NULL, NULL, NULL, rm_read_close, NULL, NULL
+};