History

lavc: Add colorimetry values for BT.2020, other non-included ones

Jan Ekström committed 13 years ago

Commit cd8f7721 parent 446e37d3 files · +32 −16Browse files

Unified · Split

3 files
  1. doc/APIchanges +4 −0
  2. libavcodec/avcodec.h +27 −15
  3. libavcodec/version.h +1 −1
doc/APIchanges+4−0
@@ -13,6 +13,10 @@ libavutil: 2012-10-22 · 12 unmodified lines
1313
1414 API changes, most recent first:
1515
16+2013-11-xx - xxxxxxx - lavc 55.25.0 - avcodec.h
17+ Add ITU-R BT.2020 and other not yet included values to color primaries,
18+ transfer characteristics and colorspaces.
19+
1620 2013-08-xx - xxxxxxx - lavu 52.17.0 - avframe.h
1721 Add AVFrame.flags and AV_FRAME_FLAG_CORRUPT.
1822
libavcodec/avcodec.h+27−15
@@ -546,28 +546,40 @@ enum AVColorPrimaries{ · 545 unmodified lines
546546 AVCOL_PRI_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
547547 AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above
548548 AVCOL_PRI_FILM = 8,
549+ AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020
549550 AVCOL_PRI_NB , ///< Not part of ABI
550551 };
551552
552553 enum AVColorTransferCharacteristic{
553− AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361
554− AVCOL_TRC_UNSPECIFIED = 2,
555− AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
556− AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG
557− AVCOL_TRC_SMPTE240M = 7,
558− AVCOL_TRC_NB , ///< Not part of ABI
554+ AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361
555+ AVCOL_TRC_UNSPECIFIED = 2,
556+ AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
557+ AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG
558+ AVCOL_TRC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
559+ AVCOL_TRC_SMPTE240M = 7,
560+ AVCOL_TRC_LINEAR = 8, ///< "Linear transfer characteristics"
561+ AVCOL_TRC_LOG = 9, ///< "Logarithmic transfer characteristic (100:1 range)"
562+ AVCOL_TRC_LOG_SQRT = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt( 10 ) : 1 range)"
563+ AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
564+ AVCOL_TRC_BT1361_ECG = 12, ///< ITU-R BT1361 Extended Colour Gamut
565+ AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
566+ AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10 bit system
567+ AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12 bit system
568+ AVCOL_TRC_NB , ///< Not part of ABI
559569 };
560570
561571 enum AVColorSpace{
562− AVCOL_SPC_RGB = 0,
563− AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
564− AVCOL_SPC_UNSPECIFIED = 2,
565− AVCOL_SPC_FCC = 4,
566− 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
567− AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
568− AVCOL_SPC_SMPTE240M = 7,
569− AVCOL_SPC_YCOCG = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
570− AVCOL_SPC_NB , ///< Not part of ABI
572+ AVCOL_SPC_RGB = 0,
573+ AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
574+ AVCOL_SPC_UNSPECIFIED = 2,
575+ AVCOL_SPC_FCC = 4,
576+ 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
577+ AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
578+ AVCOL_SPC_SMPTE240M = 7,
579+ AVCOL_SPC_YCOCG = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
580+ AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system
581+ AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system
582+ AVCOL_SPC_NB , ///< Not part of ABI
571583 };
572584
573585 enum AVColorRange{
libavcodec/version.h+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 */
2828
2929 #define LIBAVCODEC_VERSION_MAJOR 55
30−#define LIBAVCODEC_VERSION_MINOR 24
30+#define LIBAVCODEC_VERSION_MINOR 25
3131 #define LIBAVCODEC_VERSION_MICRO 0
3232
3333 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t