/*
* "Real" compatible demuxer.
- * Copyright (c) 2000, 2001 Fabrice Bellard.
+ * Copyright (c) 2000, 2001 Fabrice Bellard
*
* This file is part of FFmpeg.
*
*/
#include "libavutil/avstring.h"
+#include "libavutil/intreadwrite.h"
#include "avformat.h"
+#include "rm.h"
-typedef struct {
- int nb_packets;
- int old_format;
- int current_stream;
- int remaining_len;
- uint8_t *videobuf; ///< place to store merged video frame
+struct RMStream {
+ AVPacket pkt; ///< place to store merged video frame / reordered audio data
int videobufsize; ///< current assembled frame size
int videobufpos; ///< position for the next slice in the video buffer
int curpic_num; ///< picture number of current frame
int cur_slice, slices;
int64_t pktpos; ///< first slice position in file
/// Audio descrambling matrix parameters
- uint8_t *audiobuf; ///< place to store reordered audio data
int64_t audiotimestamp; ///< Audio packet timestamp
int sub_packet_cnt; // Subpacket counter, used while reading
int sub_packet_size, sub_packet_h, coded_framesize; ///< Descrambling parameters from container
+ int audio_framesize; /// Audio frame size from container
+ int sub_packet_lengths[16]; /// Length of each subpacket
+};
+
+typedef struct {
+ int nb_packets;
+ int old_format;
+ int current_stream;
+ int remaining_len;
int audio_stream_num; ///< Stream number for audio packets
int audio_pkt_cnt; ///< Output packet counter
- int audio_framesize; /// Audio frame size from container
- int sub_packet_lengths[16]; /// Length of each aac subpacket
} RMDemuxContext;
static inline void get_strl(ByteIOContext *pb, char *buf, int buf_size, int len)
if (buf_size > 0) *q = '\0';
}
-static void get_str16(ByteIOContext *pb, char *buf, int buf_size)
+static void get_str8(ByteIOContext *pb, char *buf, int buf_size)
{
- get_strl(pb, buf, buf_size, get_be16(pb));
+ get_strl(pb, buf, buf_size, get_byte(pb));
}
-static void get_str8(ByteIOContext *pb, char *buf, int buf_size)
+static void rm_read_metadata(AVFormatContext *s, int wide)
{
- get_strl(pb, buf, buf_size, get_byte(pb));
+ char buf[1024];
+ int i;
+ for (i=0; i<FF_ARRAY_ELEMS(ff_rm_metadata); i++) {
+ int len = wide ? get_be16(s->pb) : get_byte(s->pb);
+ get_strl(s->pb, buf, sizeof(buf), len);
+ av_metadata_set(&s->metadata, ff_rm_metadata[i], buf);
+ }
+}
+
+RMStream *ff_rm_alloc_rmstream (void)
+{
+ RMStream *rms = av_mallocz(sizeof(RMStream));
+ rms->curpic_num = -1;
+ return rms;
+}
+
+void ff_rm_free_rmstream (RMStream *rms)
+{
+ av_free_packet(&rms->pkt);
}
static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb,
- AVStream *st, int read_all)
+ AVStream *st, RMStream *ast, int read_all)
{
- RMDemuxContext *rm = s->priv_data;
char buf[256];
uint32_t version;
- int i;
/* ra type header */
version = get_be32(pb); /* version */
if (((version >> 16) & 0xff) == 3) {
int64_t startpos = url_ftell(pb);
- /* very old version */
- for(i = 0; i < 14; i++)
- get_byte(pb);
- get_str8(pb, s->title, sizeof(s->title));
- get_str8(pb, s->author, sizeof(s->author));
- get_str8(pb, s->copyright, sizeof(s->copyright));
- get_str8(pb, s->comment, sizeof(s->comment));
+ url_fskip(pb, 14);
+ rm_read_metadata(s, 0);
if ((startpos + (version & 0xffff)) >= url_ftell(pb) + 2) {
// fourcc (should always be "lpcJ")
get_byte(pb);
get_be16(pb); /* version2 */
get_be32(pb); /* header size */
flavor= get_be16(pb); /* add codec info / flavor */
- rm->coded_framesize = coded_framesize = get_be32(pb); /* coded frame size */
+ ast->coded_framesize = coded_framesize = get_be32(pb); /* coded frame size */
get_be32(pb); /* ??? */
get_be32(pb); /* ??? */
get_be32(pb); /* ??? */
- rm->sub_packet_h = sub_packet_h = get_be16(pb); /* 1 */
+ ast->sub_packet_h = sub_packet_h = get_be16(pb); /* 1 */
st->codec->block_align= get_be16(pb); /* frame size */
- rm->sub_packet_size = sub_packet_size = get_be16(pb); /* sub packet size */
+ ast->sub_packet_size = sub_packet_size = get_be16(pb); /* sub packet size */
get_be16(pb); /* ??? */
if (((version >> 16) & 0xff) == 5) {
get_be16(pb); get_be16(pb); get_be16(pb);
st->codec->channels = get_be16(pb);
if (((version >> 16) & 0xff) == 5) {
get_be32(pb);
- buf[0] = get_byte(pb);
- buf[1] = get_byte(pb);
- buf[2] = get_byte(pb);
- buf[3] = get_byte(pb);
+ get_buffer(pb, buf, 4);
buf[4] = 0;
} else {
get_str8(pb, buf, sizeof(buf)); /* desc */
} else if (!strcmp(buf, "28_8")) {
st->codec->codec_id = CODEC_ID_RA_288;
st->codec->extradata_size= 0;
- rm->audio_framesize = st->codec->block_align;
+ ast->audio_framesize = st->codec->block_align;
st->codec->block_align = coded_framesize;
- if(rm->audio_framesize >= UINT_MAX / sub_packet_h){
- av_log(s, AV_LOG_ERROR, "rm->audio_framesize * sub_packet_h too large\n");
+ if(ast->audio_framesize >= UINT_MAX / sub_packet_h){
+ av_log(s, AV_LOG_ERROR, "ast->audio_framesize * sub_packet_h too large\n");
return -1;
}
- rm->audiobuf = av_malloc(rm->audio_framesize * sub_packet_h);
+ av_new_packet(&ast->pkt, ast->audio_framesize * sub_packet_h);
} else if ((!strcmp(buf, "cook")) || (!strcmp(buf, "atrc")) || (!strcmp(buf, "sipr"))) {
- int codecdata_length, i;
+ int codecdata_length;
get_be16(pb); get_byte(pb);
if (((version >> 16) & 0xff) == 5)
get_byte(pb);
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);
- for(i = 0; i < codecdata_length; i++)
- ((uint8_t*)st->codec->extradata)[i] = get_byte(pb);
- rm->audio_framesize = st->codec->block_align;
- st->codec->block_align = rm->sub_packet_size;
+ get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
+ ast->audio_framesize = st->codec->block_align;
+ st->codec->block_align = ast->sub_packet_size;
- if(rm->audio_framesize >= UINT_MAX / sub_packet_h){
+ if(ast->audio_framesize >= UINT_MAX / sub_packet_h){
av_log(s, AV_LOG_ERROR, "rm->audio_framesize * sub_packet_h too large\n");
return -1;
}
- rm->audiobuf = av_malloc(rm->audio_framesize * sub_packet_h);
+ av_new_packet(&ast->pkt, ast->audio_framesize * sub_packet_h);
} else if (!strcmp(buf, "raac") || !strcmp(buf, "racp")) {
- int codecdata_length, i;
+ int codecdata_length;
get_be16(pb); get_byte(pb);
if (((version >> 16) & 0xff) == 5)
get_byte(pb);
st->codec->extradata_size = codecdata_length - 1;
st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
get_byte(pb);
- for(i = 0; i < st->codec->extradata_size; i++)
- ((uint8_t*)st->codec->extradata)[i] = get_byte(pb);
+ get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
}
} else {
st->codec->codec_id = CODEC_ID_NONE;
get_byte(pb);
get_byte(pb);
get_byte(pb);
-
- get_str8(pb, s->title, sizeof(s->title));
- get_str8(pb, s->author, sizeof(s->author));
- get_str8(pb, s->copyright, sizeof(s->copyright));
- get_str8(pb, s->comment, sizeof(s->comment));
+ rm_read_metadata(s, 0);
}
}
return 0;
int
ff_rm_read_mdpr_codecdata (AVFormatContext *s, ByteIOContext *pb,
- AVStream *st, int codec_data_size)
+ AVStream *st, RMStream *rst, int codec_data_size)
{
unsigned int v;
int size;
v = get_be32(pb);
if (v == MKTAG(0xfd, 'a', 'r', '.')) {
/* ra type header */
- if (rm_read_audio_stream_info(s, pb, st, 0))
+ if (rm_read_audio_stream_info(s, pb, st, rst, 0))
return -1;
} else {
int fps, fps2;
goto skip;
}
st->codec->codec_tag = get_le32(pb);
-// av_log(NULL, AV_LOG_DEBUG, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0'));
+// av_log(s, AV_LOG_DEBUG, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0'));
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')
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);
+// av_log(s, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2);
st->codec->time_base.den = fps * st->codec->time_base.num;
switch(((uint8_t*)st->codec->extradata)[4]>>4){
case 1: st->codec->codec_id = CODEC_ID_RV10; break;
st = av_new_stream(s, 0);
if (!st)
return -1;
- return rm_read_audio_stream_info(s, s->pb, st, 1);
+ st->priv_data = ff_rm_alloc_rmstream();
+ return rm_read_audio_stream_info(s, s->pb, st, st->priv_data, 1);
}
static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
flags = get_be16(pb); /* flags */
break;
case MKTAG('C', 'O', 'N', 'T'):
- get_str16(pb, s->title, sizeof(s->title));
- get_str16(pb, s->author, sizeof(s->author));
- get_str16(pb, s->copyright, sizeof(s->copyright));
- get_str16(pb, s->comment, sizeof(s->comment));
+ rm_read_metadata(s, 1);
break;
case MKTAG('M', 'D', 'P', 'R'):
st = av_new_stream(s, 0);
get_str8(pb, buf, sizeof(buf)); /* desc */
get_str8(pb, buf, sizeof(buf)); /* mimetype */
st->codec->codec_type = CODEC_TYPE_DATA;
- if (ff_rm_read_mdpr_codecdata(s, s->pb, st, get_be32(pb)) < 0)
+ st->priv_data = ff_rm_alloc_rmstream();
+ if (ff_rm_read_mdpr_codecdata(s, s->pb, st, st->priv_data,
+ get_be32(pb)) < 0)
return -1;
break;
case MKTAG('D', 'A', 'T', 'A'):
if (!rm->nb_packets && (flags & 4))
rm->nb_packets = 3600 * 25;
get_be32(pb); /* next data header */
- rm->curpic_num = -1;
return 0;
}
}
static int rm_assemble_video_frame(AVFormatContext *s, ByteIOContext *pb,
- RMDemuxContext *rm, AVPacket *pkt, int len)
+ RMDemuxContext *rm, RMStream *vst,
+ AVPacket *pkt, int len)
{
int hdr, seq, pic_num, len2, pos;
int type;
hdr = get_byte(pb); len--;
type = hdr >> 6;
- switch(type){
- case 0: // slice
- case 2: // last slice
+
+ if(type != 3){ // not frame as a part of packet
seq = get_byte(pb); len--;
+ }
+ if(type != 1){ // not whole frame
len2 = get_num(pb, &len);
- pos = get_num(pb, &len);
+ pos = get_num(pb, &len);
pic_num = get_byte(pb); len--;
- rm->remaining_len = len;
- break;
- case 1: //whole frame
- seq = get_byte(pb); len--;
+ }
+ if(len<0)
+ return -1;
+ rm->remaining_len = len;
+ if(type&1){ // frame, not slice
+ if(type == 3) // frame as a part of packet
+ len= len2;
+ if(rm->remaining_len < len)
+ return -1;
+ rm->remaining_len -= len;
if(av_new_packet(pkt, len + 9) < 0)
return AVERROR(EIO);
pkt->data[0] = 0;
AV_WL32(pkt->data + 1, 1);
AV_WL32(pkt->data + 5, 0);
get_buffer(pb, pkt->data + 9, len);
- rm->remaining_len = 0;
- return 0;
- case 3: //frame as a part of packet
- len2 = get_num(pb, &len);
- pos = get_num(pb, &len);
- pic_num = get_byte(pb); len--;
- rm->remaining_len = len - len2;
- if(av_new_packet(pkt, len2 + 9) < 0)
- return AVERROR(EIO);
- pkt->data[0] = 0;
- AV_WL32(pkt->data + 1, 1);
- AV_WL32(pkt->data + 5, 0);
- get_buffer(pb, pkt->data + 9, len2);
return 0;
}
//now we have to deal with single slice
- if((seq & 0x7F) == 1 || rm->curpic_num != pic_num){
- rm->slices = ((hdr & 0x3F) << 1) + 1;
- rm->videobufsize = len2 + 8*rm->slices + 1;
- av_free(rm->videobuf);
- if(!(rm->videobuf = av_malloc(rm->videobufsize)))
+ if((seq & 0x7F) == 1 || vst->curpic_num != pic_num){
+ vst->slices = ((hdr & 0x3F) << 1) + 1;
+ vst->videobufsize = len2 + 8*vst->slices + 1;
+ av_free_packet(&vst->pkt); //FIXME this should be output.
+ if(av_new_packet(&vst->pkt, vst->videobufsize) < 0)
return AVERROR(ENOMEM);
- rm->videobufpos = 8*rm->slices + 1;
- rm->cur_slice = 0;
- rm->curpic_num = pic_num;
- rm->pktpos = url_ftell(pb);
+ vst->videobufpos = 8*vst->slices + 1;
+ vst->cur_slice = 0;
+ vst->curpic_num = pic_num;
+ vst->pktpos = url_ftell(pb);
}
if(type == 2)
len = FFMIN(len, pos);
- if(++rm->cur_slice > rm->slices)
+ if(++vst->cur_slice > vst->slices)
return 1;
- AV_WL32(rm->videobuf - 7 + 8*rm->cur_slice, 1);
- AV_WL32(rm->videobuf - 3 + 8*rm->cur_slice, rm->videobufpos - 8*rm->slices - 1);
- if(rm->videobufpos + len > rm->videobufsize)
+ AV_WL32(vst->pkt.data - 7 + 8*vst->cur_slice, 1);
+ AV_WL32(vst->pkt.data - 3 + 8*vst->cur_slice, vst->videobufpos - 8*vst->slices - 1);
+ if(vst->videobufpos + len > vst->videobufsize)
return 1;
- if (get_buffer(pb, rm->videobuf + rm->videobufpos, len) != len)
+ if (get_buffer(pb, vst->pkt.data + vst->videobufpos, len) != len)
return AVERROR(EIO);
- rm->videobufpos += len;
+ vst->videobufpos += len;
rm->remaining_len-= len;
- if(type == 2 || (rm->videobufpos) == rm->videobufsize){
- rm->videobuf[0] = rm->cur_slice-1;
- if(av_new_packet(pkt, rm->videobufpos - 8*(rm->slices - rm->cur_slice)) < 0)
- return AVERROR(ENOMEM);
- memcpy(pkt->data, rm->videobuf, 1 + 8*rm->cur_slice);
- memcpy(pkt->data + 1 + 8*rm->cur_slice, rm->videobuf + 1 + 8*rm->slices,
- rm->videobufpos - 1 - 8*rm->slices);
- pkt->pts = AV_NOPTS_VALUE;
- pkt->pos = rm->pktpos;
- return 0;
+ if(type == 2 || (vst->videobufpos) == vst->videobufsize){
+ vst->pkt.data[0] = vst->cur_slice-1;
+ *pkt= vst->pkt;
+ vst->pkt.data= NULL;
+ vst->pkt.size= 0;
+ if(vst->slices != vst->cur_slice) //FIXME find out how to set slices correct from the begin
+ memmove(pkt->data + 1 + 8*vst->cur_slice, pkt->data + 1 + 8*vst->slices,
+ vst->videobufpos - 1 - 8*vst->slices);
+ pkt->size = vst->videobufpos + 8*(vst->cur_slice - vst->slices);
+ pkt->pts = AV_NOPTS_VALUE;
+ pkt->pos = vst->pktpos;
+ return 0;
}
return 1;
int
ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb,
- AVStream *st, int len, AVPacket *pkt,
+ AVStream *st, RMStream *ast, int len, AVPacket *pkt,
int *seq, int *flags, int64_t *timestamp)
{
RMDemuxContext *rm = s->priv_data;
if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
rm->current_stream= st->id;
- if(rm_assemble_video_frame(s, pb, rm, pkt, len) == 1)
+ if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len))
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_ATRAC3) ||
(st->codec->codec_id == CODEC_ID_SIPR)) {
int x;
- int sps = rm->sub_packet_size;
- int cfs = rm->coded_framesize;
- int h = rm->sub_packet_h;
- int y = rm->sub_packet_cnt;
- int w = rm->audio_framesize;
+ int sps = ast->sub_packet_size;
+ int cfs = ast->coded_framesize;
+ int h = ast->sub_packet_h;
+ int y = ast->sub_packet_cnt;
+ int w = ast->audio_framesize;
if (*flags & 2)
- y = rm->sub_packet_cnt = 0;
+ y = ast->sub_packet_cnt = 0;
if (!y)
- rm->audiotimestamp = *timestamp;
+ ast->audiotimestamp = *timestamp;
switch(st->codec->codec_id) {
case CODEC_ID_RA_288:
for (x = 0; x < h/2; x++)
- get_buffer(pb, rm->audiobuf+x*2*w+y*cfs, cfs);
+ get_buffer(pb, ast->pkt.data+x*2*w+y*cfs, cfs);
break;
case CODEC_ID_ATRAC3:
case CODEC_ID_COOK:
for (x = 0; x < w/sps; x++)
- get_buffer(pb, rm->audiobuf+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps);
+ get_buffer(pb, ast->pkt.data+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps);
break;
}
- if (++(rm->sub_packet_cnt) < h)
+ if (++(ast->sub_packet_cnt) < h)
return -1;
else {
- rm->sub_packet_cnt = 0;
+ ast->sub_packet_cnt = 0;
rm->audio_stream_num = st->index;
rm->audio_pkt_cnt = h * w / st->codec->block_align - 1;
// Release first audio packet
av_new_packet(pkt, st->codec->block_align);
- memcpy(pkt->data, rm->audiobuf, st->codec->block_align);
- *timestamp = rm->audiotimestamp;
+ memcpy(pkt->data, ast->pkt.data, st->codec->block_align); //FIXME avoid this
+ *timestamp = ast->audiotimestamp;
*flags = 2; // Mark first packet as keyframe
}
} else if (st->codec->codec_id == CODEC_ID_AAC) {
int x;
rm->audio_stream_num = st->index;
- rm->sub_packet_cnt = (get_be16(pb) & 0xf0) >> 4;
- if (rm->sub_packet_cnt) {
- for (x = 0; x < rm->sub_packet_cnt; x++)
- rm->sub_packet_lengths[x] = get_be16(pb);
+ ast->sub_packet_cnt = (get_be16(pb) & 0xf0) >> 4;
+ if (ast->sub_packet_cnt) {
+ for (x = 0; x < ast->sub_packet_cnt; x++)
+ ast->sub_packet_lengths[x] = get_be16(pb);
// Release first audio packet
- rm->audio_pkt_cnt = rm->sub_packet_cnt - 1;
- av_get_packet(pb, pkt, rm->sub_packet_lengths[0]);
+ rm->audio_pkt_cnt = ast->sub_packet_cnt - 1;
+ av_get_packet(pb, pkt, ast->sub_packet_lengths[0]);
*flags = 2; // Mark first packet as keyframe
}
} else {
if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
if(st->codec->codec_id == CODEC_ID_RV20){
int seq= 128*(pkt->data[2]&0x7F) + (pkt->data[3]>>1);
- av_log(NULL, AV_LOG_DEBUG, "%d %"PRId64" %d\n", *timestamp, *timestamp*512LL/25, seq);
+ av_log(s, AV_LOG_DEBUG, "%d %"PRId64" %d\n", *timestamp, *timestamp*512LL/25, seq);
seq |= (*timestamp&~0x3FFF);
if(seq - *timestamp > 0x2000) seq -= 0x4000;
return st->codec->codec_type == CODEC_TYPE_AUDIO ? rm->audio_pkt_cnt : 0;
}
-void
+int
ff_rm_retrieve_cache (AVFormatContext *s, ByteIOContext *pb,
- AVStream *st, AVPacket *pkt)
+ AVStream *st, RMStream *ast, AVPacket *pkt)
{
RMDemuxContext *rm = s->priv_data;
assert (rm->audio_pkt_cnt > 0);
if (st->codec->codec_id == CODEC_ID_AAC)
- av_get_packet(pb, pkt, rm->sub_packet_lengths[rm->sub_packet_cnt - rm->audio_pkt_cnt]);
+ av_get_packet(pb, pkt, ast->sub_packet_lengths[ast->sub_packet_cnt - rm->audio_pkt_cnt]);
else {
av_new_packet(pkt, st->codec->block_align);
- memcpy(pkt->data, rm->audiobuf + st->codec->block_align *
- (rm->sub_packet_h * rm->audio_framesize / st->codec->block_align - rm->audio_pkt_cnt),
+ memcpy(pkt->data, ast->pkt.data + st->codec->block_align * //FIXME avoid this
+ (ast->sub_packet_h * ast->audio_framesize / st->codec->block_align - rm->audio_pkt_cnt),
st->codec->block_align);
}
rm->audio_pkt_cnt--;
pkt->flags = 0;
pkt->stream_index = st->index;
+
+ return rm->audio_pkt_cnt;
}
static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
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, s->pb, st, pkt);
+ ff_rm_retrieve_cache(s, s->pb, st, st->priv_data, pkt);
} else if (rm->old_format) {
+ RMStream *ast;
+
st = s->streams[0];
+ ast = st->priv_data;
if (st->codec->codec_id == CODEC_ID_RA_288) {
int x, y;
- for (y = 0; y < rm->sub_packet_h; y++)
- for (x = 0; x < rm->sub_packet_h/2; x++)
- if (get_buffer(pb, rm->audiobuf+x*2*rm->audio_framesize+y*rm->coded_framesize, rm->coded_framesize) <= 0)
+ for (y = 0; y < ast->sub_packet_h; y++)
+ for (x = 0; x < ast->sub_packet_h/2; x++)
+ if (get_buffer(pb, ast->pkt.data+x*2*ast->audio_framesize+y*ast->coded_framesize, ast->coded_framesize) <= 0)
return AVERROR(EIO);
rm->audio_stream_num = 0;
- rm->audio_pkt_cnt = rm->sub_packet_h * rm->audio_framesize / st->codec->block_align - 1;
+ rm->audio_pkt_cnt = ast->sub_packet_h * ast->audio_framesize / st->codec->block_align - 1;
// Release first audio packet
av_new_packet(pkt, st->codec->block_align);
- memcpy(pkt->data, rm->audiobuf, st->codec->block_align);
+ memcpy(pkt->data, ast->pkt.data, st->codec->block_align); //FIXME avoid this
pkt->flags |= PKT_FLAG_KEY; // Mark first packet as keyframe
pkt->stream_index = 0;
} else {
return AVERROR(EIO);
st = s->streams[i];
- if (ff_rm_parse_packet (s, s->pb, st, len, pkt, &seq, &flags, ×tamp) < 0)
+ if (ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt,
+ &seq, &flags, ×tamp) < 0)
goto resync;
if((flags&2) && (seq&0x7F) == 1)
static int rm_read_close(AVFormatContext *s)
{
- RMDemuxContext *rm = s->priv_data;
+ int i;
+
+ for (i=0;i<s->nb_streams;i++)
+ ff_rm_free_rmstream(s->streams[i]->priv_data);
- av_free(rm->audiobuf);
- av_free(rm->videobuf);
return 0;
}
AVInputFormat rm_demuxer = {
"rm",
- NULL_IF_CONFIG_SMALL("RM format"),
+ NULL_IF_CONFIG_SMALL("RealMedia format"),
sizeof(RMDemuxContext),
rm_probe,
rm_read_header,
"rdt",
NULL_IF_CONFIG_SMALL("RDT demuxer"),
sizeof(RMDemuxContext),
- NULL, NULL, NULL, rm_read_close, NULL, NULL
+ NULL,
+ NULL,
+ NULL,
+ rm_read_close,
};
projects / ffmpeg / blobdiff