* 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)
{
return 0;
}
-static int
+int
ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st)
{
ByteIOContext *pb = s->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);
AVStream *st;
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_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)
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;
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
+int
ff_rm_parse_packet (AVFormatContext *s, AVStream *st, int len, AVPacket *pkt,
int *seq, int *flags, int64_t *timestamp)
{
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
+void
ff_rm_retrieve_cache (AVFormatContext *s, AVStream *st, AVPacket *pkt)
{
ByteIOContext *pb = s->pb;
if (ff_rm_parse_packet (s, 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;
AVInputFormat rm_demuxer = {
"rm",
- "rm format",
+ NULL_IF_CONFIG_SMALL("RM format"),
sizeof(RMContext),
rm_probe,
rm_read_header,