int read_all)
{
RMContext *rm = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
char buf[256];
uint32_t version;
int i;
return 0;
}
-static int
+int
ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st)
{
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
unsigned int v;
- int codec_data_size, size, res = -1;
+ int codec_data_size, size;
int64_t codec_pos;
codec_data_size = get_be32(pb);
}
}
- res = 0;
skip:
/* skip codec info */
size = url_ftell(pb) - codec_pos;
url_fskip(pb, codec_data_size - size);
- return res;
+ return 0;
}
{
RMContext *rm = s->priv_data;
AVStream *st;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
unsigned int tag;
int tag_size, i;
unsigned int start_time, duration;
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;
static int rm_assemble_video_frame(AVFormatContext *s, RMContext *rm, AVPacket *pkt, int len)
{
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int hdr, seq, pic_num, len2, pos;
int type;
- int ssize;
hdr = get_byte(pb); len--;
type = hdr >> 6;
if((seq & 0x7F) == 1 || rm->curpic_num != pic_num){
rm->slices = ((hdr & 0x3F) << 1) + 1;
- ssize = len2 + 8*rm->slices + 1;
- rm->videobuf = av_realloc(rm->videobuf, ssize);
- rm->videobufsize = ssize;
+ rm->videobufsize = len2 + 8*rm->slices + 1;
+ av_free(rm->videobuf);
+ if(!(rm->videobuf = av_malloc(rm->videobufsize)))
+ return AVERROR(ENOMEM);
rm->videobufpos = 8*rm->slices + 1;
rm->cur_slice = 0;
rm->curpic_num = pic_num;
rm->pktpos = url_ftell(pb);
}
- if(type == 2){
+ if(type == 2)
len = FFMIN(len, pos);
- pos = len2 - pos;
- }
- if(++rm->cur_slice > rm->cur_slice)
+ if(++rm->cur_slice > rm->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);
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){
- //adjust slice headers
- memmove(rm->videobuf + 1 + 8*rm->cur_slice, rm->videobuf + 1 + 8*rm->slices, rm->videobufsize - 1 - 8*rm->slices);
- ssize = rm->videobufsize - 8*(rm->slices - rm->cur_slice);
-
rm->videobuf[0] = rm->cur_slice-1;
- if(av_new_packet(pkt, ssize) < 0)
+ if(av_new_packet(pkt, rm->videobufpos - 8*(rm->slices - rm->cur_slice)) < 0)
return AVERROR(ENOMEM);
- memcpy(pkt->data, rm->videobuf, ssize);
+ 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;
return 1;
}
+static inline void
+rm_ac3_swap_bytes (AVStream *st, AVPacket *pkt)
+{
+ uint8_t *ptr;
+ int j;
+
+ if (st->codec->codec_id == CODEC_ID_AC3) {
+ ptr = pkt->data;
+ for (j=0;j<pkt->size;j+=2) {
+ FFSWAP(int, ptr[0], ptr[1]);
+ ptr += 2;
+ }
+ }
+}
+
+int
+ff_rm_parse_packet (AVFormatContext *s, 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)
+ 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)) {
+ 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;
+
+ if (*flags & 2)
+ y = rm->sub_packet_cnt = 0;
+ if (!y)
+ rm->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);
+ 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);
+ break;
+ }
+
+ if (++(rm->sub_packet_cnt) < h)
+ return -1;
+ else {
+ rm->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;
+ *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);
+ // Release first audio packet
+ rm->audio_pkt_cnt = rm->sub_packet_cnt - 1;
+ av_get_packet(pb, pkt, rm->sub_packet_lengths[0]);
+ *flags = 2; // Mark first packet as keyframe
+ }
+ } else {
+ av_get_packet(pb, pkt, len);
+ rm_ac3_swap_bytes(st, pkt);
+ }
+ } else
+ av_get_packet(pb, pkt, len);
+
+ if( (st->discard >= AVDISCARD_NONKEY && !(*flags&2))
+ || st->discard >= AVDISCARD_ALL){
+ av_free_packet(pkt);
+ return -1;
+ }
+
+ pkt->stream_index = st->index;
+
+#if 0
+ 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);
+
+ seq |= (*timestamp&~0x3FFF);
+ if(seq - *timestamp > 0x2000) seq -= 0x4000;
+ if(seq - *timestamp < -0x2000) seq += 0x4000;
+ }
+ }
+#endif
+
+ pkt->pts= *timestamp;
+ if (*flags & 2)
+ pkt->flags |= PKT_FLAG_KEY;
+
+ return 0;
+}
+
+void
+ff_rm_retrieve_cache (AVFormatContext *s, AVStream *st, AVPacket *pkt)
+{
+ ByteIOContext *pb = s->pb;
+ RMContext *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]);
+ 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),
+ st->codec->block_align);
+ }
+ rm->audio_pkt_cnt--;
+ pkt->flags = 0;
+ pkt->stream_index = st->index;
+}
+
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, j;
+ int i, len;
int64_t timestamp, pos;
- uint8_t *ptr;
int flags;
if (rm->audio_pkt_cnt) {
// If there are queued audio packet return them first
st = s->streams[rm->audio_stream_num];
- 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]);
- 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),
- st->codec->block_align);
- }
- rm->audio_pkt_cnt--;
- pkt->flags = 0;
- pkt->stream_index = rm->audio_stream_num;
+ ff_rm_retrieve_cache(s, st, pkt);
} else if (rm->old_format) {
st = s->streams[0];
if (st->codec->codec_id == CODEC_ID_RA_288) {
}
pkt->size = len;
}
+ rm_ac3_swap_bytes(st, pkt);
} else {
int seq=1;
resync:
return AVERROR(EIO);
st = s->streams[i];
- if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
- rm->current_stream= st->id;
- if(rm_assemble_video_frame(s, rm, pkt, len) == 1)
- goto resync;//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)) {
- 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;
-
- if (flags & 2)
- y = rm->sub_packet_cnt = 0;
- if (!y)
- rm->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);
- 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);
- break;
- }
-
- if (++(rm->sub_packet_cnt) < h)
- goto resync;
- else {
- rm->sub_packet_cnt = 0;
- rm->audio_stream_num = i;
- 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;
- flags = 2; // Mark first packet as keyframe
- }
- } else if (st->codec->codec_id == CODEC_ID_AAC) {
- int x;
- rm->audio_stream_num = i;
- 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);
- // Release first audio packet
- rm->audio_pkt_cnt = rm->sub_packet_cnt - 1;
- av_get_packet(pb, pkt, rm->sub_packet_lengths[0]);
- flags = 2; // Mark first packet as keyframe
- }
- } else
- av_get_packet(pb, pkt, len);
-
- } else
- av_get_packet(pb, pkt, len);
-
- if( (st->discard >= AVDISCARD_NONKEY && !(flags&2))
- || st->discard >= AVDISCARD_ALL){
- av_free_packet(pkt);
+ if (ff_rm_parse_packet (s, st, len, pkt, &seq, &flags, ×tamp) < 0)
goto resync;
- }
-
- pkt->stream_index = i;
-#if 0
- 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);
-
- seq |= (timestamp&~0x3FFF);
- if(seq - timestamp > 0x2000) seq -= 0x4000;
- if(seq - timestamp < -0x2000) seq += 0x4000;
- }
- }
-#endif
- pkt->pts= timestamp;
- if(flags&2){
- pkt->flags |= PKT_FLAG_KEY;
- 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);
}
- /* for AC3, needs to swap bytes */
- if (st->codec->codec_id == CODEC_ID_AC3) {
- ptr = pkt->data;
- for(j=0;j<pkt->size;j+=2) {
- FFSWAP(int, ptr[0], ptr[1]);
- ptr += 2;
- }
- }
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;
projects / ffmpeg / blobdiff