RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-03 11:07:41 +00:00
Code Issues Projects Releases Wiki Activity

Add another asf output format type -- asf_stream. The convention is that

Browse Source 
ffserver will always try and use the _stream suffix if possible.

Originally committed as revision 815 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Philip Gladstone 2002-07-27 02:52:23 +00:00
parent b5a093b3a9
commit 8b3c13f9f1
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libav/asf.c
View File

@ -38,6 +38,7 @@ typedef struct {
typedef struct { typedef struct {
int seqno; int seqno;
int packet_size; int packet_size;
int is_streamed;
ASFStream streams[2]; ASFStream streams[2];
/* non streamed additonnal info */ /* non streamed additonnal info */
@ -254,7 +255,7 @@ static int asf_write_header1(AVFormatContext *s, INT64 file_size, INT64 data_chu
bit_rate += enc->bit_rate; bit_rate += enc->bit_rate;
} }
if (url_is_streamed(&s->pb)) { if (asf->is_streamed) {
put_chunk(s, 0x4824, 0, 0xc00); /* start of stream (length will be patched later) */ put_chunk(s, 0x4824, 0, 0xc00); /* start of stream (length will be patched later) */
} }
@ -276,7 +277,7 @@ static int asf_write_header1(AVFormatContext *s, INT64 file_size, INT64 data_chu
put_le64(pb, asf->duration); /* duration (in 100ns units) */ put_le64(pb, asf->duration); /* duration (in 100ns units) */
put_le32(pb, 0); /* start time stamp */ put_le32(pb, 0); /* start time stamp */
put_le32(pb, 0); /* ??? */ put_le32(pb, 0); /* ??? */
put_le32(pb, url_is_streamed(&s->pb) ? 1 : 0); /* ??? */ put_le32(pb, asf->is_streamed ? 1 : 0); /* ??? */
put_le32(pb, asf->packet_size); /* packet size */ put_le32(pb, asf->packet_size); /* packet size */
put_le32(pb, asf->packet_size); /* packet size */ put_le32(pb, asf->packet_size); /* packet size */
put_le32(pb, bit_rate); /* Nominal data rate in bps */ put_le32(pb, bit_rate); /* Nominal data rate in bps */
@ -403,7 +404,7 @@ static int asf_write_header1(AVFormatContext *s, INT64 file_size, INT64 data_chu
cur_pos = url_ftell(pb); cur_pos = url_ftell(pb);
header_size = cur_pos - header_offset; header_size = cur_pos - header_offset;
if (url_is_streamed(&s->pb)) { if (asf->is_streamed) {
header_size += 8 + 30 + 50; header_size += 8 + 30 + 50;
url_fseek(pb, header_offset - 10 - 30, SEEK_SET); url_fseek(pb, header_offset - 10 - 30, SEEK_SET);
@ -453,6 +454,15 @@ static int asf_write_header(AVFormatContext *s)
return 0; return 0;
} }
static int asf_write_stream_header(AVFormatContext *s)
{
ASFContext *asf = s->priv_data;
asf->is_streamed = 1;
return asf_write_header(s);
}
/* write a fixed size packet */ /* write a fixed size packet */
static int put_packet(AVFormatContext *s, static int put_packet(AVFormatContext *s,
unsigned int timestamp, unsigned int duration, unsigned int timestamp, unsigned int duration,
@ -462,7 +472,7 @@ static int put_packet(AVFormatContext *s,
ByteIOContext *pb = &s->pb; ByteIOContext *pb = &s->pb;
int flags; int flags;
if (url_is_streamed(&s->pb)) { if (asf->is_streamed) {
put_chunk(s, 0x4424, asf->packet_size, 0); put_chunk(s, 0x4424, asf->packet_size, 0);
} }
@ -610,7 +620,7 @@ static int asf_write_trailer(AVFormatContext *s)
if (asf->pb.buf_ptr > asf->pb.buffer) if (asf->pb.buf_ptr > asf->pb.buffer)
flush_packet(s); flush_packet(s);
if (url_is_streamed(&s->pb)) { if (asf->is_streamed) {
put_chunk(s, 0x4524, 0, 0); /* end of stream */ put_chunk(s, 0x4524, 0, 0); /* end of stream */
} else { } else {
/* rewrite an updated header */ /* rewrite an updated header */
@ -1066,9 +1076,27 @@ AVOutputFormat asf_oformat = {
asf_write_trailer, asf_write_trailer,
}; };
AVOutputFormat asf_stream_oformat = {
"asf_stream",
"asf format",
"application/octet-stream",
"asf,wmv",
sizeof(ASFContext),
#ifdef CONFIG_MP3LAME
CODEC_ID_MP3LAME,
#else
CODEC_ID_MP2,
#endif
CODEC_ID_MSMPEG4,
asf_write_stream_header,
asf_write_packet,
asf_write_trailer,
};
int asf_init(void) int asf_init(void)
{ {
av_register_input_format(&asf_iformat); av_register_input_format(&asf_iformat);
av_register_output_format(&asf_oformat); av_register_output_format(&asf_oformat);
av_register_output_format(&asf_stream_oformat);
return 0; return 0;
} }