On Mar 18, 2014 1:26 AM, "Vittorio Giovara" <[email protected]>
wrote:
>
> ---
> This is the AVPixformatron I thought for future embedding in AVFrame.
> I used this struct in AVCodec too, but maybe a smaller struct could be
used instead?
> Vittorio
>
> doc/APIchanges | 3 +++
> libavcodec/avcodec.h | 68
+---------------------------------------------------
> libavutil/Makefile | 1 +
> libavutil/version.h | 2 +-
> 4 files changed, 6 insertions(+), 68 deletions(-)
Where is the deprecation guard? This would otherwise cause an API break.
>
> diff --git a/doc/APIchanges b/doc/APIchanges
> index 38d18bc..0892266 100644
> --- a/doc/APIchanges
> +++ b/doc/APIchanges
> @@ -13,6 +13,9 @@ libavutil: 2013-12-xx
>
> API changes, most recent first:
>
> +2014-xx-xx - xxxxxxx - lavu 53.07.0 - pixformatron.h
> + Move all color-related types inside lavu.
> +
> 2014-xx-xx - xxxxxxx - lavu 53.06.0 - pixfmt.h
> Add RGBA64 pixel format and variants.
>
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 7beb277..6108b0e 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -37,6 +37,7 @@
> #include "libavutil/frame.h"
> #include "libavutil/log.h"
> #include "libavutil/pixfmt.h"
> +#include "libavutil/pixformatron.h"
> #include "libavutil/rational.h"
>
> #include "version.h"
> @@ -546,73 +547,6 @@ enum AVDiscard{
> AVDISCARD_ALL = 48, ///< discard all
> };
>
> -enum AVColorPrimaries{
> - AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 /
SMPTE RP177 Annex B
> - AVCOL_PRI_UNSPECIFIED = 2,
> - AVCOL_PRI_BT470M = 4,
> - AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R
BT1358 625 / ITU-R BT1700 625 PAL & SECAM
> - AVCOL_PRI_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R
BT1358 525 / ITU-R BT1700 NTSC
> - AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above
> - AVCOL_PRI_FILM = 8,
> - AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020
> - AVCOL_PRI_NB , ///< Not part of ABI
> -};
> -
> -enum AVColorTransferCharacteristic{
> - AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361
> - AVCOL_TRC_UNSPECIFIED = 2,
> - AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700
625 PAL & SECAM
> - AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG
> - AVCOL_TRC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 or 625 /
ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
> - AVCOL_TRC_SMPTE240M = 7,
> - AVCOL_TRC_LINEAR = 8, ///< "Linear transfer characteristics"
> - AVCOL_TRC_LOG = 9, ///< "Logarithmic transfer
characteristic (100:1 range)"
> - AVCOL_TRC_LOG_SQRT = 10, ///< "Logarithmic transfer
characteristic (100 * Sqrt( 10 ) : 1 range)"
> - AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
> - AVCOL_TRC_BT1361_ECG = 12, ///< ITU-R BT1361 Extended Colour Gamut
> - AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
> - AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10 bit system
> - AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12 bit system
> - AVCOL_TRC_NB , ///< Not part of ABI
> -};
> -
> -enum AVColorSpace{
> - AVCOL_SPC_RGB = 0,
> - AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4
xvYCC709 / SMPTE RP177 Annex B
> - AVCOL_SPC_UNSPECIFIED = 2,
> - AVCOL_SPC_FCC = 4,
> - AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R
BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
> - AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R
BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
> - AVCOL_SPC_SMPTE240M = 7,
> - AVCOL_SPC_YCOCG = 8, ///< Used by Dirac / VC-2 and H.264
FRext, see ITU-T SG16
> - AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance
system
> - AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance
system
> - AVCOL_SPC_NB , ///< Not part of ABI
> -};
> -
> -enum AVColorRange{
> - AVCOL_RANGE_UNSPECIFIED = 0,
> - AVCOL_RANGE_MPEG = 1, ///< the normal 219*2^(n-8) "MPEG" YUV
ranges
> - AVCOL_RANGE_JPEG = 2, ///< the normal 2^n-1 "JPEG" YUV
ranges
> - AVCOL_RANGE_NB , ///< Not part of ABI
> -};
> -
> -/**
> - * X X 3 4 X X are luma samples,
> - * 1 2 1-6 are possible chroma positions
> - * X X 5 6 X 0 is undefined/unknown position
> - */
> -enum AVChromaLocation{
> - AVCHROMA_LOC_UNSPECIFIED = 0,
> - AVCHROMA_LOC_LEFT = 1, ///< mpeg2/4, h264 default
> - AVCHROMA_LOC_CENTER = 2, ///< mpeg1, jpeg, h263
> - AVCHROMA_LOC_TOPLEFT = 3, ///< DV
> - AVCHROMA_LOC_TOP = 4,
> - AVCHROMA_LOC_BOTTOMLEFT = 5,
> - AVCHROMA_LOC_BOTTOM = 6,
> - AVCHROMA_LOC_NB , ///< Not part of ABI
> -};
> -
> enum AVAudioServiceType {
> AV_AUDIO_SERVICE_TYPE_MAIN = 0,
> AV_AUDIO_SERVICE_TYPE_EFFECTS = 1,
> diff --git a/libavutil/Makefile b/libavutil/Makefile
> index f663f18..856cb2e 100644
> --- a/libavutil/Makefile
> +++ b/libavutil/Makefile
> @@ -38,6 +38,7 @@ HEADERS = adler32.h
\
> parseutils.h \
> pixdesc.h \
> pixfmt.h \
> + pixformatron.h \
> random_seed.h \
> rational.h \
> samplefmt.h \
> diff --git a/libavutil/version.h b/libavutil/version.h
> index 36070b2..d680979 100644
> --- a/libavutil/version.h
> +++ b/libavutil/version.h
> @@ -54,7 +54,7 @@
> */
>
> #define LIBAVUTIL_VERSION_MAJOR 53
> -#define LIBAVUTIL_VERSION_MINOR 6
> +#define LIBAVUTIL_VERSION_MINOR 7
> #define LIBAVUTIL_VERSION_MICRO 0
>
> #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
> --
> 1.8.3.4 (Apple Git-47)
>
> _______________________________________________
> libav-devel mailing list
> [email protected]
> https://lists.libav.org/mailman/listinfo/libav-devel
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
