Commit Graph

80 Commits

Author SHA1 Message Date
Philip Gladstone
a8dbe9514f Change order of extensions and read_probe checking. This gives the read_probe
a higher priority than extensions. This gives FFM a chance of working. Note
that some of the other probe functions are bit optimistic, and can be
confused by binary data (such as 0x00 0x00 0x01 0xzz) for some values of zz.

This set of changes makes ffserver work again, and fixes the cannot open
video grab device message.

Originally committed as revision 581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-24 02:09:40 +00:00
Philip Gladstone
07c4ed85f7 * Add a probe function for FFM files
Originally committed as revision 580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-24 02:06:51 +00:00
Philip Gladstone
789bee1264 * Fix a problem caused by a duplicate free of priv_data -- now uses av_freep
* Make sure that the read buffer for the ffm file is allocated in the priv_data.

Originally committed as revision 578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-24 01:19:27 +00:00
Fabrice Bellard
754ebe3465 fixed memory free
Originally committed as revision 552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-20 19:43:20 +00:00
Fabrice Bellard
c9a65ca8c3 converted to new API
Originally committed as revision 547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-20 16:31:13 +00:00
Fabrice Bellard
db7f1f95ac suppressed mpeg demux mess - use now dynamic stream creation api
Originally committed as revision 546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-20 16:29:40 +00:00
Fabrice Bellard
b9a281db69 split mux/demux related structures - added file probing support - improve media file reading API
Originally committed as revision 545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-20 16:28:47 +00:00
Fabrice Bellard
fe9cf0d44e added first version of MPEG/DVB transport stream demux
Originally committed as revision 544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-20 16:27:23 +00:00
Fabrice Bellard
1ea4f59365 use av memory handling functions
Originally committed as revision 528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-18 23:11:09 +00:00
Fabrice Bellard
065422677a fixed pcm read
Originally committed as revision 527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-18 23:09:43 +00:00
Fabrice Bellard
f57a4535bd added VPATH support
Originally committed as revision 526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-18 23:07:57 +00:00
Fabrice Bellard
1c098b2fb6 added dummy crc output format for easy codec testing
Originally committed as revision 525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-18 23:06:13 +00:00
Philip Gladstone
5e57424d11 Fix the WAIT_FEED problem. It turns out that when you open up an FFM
file and seek to an FFM packet, then it is important that the packet
found has a frame header within it. If not, then terrible things happen.
This fixes the problem.

Originally committed as revision 513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-18 21:30:16 +00:00
Philip Gladstone
3884a3c322 Pass over the bit_rate_tolerance field to ffmpeg
Originally committed as revision 500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-16 01:57:55 +00:00
Juanjo
76c0441b10 - Added r_frame_rate in AVStream to store the real frame rate.
- This stuff could be done in AVCodecContext and the real frame rate
calculated in utils.c, but we don't changes in that by now ;)

Originally committed as revision 497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-14 21:50:00 +00:00
Juanjo
92b3e12592 - VCD MPEG-1 compliant stream support (set AVF_FLAG_VCD)
Originally committed as revision 491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-12 21:38:54 +00:00
Juanjo
ab0ff2a563 - Fixes for MPEG-PS which have more than 1 system header, now we don't take
in account the system header just walk through the file searching streams.
  MPEG-PS demuxer needs more work anyway.

Originally committed as revision 485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-11 23:53:04 +00:00
Philip Gladstone
8d1335ea2b * Add implementation of strlcpy
* Fix endless loop in find_info_tag if given specific arguments

Originally committed as revision 481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-10 02:17:41 +00:00
Philip Gladstone
283383715f * Add prototype for strlcpy
Originally committed as revision 480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-10 02:16:29 +00:00
Philip Gladstone
ccac2e27f1 * Add the 'flags' field to the list of codec fields passed from ffserver to
ffmpeg. This gives the VideoHighQuality patch a fighting chance.

Originally committed as revision 479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 12:37:44 +00:00
Philip Gladstone
afc25d93ea * Make put_wav_header return the number of bytes that it put.
Originally committed as revision 468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 01:21:56 +00:00
Philip Gladstone
ec6ac5e1fb * Change extern inline to static inline so that it will compile without optimization
Originally committed as revision 467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 01:21:24 +00:00
Philip Gladstone
5d6ef63fdc * Try and fill out some more of the RV header fields correctly
Originally committed as revision 466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 01:20:53 +00:00
Philip Gladstone
ac5e6a5bd7 * Add defaults to switch statements
Originally committed as revision 465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 01:19:33 +00:00
Philip Gladstone
ddceb31d93 * Add a sleep when doing the post to ffserver. Yes, this is the wrong
solution.

Originally committed as revision 464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 01:19:15 +00:00
Philip Gladstone
28c66901a9 Intialize the codec type to video.
Originally committed as revision 463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 01:18:42 +00:00
Philip Gladstone
20f0154831 * Add the gop_size to the video parameters. Also the audio framesize.
* Copy the duration over as well, though I'm not 100% certain that that is
  still needed.

Originally committed as revision 462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 01:18:08 +00:00
Philip Gladstone
7ac13f0c7e * Change extern inline to static inline. This improves compiling without optimization.
Originally committed as revision 461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 01:16:45 +00:00
Philip Gladstone
53cafac09c * Add default cases to switch statements.
Originally committed as revision 460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 01:16:08 +00:00
Philip Gladstone
6d9872f416 * Add a duration field to the AVPacket
Originally committed as revision 459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 01:15:45 +00:00
Philip Gladstone
1de1cce27d * Make it work with sound cards (like mine) that can only capture in stereo.
* Add a kludge to allow the left channel to be inverted -- my tv card/sound card
  ends up with the left channel = minus right channel. Converting to mono by
  adding the channels doesn't work well.

Originally committed as revision 458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 01:15:21 +00:00
Philip Gladstone
f80c1ac01b * Many, many changes to make it work (mostly). Information snagged from
staring at headers of real ASF files. ASFRecorder and avifile were
  other useful sources.

Originally committed as revision 457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 01:13:43 +00:00
Juanjo
95c79a24e5 - Changed FOURCC for H263.
- Warnings fixes.

Originally committed as revision 430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-02 04:21:22 +00:00
Gert Vervoort
bb3debab2c more msmpeg4 fourccs patch by Gert Vervoort <Gert.Vervoort@wxs.nl>
Originally committed as revision 426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-04-29 18:32:03 +00:00
Zdenek Kabelac
1ac9248bb7 * cleanup
Originally committed as revision 422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-04-26 07:18:57 +00:00
Juanjo
4b1f4f236b - Versions defined for libav/libavcodec.
- Bug fix in wav muxer for MP2 audio.
- ffmpeg/libavcodec version in MPEG-4 user data.

Originally committed as revision 400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-04-15 02:28:05 +00:00
Juanjo
e0d2714adc - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
AC3 set avcodec_context->channels to the desired number channels, if the
setting is 0 AC3 decoder will set it to the channels found in the
stream.
- Changed ffmpeg to cope with the new "way" of AC3 decoding.
- ASF muxer now uses Tickers for PTS calculations.

Originally committed as revision 393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-04-09 04:52:49 +00:00
Philip Gladstone
502d105f96 * patch by Philip Gladstone
Originally committed as revision 390 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-04-08 21:31:24 +00:00
Zdenek Kabelac
4606ac8dee * some minor modification by Philip Gladston
* grab containes new code

Originally committed as revision 388 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-04-08 20:58:56 +00:00
Zdenek Kabelac
a266644f56 * more warning cleanups
* adding const & statics

Originally committed as revision 387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-04-08 15:07:42 +00:00
Zdenek Kabelac
684f44d9a0 * fixing some warnings
Originally committed as revision 386 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-04-08 14:51:42 +00:00
Zdenek Kabelac
6cea494e32 * support for .au .gif .mov .mp4 by François Revol <revol@free.fr>
hmm any opinions about GIF support ?

Originally committed as revision 385 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-04-08 12:32:01 +00:00
Zdenek Kabelac
30b68f33aa * encoding of AC3 with more than 2 channels
by Takashi Iwai <tiwai@suse.de>

Originally committed as revision 383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-04-08 12:08:03 +00:00
Juanjo
10bb7023a2 - Added force_pts to av_write_packet() to be able to force PTS, this helps
(and fix) stream copying. By now force_pts it's just honoured by the MPEG
muxer. ASF could honour this also, but it should be fixed to use Tickers
first.
- MPEG audio decoder exports it's frame size in bytes.
- Hope this fix the floating point exception found in ffserver.

Originally committed as revision 382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-04-07 21:44:29 +00:00
Juanjo
5b0ad91b99 - Fix memory leak and others bugs for ppmpipe. Thanks to Rudolf Opalla.
Originally committed as revision 373 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-04-02 15:07:01 +00:00
Juanjo
af469427b3 - Fix pts calculation on mpeg mux (A/V sync) - Thanks to Lennert Buytenhek
- Fix temporal-reference-glitches for MPEG1 - Thanks to Lennert Buytenhek

Originally committed as revision 343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-03-20 11:16:07 +00:00
Juanjo
001e3f555d - Fixes on MPEG demuxer to handle VOBs without System Header.
Originally committed as revision 335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-03-17 17:44:45 +00:00
Juanjo
1cb0edb40b - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
- Hack in MPEG-2 demux to cope with buggy VOBs.

Originally committed as revision 333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-03-16 02:41:00 +00:00
Juanjo
5798368baf - Added MP3 encoding through libmp3lame contributed by Lennert Buytenhek.
- Changes on AVI and WAV muxers to support MP3.

Originally committed as revision 324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-03-10 14:51:20 +00:00
Juanjo
86bec9a161 - Fix on AVI and WAV headers based on Nikolai Zhubr patch.
- Now the properties of the AVIs are correctly shown, but the MP2 audio
isn't playable, it seems the problems is that Fraunhoffer MP3 decoder
included on Windows cannot decode MP2 streams.

Originally committed as revision 316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-03-01 22:28:30 +00:00