Commit Graph
89 Commits
Author SHA1 Message Date
Luca Abeni 41536a6078 Pass the v4l2 buffer into the AVPacket, instead of allocating a new buffer
and copying the frame into it (remove a memcpy())

Originally committed as revision 7981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-14 13:25:24 +00:00
Luca Abeni c7238c72cb Pass a proper context to av_log()
Originally committed as revision 7946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-12 13:38:14 +00:00
Luca Abeni ab1c6dc95c Directly access av_log_level instead of calling av_log_{set, get}_level()
(which will be removed at the next avutil version increment)

Originally committed as revision 7882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-08 18:55:36 +00:00
Luca Abeni 2d529db50f Pass a context to av_log(), when possible
Originally committed as revision 21999 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-23 13:41:45 +00:00
Luca Abeni 434f2c18e8 Increase the av_log() levels, and add some documentation for them
Originally committed as revision 7614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:47:10 +00:00
Luca Abeni d28ef27031 deprecate sws_scale_ordered(), as it now is a duplicate of sws_scale()
Originally committed as revision 21888 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-12 15:45:47 +00:00
Luca Abeni 703b56fb5d Add "support for both orderings of the slices (top->down / bottom->up)"
(r15249) to sws_scale() too (until now, it only was in sws_scale_ordered())

Originally committed as revision 21887 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-12 15:40:08 +00:00
Luca Abeni 40628be0ed __attribute__((unused)) works with gcc 2.95 too
Originally committed as revision 7421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-07 11:11:49 +00:00
Luca Abeni 0dea6433fd replace some av_malloc();memset(...,0,...) sequences with av_mallocz()
Originally committed as revision 21835 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-06 12:11:25 +00:00
Luca Abeni b2afecbe02 change all the occurrences of "FFMIN(FFMAX())" to clip_uint8() or clip()
Originally committed as revision 21776 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 18:08:40 +00:00
Luca Abeni 789237cad0 Mark some variables as possibly unused to avoid warnings
Originally committed as revision 21775 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 17:59:28 +00:00
Luca Abeni 628bc5e862 Add some explicit casts to avoid "assignment from incompatible pointer type"
warnings

Originally committed as revision 21774 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 17:41:38 +00:00
Luca Abeni 44060a7391 Add some other casts, to remove void pointers arithmetic
Originally committed as revision 21773 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 16:28:34 +00:00
Luca Abeni 7d19628b14 Add some explicit casts to avoid some warnings
Originally committed as revision 21772 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 16:21:13 +00:00
Luca Abeni 9effd94abc Remove some void pointers arithmetic
Originally committed as revision 21771 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 16:12:37 +00:00
Luca Abeni d32d303568 Clarify that yuv2rgb_init.c cannot be used under LGPL
Originally committed as revision 21730 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-22 17:57:19 +00:00
Luca Abeni 11c6f4a11c Opss... My last commit was wrong; sorry!
This one moves the GPL check in the right place

Originally committed as revision 7359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-22 15:05:30 +00:00
Luca Abeni 0872a0a6d9 libswscale is not LGPLed, sorry
Originally committed as revision 7358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-22 15:02:39 +00:00
Luca Abeni 19a6be3463 Remove useless include (not needed now that libswscale uses libavutil)
Originally committed as revision 21728 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-22 11:22:49 +00:00
Luca Abeni 7c057f46e8 libswscale can now be compiled under LGPL too
Originally committed as revision 7337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-21 08:01:10 +00:00
Luca Abeni 0683a5c558 Fix compilation of non-MMX code with gcc 2.95
Originally committed as revision 21702 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-20 15:58:15 +00:00
Luca Abeni 9bde778e73 Allow to compile swscale's non-SIMD code under the LGPL license.
Since mplayer always define CONFIG_GPL, this commit should not change
anything for mplayer.

Originally committed as revision 21699 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-20 13:09:29 +00:00
Luca Abeni 807e0c6645 Clarify that some of the non-SIMD code is now LGPLed.
All the authours of such code agreed.

Originally committed as revision 21045 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-19 10:38:12 +00:00
Luca Abeni 7964ed71e9 Synch with ffmpeg's r6938 "allow spaces in source and build directory names..."
Originally committed as revision 20816 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-09 15:13:56 +00:00
Luca Abeni a43fb6b37e Add support for conversions from the rgb565 and rgb555 formats
Originally committed as revision 20605 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-02 09:01:01 +00:00
Luca Abeni 9c5d7c568b AVPicture has 4 planes, not 3
Originally committed as revision 6838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-30 10:15:37 +00:00
Luca Abeni a163ed1aaa Do not use a fake libavcodec/swscale.h, but always use the real one
(from libswscale) instead

Originally committed as revision 6777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-23 17:06:32 +00:00
Luca Abeni 7c9c296648 Properly set EXTRALIBS
(fixes compilation of shared libswscale on cygwin and other platforms)

Originally committed as revision 20413 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-23 14:03:49 +00:00
Luca Abeni 7c7e7464e3 Make read_packet fail is the v4l2 driver returns an unexpected frame size
(driver's bug? If not, we will have to support this in some way)

Originally committed as revision 6756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-22 09:56:08 +00:00
Luca Abeni 96db380836 Implement sws_getCachedContext() in swscale emulation
Originally committed as revision 6718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-17 10:26:37 +00:00
Luca Abeni 44cdb42386 Add support for YUVJ formats
Originally committed as revision 19993 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-27 11:41:36 +00:00
Luca Abeni 87656472f4 Improve swscale-example to test conversions between all the possible
pixel formats

Originally committed as revision 19965 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-24 09:55:18 +00:00
Luca Abeni e9e12f0e11 Remove the dependency of libswscale on img_format.h
Originally committed as revision 19878 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-17 15:15:13 +00:00
Luca Abeni 5784b620d2 Fix the PIX_FMT_* ---> IMGFMT_* conversion (PIX_FMT_RGB32 is IMGFMT_BGR32)
Originally committed as revision 19875 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-17 14:59:55 +00:00
Luca Abeni 00b2fa864e Minimal support for the new pixel formats in libavcodec
Originally committed as revision 6115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-28 14:56:47 +00:00
Luca Abeni 001299bfe8 Add some new pixel formats to libavutil
Originally committed as revision 6112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-28 09:06:04 +00:00
Luca Abeni 7f3f497a0b Allow to compile swscale tests
Originally committed as revision 19476 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-21 12:15:29 +00:00
Luca Abeni a37e9e8606 Allow swscale emulation header to be included by C++ programs
Originally committed as revision 6027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-19 15:14:44 +00:00
Luca Abeni 1246640aa2 Fix compilation as a win32 shared library (libavutil must be explicitly linked)
Originally committed as revision 19416 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-16 20:09:47 +00:00
Luca Abeni 790c9ca72a Enable swscale usage in ffmpeg
Originally committed as revision 5959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-08 18:51:38 +00:00
Luca Abeni c792037176 Another PIX_FMT_ ---> IMGFMT_ conversion
Originally committed as revision 19342 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-05 13:14:34 +00:00
Luca Abeni 0b50ac8a0f Avoid segfaulting if the swscale context cannot be allocated
Originally committed as revision 5936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-05 13:09:42 +00:00
Luca Abeni e7268d51af Fix "-aspect" when "-pad*" is used
Originally committed as revision 5935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-05 12:54:16 +00:00
Luca Abeni 03ae87a3e8 Move output_example.c and ffplay.c to the swscale interface
Originally committed as revision 5923 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-03 16:55:36 +00:00
Luca Abeni 18a54b040d Move ffmpeg.c to the swscale interface
Originally committed as revision 5891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-02 11:50:38 +00:00
Luca Abeni 20dd25adc3 Do not set the codec's pixel format in the format's write_header()
Originally committed as revision 5887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-02 09:48:05 +00:00
Luca Abeni 80d0ded2f7 Add support for ffmpeg's pixel format names in libswscale
Originally committed as revision 19276 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-31 12:35:04 +00:00
Luca Abeni 1ea501aff0 Remove sws_global_init() from swscaler emulation
Originally committed as revision 5830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-27 12:31:31 +00:00
Luca Abeni 6f209cb549 Replace MIN() and MAX() with FFMIN() and FFMAX()
Originally committed as revision 19186 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-26 13:19:02 +00:00
Luca Abeni 2793096fe3 Fix a corner case in sws emulation
Originally committed as revision 5827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-25 15:23:44 +00:00
Luca Abeni 94c4def23c Use libavutil in libswscale, and allow it to be built out of the mplayer tree
Originally committed as revision 19148 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-20 12:13:57 +00:00
Luca Abeni 47adb88609 Install log.h
Originally committed as revision 5790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-19 12:10:01 +00:00
Luca Abeni cea8f6f323 Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
Originally committed as revision 5784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-19 07:28:58 +00:00
Luca Abeni 4b45de0e87 Move av_log() & friends to libavutil
Originally committed as revision 5781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-18 11:00:55 +00:00
Luca Abeni 57b3c36d0f make libswscale build system similar to the libav* one
Originally committed as revision 18994 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-10 12:35:52 +00:00
Luca Abeni 9c39071d6d Move REG_* macros from libavcodec/i386/mmx.h to libavutil/x86_cpu.h
Originally committed as revision 5595 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-03 10:52:07 +00:00
Luca Abeni 2df19ea53a Remove unneeded code
Originally committed as revision 18880 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-01 14:39:14 +00:00
Luca Abeni 73435f006b Move postproc ---> libswscale
Originally committed as revision 18866 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-06-30 12:00:31 +00:00
Luca Abeni 76a77ff291 Properly set the image depth
Originally committed as revision 5538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-28 12:18:22 +00:00
Luca Abeni 3c47c1744a Fix typo
Originally committed as revision 5478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-15 07:36:57 +00:00
Luca Abeni f743a06236 Include the correct video4linux2 header
Originally committed as revision 5430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-30 13:04:18 +00:00
Luca Abeni b997b34fa7 Fix cropping & padding when capturing from a v4l(2) card
Originally committed as revision 5385 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-16 13:43:06 +00:00
Luca Abeni c3f11d199c Simplify the code used for assigning video_resample, video_crop, & video_pad
Originally committed as revision 5306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-20 12:57:19 +00:00
Luca Abeni 490c189bc8 Disable v4l2 is videodev2.h is not "sanitized"
Originally committed as revision 5285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-13 10:00:56 +00:00
Luca Abeni f122deb45c Cosmetic patch: fix indentation (broken by previous cropping / padding
patch)

Originally committed as revision 5280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-10 10:16:13 +00:00
Luca Abeni 07d0cdfc9f Make cropping, padding, and rescaling independent (after this patch,
the cropping / padding code in img_resample() is not needed anymore)

Originally committed as revision 5279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-10 09:04:15 +00:00
Luca Abeni 5341c20954 Baptiste COUDURIER's padding patch (reworked by me a little bit).
Moves padding code to imgconvert.c, and enables padding colorspaces != YUV420P.

Originally committed as revision 5278 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-10 07:45:29 +00:00
Luca Abeni 7b748aff2c Introduce swscale interface in libavcodec
Originally committed as revision 5266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-04 12:35:55 +00:00
Luca Abeni 5d6ed7c141 move enum PixelFormat from libavcodec to libavutil
----------------------------------------------------------------------

Originally committed as revision 5248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-30 16:24:38 +00:00
Luca Abeni c17be81763 Change img_convert() from img_fmt to img_fmt with img_copy()
Originally committed as revision 5236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-29 08:25:09 +00:00
Luca Abeni 60023e3234 Do not be too verbose
Originally committed as revision 5161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-13 09:48:32 +00:00
Luca Abeni 11b9c0f4d3 Tell the user why video capture is failing
Originally committed as revision 5160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-13 09:47:37 +00:00
Luca Abeni 4c4a4e9afe Fix crop & pad + rescaling
Originally committed as revision 5133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-09 15:27:22 +00:00
Luca Abeni 6714e97c30 Rename the "-loop" option defined in ffmpeg.c to "-loop_input" ("-loop"
conflicts with an AVOption)

Originally committed as revision 5077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-28 11:32:31 +00:00
Luca Abeni 24300af416 Add support for drivers that can change the capture size on VIDIOC_S_FMT
Originally committed as revision 5076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-28 11:28:09 +00:00
Luca AbeniandDiego Biurrun 8cecedfbe8 ff_asts_init needs to be inside #ifdef CONFIG_MUXERS, remove some misplaced
CONFIG_MUXERS from adtsenc.c, fixes compilation with --disable-muxers.
patch by Luca Abeni, lucabe72 &at& email &dot& it

Originally committed as revision 5030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-17 21:06:51 +00:00
Luca AbeniandDiego Biurrun 47f388503b Add video4linux2 detection to configure.
patch by Luca Abeni, lucabe72*at*email*dot*it

Originally committed as revision 4963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-08 15:55:41 +00:00
Luca AbeniandDiego Biurrun ad97e414e2 Correctly set the interlaced_frame and top_field_first fields.
patch by Luca Abeni, lucabe72 =at= email =dot= it

Originally committed as revision 4961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-08 11:54:05 +00:00
Luca AbeniandDiego Biurrun 7d453f4500 Set interlaced_frame and top_field_first according to coded_frame.
patch by Luca Abeni, lucabe72 **at&& email ^^dot## it

Originally committed as revision 4919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-02 09:24:13 +00:00
Luca AbeniandDiego Biurrun 0a7b514f13 video4linux2 input support
patch by Luca Abeni, lucabe72 $$at$$ email $$dot$$ it

Originally committed as revision 4916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-01 11:31:33 +00:00
Luca AbeniandRoberto Togni dea42fdf8d ffmpeg forgets to set AVFormatParameters::pix_fmt when capturing from a
v4l card.
In other words, if you type ffmpeg -pix_fmt yuv422 -s 352x288 test.avi
the "-pix_fmt yuv422" option will have no effect.

Patch by Luca Abeni *** lucabe72 !a! email ! it ***

Originally committed as revision 4899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-26 19:38:16 +00:00
Luca AbeniandBenjamin Larsson 14f0c8e28a Parameter added for user to set the cutoff frequency when encoding with faac.
Patch by Luca Abeni - lucabe72 at email dot it.

Originally committed as revision 4837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-10 20:07:29 +00:00
Luca AbeniandMichael Niedermayer 003640635a MPEG4 streaming over RTP patch by (Luca Abeni: lucabe72, email it)
Originally committed as revision 4469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-23 21:48:58 +00:00
Luca AbeniandMichael Niedermayer f2d9a9f5b7 let user set codec even if CODEC_ID_NONE is default patch by (Luca Abeni: lucabe72, email it)
Originally committed as revision 4466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-22 22:24:41 +00:00
Luca AbeniandMichael Niedermayer bac6516545 YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
Originally committed as revision 3710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-24 22:54:16 +00:00
Luca AbeniandMichael Niedermayer 6e454c38b0 A/V Synch in ffmpeg patch by (Luca Abeni <lucabe72 at email dot it>)
Originally committed as revision 3233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-18 03:03:32 +00:00
Luca AbeniandMichael Niedermayer 940aed50ed sample_rate and channels in aac audio patch by (Luca Abeni <lucabe72 at email dot it>)
Originally committed as revision 3198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-05 22:36:43 +00:00
Luca AbeniandMichael Niedermayer ffc0ef960b don't compile ffserver if network is not enabled patch by (Luca Abeni <lucabe72 at email dot it>)
Originally committed as revision 3137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-17 20:24:59 +00:00
Luca AbeniandMichael Niedermayer 3834be5858 fix rounding errors with NTSC patch by (Luca Abeni <lucabe72 at email dot it>)
Originally committed as revision 3084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-27 13:28:16 +00:00