generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Try and fill out some more of the RV header fields correctly

Browse Source 
Originally committed as revision 466 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Philip Gladstone 2002-05-09 01:20:53 +00:00
parent ac5e6a5bd7
commit 5d6ef63fdc
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libav/rm.c
View File

@ -162,6 +162,9 @@ static void rv10_write_header(AVFormatContext *ctx,
put_be32(s, 0); /* start time */ put_be32(s, 0); /* start time */
put_be32(s, BUFFER_DURATION); /* preroll */ put_be32(s, BUFFER_DURATION); /* preroll */
/* duration */ /* duration */
if (url_is_streamed(s) || !stream->total_frames)
put_be32(s, (int)(3600 * 1000));
else
put_be32(s, (int)(stream->total_frames * 1000 / stream->frame_rate)); put_be32(s, (int)(stream->total_frames * 1000 / stream->frame_rate));
put_str8(s, desc); put_str8(s, desc);
put_str8(s, mimetype); put_str8(s, mimetype);
@ -226,9 +229,9 @@ static void rv10_write_header(AVFormatContext *ctx,
put_tag(s,"VIDORV10"); put_tag(s,"VIDORV10");
put_be16(s, stream->enc->width); put_be16(s, stream->enc->width);
put_be16(s, stream->enc->height); put_be16(s, stream->enc->height);
put_be16(s, 24); /* frames per seconds ? */ put_be16(s, (int) stream->frame_rate); /* frames per seconds ? */
put_be32(s,0); /* unknown meaning */ put_be32(s,0); /* unknown meaning */
put_be16(s, 12); /* unknown meaning */ put_be16(s, (int) stream->frame_rate); /* unknown meaning */
put_be32(s,0); /* unknown meaning */ put_be32(s,0); /* unknown meaning */
put_be16(s, 8); /* unknown meaning */ put_be16(s, 8); /* unknown meaning */
/* Seems to be the codec version: only use basic H263. The next /* Seems to be the codec version: only use basic H263. The next
@ -315,6 +318,8 @@ static int rm_write_header(AVFormatContext *s)
stream->nb_packets = 0; stream->nb_packets = 0;
stream->total_frames = stream->nb_packets; stream->total_frames = stream->nb_packets;
break; break;
default:
abort();
} }
} }
@ -478,6 +483,7 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
INT64 codec_pos; INT64 codec_pos;
unsigned int h263_hack_version; unsigned int h263_hack_version;
char buf[128]; char buf[128];
int flags = 0;
if (get_le32(pb) != MKTAG('.', 'R', 'M', 'F')) if (get_le32(pb) != MKTAG('.', 'R', 'M', 'F'))
return -EIO; return -EIO;
@ -521,7 +527,7 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
get_be32(pb); /* index offset */ get_be32(pb); /* index offset */
get_be32(pb); /* data offset */ get_be32(pb); /* data offset */
get_be16(pb); /* nb streams */ get_be16(pb); /* nb streams */
get_be16(pb); /* flags */ flags = get_be16(pb); /* flags */
break; break;
case MKTAG('C', 'O', 'N', 'T'): case MKTAG('C', 'O', 'N', 'T'):
get_str(pb, s->title, sizeof(s->title)); get_str(pb, s->title, sizeof(s->title));
@ -625,6 +631,8 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
} }
header_end: header_end:
rm->nb_packets = get_be32(pb); /* number of packets */ rm->nb_packets = get_be32(pb); /* number of packets */
if (!rm->nb_packets && (flags & 4))
rm->nb_packets = 3600 * 25;
get_be32(pb); /* next data header */ get_be32(pb); /* next data header */
return 0; return 0;
@ -642,6 +650,7 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
AVStream *st; AVStream *st;
int len, num, timestamp, i, tmp, j; int len, num, timestamp, i, tmp, j;
UINT8 *ptr; UINT8 *ptr;
int flags;
redo: redo:
if (rm->nb_packets == 0) if (rm->nb_packets == 0)
@ -653,7 +662,7 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
num = get_be16(pb); num = get_be16(pb);
timestamp = get_be32(pb); timestamp = get_be32(pb);
get_byte(pb); /* reserved */ get_byte(pb); /* reserved */
get_byte(pb); /* flags */ flags = get_byte(pb); /* flags */
rm->nb_packets--; rm->nb_packets--;
len -= 12; len -= 12;
@ -669,6 +678,16 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
goto redo; goto redo;
} }
if (st->codec.codec_type == CODEC_TYPE_VIDEO) {
get_byte(pb);
get_byte(pb);
get_be16(pb);
get_be16(pb);
get_byte(pb);
len -= 7;
}
av_new_packet(pkt, len); av_new_packet(pkt, len);
pkt->stream_index = i; pkt->stream_index = i;
get_buffer(pb, pkt->data, len); get_buffer(pb, pkt->data, len);