1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

322 Commits

Author SHA1 Message Date
Stefano Sabatini
d7e14c0d10 imgconvert: remove PixFmtInfo.pixel_type field
The field is only used for checking if a format is YUV planar
and if the format is paletted.

This patch replaces the current is_planar_yuv() code with a function
which uses the pixdesc information. The new implementation is less
efficient, but this should not be an issue as the functions which use
it (av_picture_crop/pad()) are deprecated and currently never used in
the codebase.
2011-07-25 11:11:54 +02:00
Stefano Sabatini
3b8bb503ee imgconvert: store padded size information in PixFmtInfo, simplify avg_bits_per_pixel()
Prefer data-driven over procedural logic in avg_bits_per_pixel(),
simplify and improve robustness, as it is easy to miss a function
update when a new format is added.
2011-07-23 17:01:27 +02:00
Stefano Sabatini
49f612ee29 imgconvert: remove useless PixFmtInfo.nb_channels field 2011-07-23 17:01:27 +02:00
Michael Niedermayer
4095fa9038 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dnxhddec: optimise dnxhd_decode_dct_block()
  rtp: remove disabled code
  eac3enc: use different numbers of blocks per frame to allow higher bitrates
  dnxhd: add regression test for 10-bit
  dnxhd: 10-bit support
  dsputil: update per-arch init funcs for non-h264 high bit depth
  dsputil: template get_pixels() for different bit depths
  dsputil: create 16/32-bit dctcoef versions of some functions
  jfdctint: add 10-bit version
  mov: add clcp type track as Subtitle stream.
  mpeg4: add Mpeg4 Profiles names.
  mpeg4: decode Level Profile for MPEG4 Part 2.
  ffprobe: display bitstream level.
  imgconvert: remove unused glue and xglue macros

Conflicts:
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-22 12:08:52 +02:00
Stefano Sabatini
09e8163625 imgconvert: remove unused glue and xglue macros
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-07-21 17:55:27 +02:00
Stefano Sabatini
e71f26086a lavu: add av_get_pix_fmt_name() convenience function
Also deprecate avcodec_get_pix_fmt_name() in its favor.
2011-05-28 18:25:40 +02:00
Stefano Sabatini
8f653e28f5 lavu: add av_get_pix_fmt_name() convenience function
Also deprecate avcodec_get_pix_fmt_name() in its favor.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-05-28 09:44:18 -04:00
Michael Niedermayer
a80f74c584 av_picture_crop(): Support simple cases with packed pixels too.
This fixes a regression when linked to old ffmpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-15 22:37:02 +02:00
Michael Niedermayer
efb5fa79f5 Merge remote branch 'qatar/master'
* qatar/master: (37 commits)
  In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
  lavc: remove reference to opt.h from Makefile.
  prefer avio_check() over url_exist()
  avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
  lavu: remove misc disabled cruft
  lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED  lavu: remove FF_API_OLD_EVAL_NAMES cruft
  lavc: remove misc disabled cruft.
  lavc: remove the FF_API_INOFFICIAL cruft.
  lavc: remove the FF_API_SET_STRING_OLD cruft.
  lavc: remove the FF_API_USE_LPC cruft.
  lavc: remove the FF_API_SUBTITLE_OLD cruft.
  lavc: remove the FF_API_VIDEO_OLD cruft.
  lavc: remove the FF_API_AUDIO_OLD cruft.
  lavc: remove the FF_API_OPT_SHOW cruft.
  lavc: remove the FF_API_MM_FLAGS cruft.
  lavf: remove misc disabled cruft.
  lavf: remove FF_API_INDEX_BUILT cruft
  lavf: remove FF_API_URL_CLASS cruft.
  lavf: remove FF_API_SYMVER cruft
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-20 04:48:23 +02:00
Anton Khirnov
3453a231a6 lavc: remove misc disabled cruft. 2011-04-19 19:01:22 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +01:00
Stefano Sabatini
4ba22e044b Fix avpicture_alloc(), which was aligning the linesizes with 0 and thus
causing a wrong allocation.

Originally committed as revision 25938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-12 15:31:49 +00:00
Stefano Sabatini
6d34323ee6 Make avpicture_alloc() return meaningful values.
Originally committed as revision 25922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-08 10:24:09 +00:00
Stefano Sabatini
0141163d6a Reindent.
Originally committed as revision 25921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-08 10:24:07 +00:00
Stefano Sabatini
e74929e8bb Use av_image_alloc() in avpicture_alloc(), simplify.
Originally committed as revision 25920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-08 10:24:02 +00:00
Stefano Sabatini
bb4afa13dd Deprecate avcodec_pix_fmt_string() in favor of
av_get_pix_fmt_string(), added to libavutil/pixdesc.h.

Originally committed as revision 25879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-04 12:56:21 +00:00
Ramiro Polla
8f190d8b83 fix pointer truncation to int in avpicture_layout()
Originally committed as revision 25793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-22 03:46:31 +00:00
Stefano Sabatini
d2cbdb17b5 Re-implement avpicture_layout() using pixdesc and imgutils API.
The new implementation is more compact, more correct and doesn't hurt
the eyes.

Originally committed as revision 25792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-21 21:25:06 +00:00
Stefano Sabatini
6a269f35ee Replace "depth" with "nb_bits" in the header of avcodec_pix_fmt_string().
Originally committed as revision 25791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-21 21:25:02 +00:00
Stefano Sabatini
119a34f716 In avcodec_pix_fmt_string() use local variable pixdesc rather than
av_pix_fmt_descriptors[pix_fmt], simplify.

Originally committed as revision 25718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-10 20:13:24 +00:00
Stefano Sabatini
2de6f6e828 Make avcodec_pix_fmt_string() use the information in the pixel format
descriptors for printing the number of channels/components.

Also replace the term "nb_channels" with "nb_components" which is more
consistent with the FFmpeg internal terminology, and is somehow
different with respect to the current definition of nb_channels in
PixFmtInfo.

See thread:
Subject: [FFmpeg-devel] [PATCH 6/8] Make avcodec_pix_fmt_string() use the
        information in the pixel format descriptors for printing the
        number of planes. Also replace the term "nb_channels" with
        "nb_planes" which is more correct.
Date: Fri,  5 Nov 2010 12:01:38 +0100

Originally committed as revision 25717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-10 20:13:19 +00:00
Stefano Sabatini
ed5d30d91c Move internal function ff_set_systematic_pal() to libavcore, and
rename it ff_set_systematic_pal2().

Originally committed as revision 25712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-09 22:22:36 +00:00
Stefano Sabatini
46db10ed0e Optimize / simplify avcodec_get_pix_fmt_name() check.
Originally committed as revision 25689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-07 15:04:35 +00:00
Stefano Sabatini
a5f27f6db8 Use av_pix_fmt_descriptors information in avcodec_pix_fmt_string().
Originally committed as revision 25688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-07 13:30:39 +00:00
Stefano Sabatini
f35a41ff5d Make avpicture_fill() return a meaningful error code.
Originally committed as revision 25687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-07 13:30:36 +00:00
Stefano Sabatini
24409b5053 Remove alpha information from avcodec_pix_fmt_string(), as that
information does not belong to the pixel format.

Originally committed as revision 25686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-07 13:01:12 +00:00
Maksym Veremeyenko
b299c4e4d3 Support deinterlacing of YUVJ422P in old deinterlacer.
Patch by Maksym Veremeyenko verem at m1stereo tv.

Originally committed as revision 25195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 14:37:54 +00:00
Benjamin Larsson
4792d1e792 Support deinterlacing of YUVJ420P.
Originally committed as revision 25148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-20 11:34:27 +00:00
Stefano Sabatini
4afbcf46c9 Reindent.
Originally committed as revision 25068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 21:23:59 +00:00
Stefano Sabatini
34017fd9b2 Move av_picture_data_copy() to libavcore, and rename it
av_image_copy().

Originally committed as revision 25067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 21:23:55 +00:00
Stefano Sabatini
e7eb2033ff Reimplement av_picture_data_copy() avoiding the use of PixFmtInfo
information.

Required for moving the function to libavcore.

Originally committed as revision 25066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 21:23:52 +00:00
Stefano Sabatini
03ff61167e Reindent after the last commit.
Originally committed as revision 25065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 21:23:48 +00:00
Stefano Sabatini
9686abb826 Reimplement ff_img_copy_plane() as av_image_copy_plane() in libavcore,
and deprecate the old function.

Originally committed as revision 25064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 21:23:45 +00:00
Stefano Sabatini
e16f217ceb Use new imgutils.h API names, fix deprecation warnings.
Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 19:15:29 +00:00
Stefano Sabatini
c901f6ab6f Cosmetics: remove useless ().
Originally committed as revision 24860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-21 15:18:54 +00:00
Stefano Sabatini
81c1ecabab Deprecate ff_get_plane_bytewidth() in favor of
av_get_image_linesize().

Originally committed as revision 24787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-12 15:06:04 +00:00
Stefano Sabatini
7906e2b974 Implement av_get_image_linesize() and use it in
ff_get_plane_bytewidth().

The new implementation is more generic, more compact and more correct.

Originally committed as revision 24786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-12 15:05:58 +00:00
S.N. Hemanth Meenakshisundaram
9f08d80363 Add av_picture_data_copy() and reimplement av_picture_copy() as a
wrapper of it.

The new function is more generic, and does not depend on the
definition of the AVPicture struct.

Patch by S.N. Hemanth Meenakshisundaram s + "meenakshisundaram".substr(0, 7) + "@ucsd.edu".

Originally committed as revision 24768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 14:18:52 +00:00
Stefano Sabatini
6ce9b4310c Remove use of the deprecated function avcodec_check_dimensions(), use
av_check_image_size() instead.

Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 09:37:04 +00:00
Stefano Sabatini
05236ed735 Use av_fill_image_pointers/linesizes in place of ff_fill_pointer/linesize,
and drop the the ff_ variants at the next major bump.

Originally committed as revision 24620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-31 16:46:20 +00:00
Vitor Sessak
0913a92a59 Fix compilation with --disable-yasm. 10l to me.
Originally committed as revision 24617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-31 16:17:54 +00:00
Vitor Sessak
de4bc44abb Convert deinterlacing MMX code to YASM
Originally committed as revision 24615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-31 14:50:51 +00:00
Stefano Sabatini
fc2db52e2f Make avpicture_fill() directly call av_fill_image_linesizes() and
av_fill_image_pointers() rather than their wrappers ff_fill_linesize()
and ff_fill_pointer().

Improve performance.

Originally committed as revision 24587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-30 08:42:08 +00:00
Stefano Sabatini
e7bd48a6ae Move fill_image_linesize() and fill_image_data_ptr() from
libavcodec/imgconvert.c and make them public in libavcore/imgutils.h,
with the names av_fill_image_linesizes() and av_fill_image_pointers().

Originally committed as revision 24583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-29 23:44:57 +00:00
S.N. Hemanth Meenakshisundaram
9dd9d67bd0 Define static functions fill_image_linesize() and
fill_image_data_ptr(). ff_fill_linesize() and ff_fill_pointer() now wrap
these functions.

The new functions are more generic, and are going to be exported in a
future patch.

Patch by S.N. Hemanth Meenakshisundaram smeenaks # ucsd § edu.

Originally committed as revision 24512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 14:30:47 +00:00
Stefano Sabatini
2b4abbd6f5 Move colorspace.h from libavcodec to libavutil.
Avoid a compile-time dependency of the pad filter on libavcodec.

Originally committed as revision 23940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 18:49:44 +00:00
Stefano Sabatini
2839c56ea6 Fix width computation for nv12/nv21 in ff_get_plane_bytewidth().
Originally committed as revision 23507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-06 18:29:39 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Andreas Öman
4744f896e5 Add PIX_FMT_Y400A, 8bit gray, 8bit alpha
Originally committed as revision 22881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-14 20:15:19 +00:00
Stefano Sabatini
21302fed02 Make ff_fill_linesize() use the information stored in
av_pix_fmt_descriptors.

Allow simplification and a more generic implementation.

Originally committed as revision 22836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-11 14:09:05 +00:00
Vitor Sessak
09ab885975 Round correctly chroma picture height.
Fix issue 956.

Originally committed as revision 22223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 20:04:24 +00:00
Janusz Krzysztofik
2b7cf1678e Add initial support for 12-bit color mode.
Patch by Janusz Krzysztofik jkrzyszt tis icnet pl
Original thread:
Subject: [FFmpeg-devel] [PATCH v2] Add initial support for 12-bit color mode.
Date: Mon, 1 Mar 2010 02:05:07 +0100

Originally committed as revision 22220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 08:26:23 +00:00
Janusz Krzysztofik
4ef82b174a Fix BGR cases missing from depth test in avcodec_get_pix_fmt_loss().
Patch by Janusz Krzysztofik:
<${name initial}${surname less the final "ofik"}@tis.icnet.pl>.

Originally committed as revision 22215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 00:50:13 +00:00
Carl Eugen Hoyos
4443c0e9a9 Include internal.h and imgconvert.h, they contain the prototypes for the
following functions:
ff_is_hwaccel_pix_fmt(), ff_set_systematic_pal(), ff_fill_linesize(),
ff_fill_pointer(), ff_get_plane_bytewidth()

Originally committed as revision 22106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 03:52:10 +00:00
Stefano Sabatini
80a07f6e47 Implement av_get_pix_fmt(), and deprecate avcodec_get_pix_fmt().
Originally committed as revision 21545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 18:50:00 +00:00
Carl Eugen Hoyos
f0bc8449b8 Use PIX_FMT_NONE for -1 when enum PixelFormat is expected (fixes two icc warnings).
Originally committed as revision 20860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 11:18:28 +00:00
Stefano Sabatini
78149213cc Cosmetics: remove empty definitions of hw-accelerated PixFmtInfo
structs.

Originally committed as revision 20733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-04 23:16:27 +00:00
Stefano Sabatini
106c72faad Use pixel formats names defined in av_pix_fmt_descriptors rather than
in those in pix_fmt_info, and remove the not anymore used
PixFmtInfo.name field.

Originally committed as revision 20636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-28 01:13:43 +00:00
Stefano Sabatini
f72d40b01a Remove unused PixFmtInfo.is_hwaccel field.
Originally committed as revision 20635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-28 00:53:15 +00:00
Stefano Sabatini
797229a6a2 Make avcodec_get_pix_fmt_name() use av_pix_fmt_descriptors rather than
pix_fmt_info.

Originally committed as revision 20625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-26 21:04:33 +00:00
Stefano Sabatini
14b903f389 Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
av_pix_fmt_descriptors log2_chroma_w and log2_chroma_h values instead.

Originally committed as revision 20622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-26 20:00:03 +00:00
Stefano Sabatini
38264abb06 Use av_pix_fmt_descriptors in avcodec_get_chroma_sub_sample(), rather
than the PixFmtInfo x_chroma_shift and y_chroma_shift fields.

Originally committed as revision 20617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-26 00:33:19 +00:00
Stefano Sabatini
8e861e1b1e Use av_pix_fmt_descriptors in ff_is_hwaccel_pix_fmt() rather than
access the PixFmtInfo.is_hwaccel field which is going to be removed.

Originally committed as revision 20616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-25 23:52:20 +00:00
Ramiro Polla
f2526204a4 Fix nv12/nv21 handling. linesize for plane 1 should account for both chroma
planes instead of just doubling the height while computing plane sizes. Also
adjust avpicture_layout() to copy the correct amount of data for plane 1.

Originally committed as revision 20610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-25 17:14:48 +00:00
Ramiro Polla
b16569d256 Indent
Originally committed as revision 20562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-20 11:38:37 +00:00
Stefano Sabatini
bf72597ef4 Fix name for PIX_FMT_NV21 PixFmtInfo entry.
Originally committed as revision 20555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-19 22:56:57 +00:00
Vitor Sessak
51ae2142d5 Fix palette copying in av_picture_copy(). Previous code worked only if
linesize[1] == 1, which does not make sense.

Originally committed as revision 20503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-10 19:36:58 +00:00
NVIDIA Corporation
70e0c871eb Add VDPAU hardware accelerated decoding for MPEG-4 ASP which can be used
by video players.

Original patch by NVIDIA corporation.

Originally committed as revision 20502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-10 18:52:39 +00:00
Reimar Döffinger
9881d05d80 100l in avpicture_layout: width of chroma planes depends on format depth, too.
Fixes issue 1465

Originally committed as revision 20202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-11 07:05:26 +00:00
Justin Ruggles
65935bc729 simplify format string for writing pix_fmt string.
Originally committed as revision 20034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-26 22:54:29 +00:00
Justin Ruggles
84e30ef992 Align pix_fmt list by allowing one more char for the pix_fmt name.
Originally committed as revision 20024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-25 01:31:53 +00:00
Lars Täuber
35f6c15405 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
Patch by Lars Täuber <lars <dot> taeuber <at> gmx <dot> net>.

Originally committed as revision 19775 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-05 23:33:25 +00:00
Alexis Ballier
ffd38d8b64 Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
endian counterparts.

Patch by Alexis Ballier, alexis D ballier gmail

Originally committed as revision 19626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-11 16:18:55 +00:00
Måns Rullgård
63613fe615 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-26 12:20:04 +00:00
Måns Rullgård
4a30fff60d Fix argument type mismatches for av_picture_crop and av_picture_fill
Originally committed as revision 19314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-01 10:36:18 +00:00
Michael Niedermayer
6c2a860875 Add 420,422 and 444 planar 16bit per component pix formats.
Originally committed as revision 18636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-21 01:02:48 +00:00
Michael Niedermayer
16a5f4caa9 Remove a useless assignment in img_get_alpha_info() found by CSA.
Originally committed as revision 18582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 18:22:19 +00:00
Michael Niedermayer
f8112810cf Remove redundant assignment in av_picture_copy() found by CSA.
Originally committed as revision 18581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 18:20:12 +00:00
Michael Niedermayer
87718654b1 Remove redundant assignment from avcodec_get_pix_fmt_loss() found by CSA.
Originally committed as revision 18564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 15:10:37 +00:00
Baptiste Coudurier
bee3140a88 fix indentation
Originally committed as revision 18503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-14 00:12:54 +00:00
Baptiste Coudurier
de481d7fed avoid strcmp NULL, fix segv on mingw
Originally committed as revision 18502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-14 00:12:29 +00:00
Stefano Sabatini
6e08ca9c51 Make the pixel formats which were defined as macros:
PIX_FMT_ARGB
PIX_FMT_RGBA
PIX_FMT_ABGR
PIX_FMT_BGRA

defined as enum PixelFormat values, and viceversa make:
PIX_FMT_RGB32
PIX_FMT_RGB32_1
PIX_FMT_BGR32
PIX_FMT_BGR32_1

defined as macros, also resort accordingly the enum PixelFormat
list.
Also make avcodec_get_pix_fmt() recognize the "rgb32" and "bgr32"
aliases, in order to make ffmpeg pass regressions test.

This change breaks ABI backward compatibility.

Originally committed as revision 18163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 22:50:19 +00:00
Stefano Sabatini
326e9eaa20 Factorize: use the X_NE() macro in avcodec_get_pix_fmt().
Originally committed as revision 18160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 22:13:10 +00:00
Stefano Sabatini
8199ea3b8c Implement X_NE() macro.
Originally committed as revision 18158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 22:10:36 +00:00
Stefano Sabatini
f82674e584 Change the RGB5X5/BGR5X5 pixel format defines so that we have little
endian and big endian variants instead of native-endian ones.

This patch breaks API/ABI backward-compatibility.

Originally committed as revision 18133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 23:08:20 +00:00
Stefano Sabatini
d89f692f0e Extend the behavior of avcodec_get_pix_fmt(), if it cannot find a
pixel format for the provided name, make it look for the native endian
variant of the name.

Originally committed as revision 18130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 22:43:46 +00:00
Stefano Sabatini
a61ec8e7ae Globally prefer enum PixelFormat over int when it makes sense.
Originally committed as revision 18129 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 22:24:44 +00:00
Reimar Döffinger
899a8fa1cb Fix avpicture_get_size for non-paletted formats with a helper palette
to not include the size of that palette.
Also clarify its documentation.

Originally committed as revision 18106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 10:25:20 +00:00
Reimar Döffinger
b435725b4c Do not set linesize for palette data, it does not make sense and creates
problems with following patch to fix linesize alignment.

Originally committed as revision 18046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-19 21:31:10 +00:00
Michael Niedermayer
6d4f53cbac Remove old scaler.
Originally committed as revision 17786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 22:51:30 +00:00
Gwenole Beauchesne
0d8ee24c7b Set PixFmtInfo::{x, y}_chroma_shift for VDPAU and VAAPI formats.
Originally committed as revision 17766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 13:43:24 +00:00
Cédric Schieli
5f59207d94 Fix avpicture_layout to not chroma shift the alpha plane when outputting YUVA420P
Originally committed as revision 17654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 07:31:36 +00:00
Gwenole Beauchesne
f06ce1ce89 Add VA API pixel formats.
Patch by Gwenole Beauchesne.

Originally committed as revision 17634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 08:12:41 +00:00
Michael Niedermayer
c269cf68a0 Approved hunks for VAAPI / our new shiny hwaccel API
by Gwenole Beauchesne gbeauchesne splitted desktop com

Originally committed as revision 17539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-23 13:35:52 +00:00
Daniel Verkamp
5ef251e504 Add missing av_cold in static init/close functions.
Patch by Daniel Verkamp daniel at drv dot nu.

Originally committed as revision 17526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 13:48:55 +00:00
Peter Ross
88c21a6f14 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
Originally committed as revision 17510 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 00:55:49 +00:00
Patrik Kullman
c7efffcb44 Add a default (error) for the switch in case of an unsupported PIX_FMT.
Removes warnings about possibly uninitialized variables.
Patch by Patrik Kullman %patrik A yes P nu%

Originally committed as revision 17130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 12:38:56 +00:00
Michael Niedermayer
6337178b4f Ensure that the palette is set in data[1] for all 8bit formats.
Also document it.

Originally committed as revision 17018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-06 12:59:50 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
NVIDIA Corporation
c5b42f4a80 Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
be used by video players.

Original patch by NVIDIA corporation.

Originally committed as revision 16699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 09:28:36 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
NVIDIA Corporation
d37edddc09 Add VDPAU hardware accelerated decoding for MPEG1 and MPEG2 which can
be used by video players.

Original patch by NVIDIA corporation.

Originally committed as revision 16628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 02:14:07 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
NVIDIA Corporation
369122dd77 Add VDPAU hardware accelerated decoding for H264 which can be used by
video players.

Original patch by NVIDIA corporation.

Originally committed as revision 16431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-04 23:55:27 +00:00
Diego Biurrun
a6493a8fbd Rename libavcodec/i386/ --> libavcodec/x86/.
It contains optimizations that are not specific to i386 and
libavutil uses this naming scheme already.

Originally committed as revision 16270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-22 09:12:42 +00:00
Anders Grönberg
31c3a4dc7e Prevent shift overflow, patch by Anders Grönberg, galileo.m2 gmail com.
Originally committed as revision 16121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 12:30:34 +00:00
Aurelien Jacobs
d08ea32c23 Get rid of mmx_t.
Originally committed as revision 16116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 00:46:27 +00:00
Art Clarke
bc48bb0822 Remove unused variable, patch by Art Clarke, aclarke vlideshow com.
Originally committed as revision 15748 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-30 09:13:48 +00:00
Art Clarke
a9a8c830cf Fix av_picture_copy missing pixels on packed planar AVPictures with odd size.
patch by Art Clarke, aclarke vlideshow com

Originally committed as revision 15744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-29 23:07:49 +00:00
Diego Pettenò
782fc0c36f Rename template included sources from .h to _template.c.
There are multiple source files that are #include'd rather than
compiled, as they are used as template for generation of similar code,
like asm-optimised code. Some of these files are right now named with
a .h extension, although they are not header in any reasonable sense.

Rename them so that instead of being named with .h extension they are
named with _template.c as final part.

Originally committed as revision 15730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-27 14:35:58 +00:00
Michael Niedermayer
9d21494776 avcodec_find_best_pix_fmt() needs a 64bit mask as there are more than 32 pix_fmts.
Originally committed as revision 15271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 18:29:08 +00:00
Michael Niedermayer
d578432db8 Remove stuff under #if LIBAVCODEC_VERSION_INT.
Originally committed as revision 15263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 15:03:17 +00:00
Peter Ross
42a45a03e7 Add graceful error handling to avcodec_get_pix_fmt_name() and avcodec_get_pix_fmt().
Originally committed as revision 14513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 00:41:31 +00:00
Baptiste Coudurier
1be97a218e memcpy considering output width, not src linesize, fix segv with av_picture_pad
Originally committed as revision 13594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-01 02:28:33 +00:00
Michael Niedermayer
8e6f8869ab Do not read from prior the array, fix CID 127.
Originally committed as revision 13471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 19:44:56 +00:00
Diego Biurrun
ccd425e799 Remove unnecessary parentheses from return calls.
Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-06 09:16:36 +00:00
Diego Biurrun
b0605329c9 Move functions that are only used when libswscale is not compiled in below
the appropriate #ifdef. This avoids a bunch of "defined but not used" warnings
when compiling with libswscale enabled.

Originally committed as revision 12463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 17:34:31 +00:00
Diego Biurrun
13ca50f367 Rename --enable-swscaler --> enable-swscale to be consistent with the
directory name and other option names. Also rename variables accordingly.

Originally committed as revision 12408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 17:54:24 +00:00
Vitor Sessak
6dd36490c7 This should not be part of the public API
Originally committed as revision 11960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 20:19:46 +00:00
Vitor Sessak
fba95d3c23 My commit in r11942 broke compilation.
This fixes it.

Originally committed as revision 11959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 19:47:14 +00:00
Vitor Sessak
cc9853d38f Split avpicture_fill() in two functions. This will be
useful for libavfilter and to simplify
avcodec_default_get_buffer().

Originally committed as revision 11942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 18:01:07 +00:00
Diego Biurrun
5e53486545 typo fix: inited --> initialized
Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 09:26:10 +00:00
Vitor Sessak
22ed53e5f4 Factor bytewidth determination in its own function
Originally committed as revision 11907 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 21:49:24 +00:00
Baptiste Coudurier
e151e272a0 cast to dest type, fix warning imgconvert.c:1958: warning: assignment from incompatible pointer type
Originally committed as revision 11675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:00:08 +00:00
Baptiste Coudurier
86404ffba2 avoid infinite loop if pixel format conversion does not exist
Originally committed as revision 11259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-18 13:49:58 +00:00
Vitor Sessak
52b541ad79 spelling
Originally committed as revision 11122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-01 22:21:04 +00:00
Andrea Gualano
2a7feb18c4 Enable avpicture_deinterlace() for PIX_FMT_GRAY8.
Patch by Andrea Gualano, gualano T imavis O com

Originally committed as revision 10712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-11 22:31:08 +00:00
Ronald S. Bultje
55ffe9df2a Use emms_c() instead of ifdef
patch by: Ronald S. Bultje rsbultje a gmail d com

Originally committed as revision 10616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-29 15:09:34 +00:00
Aurelien Jacobs
b70335a28d add support for yuva420p colorspace (yuv420p + alpha)
Originally committed as revision 10565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-24 13:21:41 +00:00
Andreas Öman
4196cfb75b add YUV440P and YUVJ440P support
patch by Andreas Öman: \andreas olebyn nu/
original thread: [FFmpeg-devel] half vertical chroma resolution from JPEGs..
date: 07/03/2007 01:29 PM

Originally committed as revision 9732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-18 08:11:16 +00:00
Diego Biurrun
f1ea5c2a96 typo fixes
Originally committed as revision 9719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-17 12:57:50 +00:00
Ian Caulfield
04d2e45f3f create colorspace.h and use it where appropriate
patch by Ian Caulfield: /ian caulfield gmail com/

Originally committed as revision 9716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-17 12:33:14 +00:00
Stefano Sabatini
c3b95b1d3d Add support for listing the supported pixel formats using the option
-pix_fmt list
patch by Stefano Sabatini stefano sabatini minus lala chez poste it
original thread: [FFmpeg-devel] [PATCH] List supported pixel formats
date: 05/25/2007 05:46 PM

Originally committed as revision 9162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-30 14:20:55 +00:00
Diego Biurrun
42610c4983 Remove redundant fastmemcpy.h #include, it is indirectly #included by avutil.h.
Originally committed as revision 9145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-28 09:30:41 +00:00
Ivo van Poorten
e5b5149603 Fix segmentation fault for gray16le to gray conversion.
Originally committed as revision 8648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 19:24:27 +00:00
Panagiotis Issaris
636d6a4a47 Add the prefix "av_" to img_crop(), img_copy() and img_pad(), and rename "img"
to "picture" as suggested by Baptiste Coudurier.

Originally committed as revision 8220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-04 11:53:11 +00:00
Panagiotis Issaris
392cf77a4b Move the unaltered documentation of the functions which are part of the public
API out of imgconvert.c into avcodec.h.

Originally committed as revision 8121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-25 07:53:44 +00:00
Guillaume Poirier
bb0f999bbb add doxygen docs for avpicture_fill()
Patch  by Panagiotis Issaris % takis P issaris A uhasselt P be %

Originally committed as revision 8034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-20 08:35:25 +00:00
Diego Biurrun
dc02fc6a68 consistency renaming: yuv422 --> yuyv422
Originally committed as revision 7959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-12 23:23:05 +00:00
Diego Biurrun
9ac529a5ba consistency renaming: uyvy411 --> uyyvyy411
Originally committed as revision 7958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-12 23:15:38 +00:00
Diego Biurrun
3cf5b6bed7 consistency renaming: rgba32 --> rgb32
Originally committed as revision 7957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-12 23:07:17 +00:00
Diego Biurrun
71e445fca3 Replace deprecated PIX_FMT names by the newer variants.
Originally committed as revision 7867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-07 01:48:09 +00:00
Luca Barbato
79acfb0e13 Avoid branches in the loop and solve a gcc warning
Originally committed as revision 7566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 11:02:07 +00:00
Luca Barbato
6845801f82 Cosmetics
Originally committed as revision 7564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 10:47:58 +00:00
Alex Beregszaszi
20d46c038a Remove alpha channel from RGB555
Originally committed as revision 7106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 20:46:36 +00:00
Alex Beregszaszi
08d23410ea BGR555 has never been working as alpha supporting format. Remove the false setting.
Originally committed as revision 7105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 20:43:29 +00:00
Alex Beregszaszi
b362567605 changed rgba32_to routines to support both alpha and non-alpha formats (see r7066 too)
Originally committed as revision 7067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 19:53:22 +00:00
Måns Rullgård
55fde95e3b rename cropTbl -> ff_cropTbl
Originally committed as revision 6992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-12 20:08:09 +00:00