Skip to content

F
ffmpeg.wasm-core
Commit f359a5be authored by Philip Gladstone's avatar Philip Gladstone
Browse files
Options

* Updated so that some streams actually work! 

Originally committed as revision 456 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent bdd3c092
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 76 deletions
doc/ffserver.conf
View file @ f359a5be
...@@ -97,12 +97,17 @@ VideoFrameRate 3 ...@@ -97,12 +97,17 @@ VideoFrameRate 3
# The following abbreviation are defined : sqcif, qcif, cif, 4cif # The following abbreviation are defined : sqcif, qcif, cif, 4cif
VideoSize 160x128 VideoSize 160x128
# transmit only intra frames (useful for low bitrates) # transmit only intra frames (useful for low bitrates, but kills frame rate)
VideoIntraOnly #VideoIntraOnly
# If non intra only, an intra frame is transmitted every VideoGopSize # If non intra only, an intra frame is transmitted every VideoGopSize
# frames Video synchronization can only begin at an I frames. # frames Video synchronization can only begin at an I frames.
#VideoGopSize 12 VideoGopSize 12
# Choose your codecs:
#AudioCodec mp2
#VideoCodec mpeg1video
# Suppress audio # Suppress audio
#NoAudio #NoAudio
...@@ -114,34 +119,34 @@ VideoIntraOnly ...@@ -114,34 +119,34 @@ VideoIntraOnly
# second mpeg stream with high frame rate # second mpeg stream with high frame rate
<Stream test2.mpg> #<Stream test2.mpg>
Feed feed1.ffm #Feed feed1.ffm
Format mpegvideo #Format mpegvideo
VideoBitRate 128 #VideoBitRate 128
VideoFrameRate 25 #VideoFrameRate 25
#VideoSize 352x240 ###VideoSize 352x240
VideoGopSize 25 #VideoGopSize 25
</Stream> #NoAudio
#</Stream>
#
################################################################## ##################################################################
# A stream coming from a file : you only need to set the input # A stream coming from a file : you only need to set the input
# filename and optionnally a new format. Supported conversions: # filename and optionnally a new format. Supported conversions:
# avi -> asf # avi -> asf
# #
<Stream file.asf> # another file streaming
<Stream file.rm>
#File "/tmp/file.avi" File "/usr/local/httpd/htdocs/tlive.rm"
File "tmp/file.avi" NoAudio
# avi must be converted to asf to be streamed
Format asf
</Stream> </Stream>
# another file streaming <Stream file.asf>
<Stream file.mp3>
File "tmp/file.mp3" File "/usr/local/httpd/htdocs/test.asf"
NoAudio
</Stream> </Stream>
...@@ -154,86 +159,83 @@ Feed feed1.ffm ...@@ -154,86 +159,83 @@ Feed feed1.ffm
Format rm Format rm
AudioBitRate 32 AudioBitRate 32
NoVideo NoVideo
NoAudio
</Stream> </Stream>
################################################################## ##################################################################
# Another stream : Real with audio and video at 64 kbits # Another stream : Real with audio and video at 64 kbits
<Stream test.rm> #<Stream test.rm>
Feed feed1.ffm #Feed feed1.ffm
Format rm #Format rm
AudioBitRate 32 #AudioBitRate 32
VideoBitRate 20 #VideoBitRate 128
VideoFrameRate 2 #VideoFrameRate 25
VideoIntraOnly #VideoGopSize 25
#NoAudio
</Stream>
################################################################## #</Stream>
# Another stream : Mpeg audio layer 2 at 64 kbits.
<Stream test.mp2> <Stream test2.rm>
Feed feed1.ffm Feed feed1.ffm
Format mp2 Format rm
AudioBitRate 64
AudioSampleRate 44100
</Stream>
<Stream test1.mp2>
Feed feed1.ffm VideoBitRate 128
Format mp2 VideoFrameRate 15
AudioBitRate 32 VideoGopSize 25
AudioSampleRate 16000 VideoSize 320x240
AudioBitRate 64
</Stream> </Stream>
################################################################## ##################################################################
# Another stream : Multipart JPEG # Another stream : Multipart JPEG
<Stream test.mjpg> #<Stream test.mjpg>
#
Feed feed1.ffm #Feed feed1.ffm
Format mpjpeg #Format mpjpeg
#
VideoFrameRate 2 #VideoFrameRate 2
VideoIntraOnly #VideoIntraOnly
#NoAudio
</Stream> #
#</Stream>
################################################################## ##################################################################
# Another stream : Multipart JPEG # Another stream : Multipart JPEG
<Stream test.jpg> #<Stream test.jpg>
#
Feed feed1.ffm #Feed feed1.ffm
Format jpeg #Format jpeg
#
# the parameters are choose here to take the same output as the ## the parameters are choose here to take the same output as the
# Multipart JPEG one. ## Multipart JPEG one.
VideoFrameRate 2 #VideoFrameRate 2
VideoIntraOnly #VideoIntraOnly
#VideoSize 352x240 ##VideoSize 352x240
#NoAudio
</Stream> #
#</Stream>
################################################################## ##################################################################
# Another stream : Flash # Another stream : Flash
<Stream test.swf> #<Stream test.swf>
Feed feed1.ffm #Feed feed1.ffm
Format swf #Format swf
#
VideoFrameRate 2 #VideoFrameRate 2
VideoIntraOnly #VideoIntraOnly
#NoAudio
</Stream> #
#</Stream>
################################################################## ##################################################################
...@@ -243,11 +245,12 @@ VideoIntraOnly ...@@ -243,11 +245,12 @@ VideoIntraOnly
Feed feed1.ffm Feed feed1.ffm
Format asf Format asf
#
VideoFrameRate 15
VideoSize 352x240
VideoBitRate 128
VideoGopSize 30
AudioBitRate 64 AudioBitRate 64
AudioSampleRate 44100
VideoFrameRate 2
VideoIntraOnly
</Stream> </Stream>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment