- format type (PAL, NTSC, etc.) - color primaries (BT709, SMPTE170M, etc.) - transfer characteristics (BT709, SMPTE170M, etc.) - color matrix ((BT709, SMPTE170M, etc.) These modifications allow the client to specify these attributes and, if specified, makes sure they are written to the output file.
Showing the changes to codec/api (1 of 6 files). Show all
Unified · Split
| @@ -343,8 +343,6 @@ typedef struct { · 342 unmodified lines | |||
| 343 | unsigned int uiSliceSizeConstraint; ///< now only used when uiSliceMode=4 | 343 | unsigned int uiSliceSizeConstraint; ///< now only used when uiSliceMode=4 |
| 344 | } SSliceArgument; | 344 | } SSliceArgument; |
| 345 | 345 | ||
| 346 | // 02/18/2016, Greg Wolfe, Kodak Alaris: Added support for "video signal type present" information. | ||
| 347 | |||
| 348 | /** | 346 | /** |
| 349 | * @brief Enumerate the type of video format | 347 | * @brief Enumerate the type of video format |
| 350 | */ | 348 | */ |
| @@ -416,8 +414,6 @@ typedef enum { · 65 unmodified lines | |||
| 416 | CM_NUM_ENUM | 414 | CM_NUM_ENUM |
| 417 | } EColorMatrix; | 415 | } EColorMatrix; |
| 418 | 416 | ||
| 419 | // ... end 02/18/2016 | ||
| 420 | |||
| 421 | /** | 417 | /** |
| 422 | * @brief Structure for spatial layer configuration | 418 | * @brief Structure for spatial layer configuration |
| 423 | */ | 419 | */ |
| @@ -433,8 +429,7 @@ typedef struct { · 9 unmodified lines | |||
| 433 | 429 | ||
| 434 | SSliceArgument sSliceArgument; | 430 | SSliceArgument sSliceArgument; |
| 435 | 431 | ||
| 436 | // 02/18/2016, Greg Wolfe, Kodak Alaris: Added support for "video signal type present" information. | 432 | // Note: members bVideoSignalTypePresent through uiColorMatrix below are also defined in SWelsSPS in parameter_sets.h. |
| 437 | // See also parameter_sets.h. | ||
| 438 | bool bVideoSignalTypePresent; // false => do not write any of the following information to the header | 433 | bool bVideoSignalTypePresent; // false => do not write any of the following information to the header |
| 439 | unsigned char uiVideoFormat; // EVideoFormatSPS; 3 bits in header; 0-5 => component, kpal, ntsc, secam, mac, undef | 434 | unsigned char uiVideoFormat; // EVideoFormatSPS; 3 bits in header; 0-5 => component, kpal, ntsc, secam, mac, undef |
| 440 | bool bFullRange; // false => analog video data range [16, 235]; true => full data range [0,255] | 435 | bool bFullRange; // false => analog video data range [16, 235]; true => full data range [0,255] |
| @@ -445,7 +440,6 @@ typedef struct { · 4 unmodified lines | |||
| 445 | // smpte240m, linear, log100, log316, iec61966-2-4, bt1361e, iec61966-2-1, bt2020-10, bt2020-12 | 440 | // smpte240m, linear, log100, log316, iec61966-2-4, bt1361e, iec61966-2-1, bt2020-10, bt2020-12 |
| 446 | unsigned char uiColorMatrix; // EColorMatrix; 8 bits in header (corresponds to FFmpeg "colorspace"); 0 - 10 => GBR, bt709, | 441 | unsigned char uiColorMatrix; // EColorMatrix; 8 bits in header (corresponds to FFmpeg "colorspace"); 0 - 10 => GBR, bt709, |
| 447 | // undef, ???, fcc, bt470bg, smpte170m, smpte240m, YCgCo, bt2020nc, bt2020c | 442 | // undef, ???, fcc, bt470bg, smpte170m, smpte240m, YCgCo, bt2020nc, bt2020c |
| 448 | // ... end 02/18/2016 | ||
| 449 | } SSpatialLayerConfig; | 443 | } SSpatialLayerConfig; |
| 450 | 444 | ||
| 451 | /** | 445 | /** |