This also reduce memory usage.
Unified · Split
| @@ -60,11 +60,11 @@ typedef struct FLVMasteringMeta { · 59 unmodified lines | ||
| 60 | 60 | } FLVMasteringMeta; |
| 61 | 61 | |
| 62 | 62 | typedef struct FLVMetaVideoColor { |
| 63 | − uint64_t matrix_coefficients; | |
| 64 | − uint64_t transfer_characteristics; | |
| 65 | − uint64_t primaries; | |
| 66 | − uint64_t max_cll; | |
| 67 | − uint64_t max_fall; | |
| 63 | + enum AVColorSpace matrix_coefficients; | |
| 64 | + enum AVColorTransferCharacteristic trc; | |
| 65 | + enum AVColorPrimaries primaries; | |
| 66 | + uint16_t max_cll; | |
| 67 | + uint16_t max_fall; | |
| 68 | 68 | FLVMasteringMeta mastering_meta; |
| 69 | 69 | } FLVMetaVideoColor; |
| 70 | 70 | |
| @@ -759,7 +759,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, · 688 unmodified lines | ||
| 759 | 759 | if (!strcmp(key, "colorPrimaries")) { |
| 760 | 760 | meta_video_color->primaries = num_val; |
| 761 | 761 | } else if (!strcmp(key, "transferCharacteristics")) { |
| 762 | − meta_video_color->transfer_characteristics = num_val; | |
| 762 | + meta_video_color->trc = num_val; | |
| 763 | 763 | } else if (!strcmp(key, "matrixCoefficients")) { |
| 764 | 764 | meta_video_color->matrix_coefficients = num_val; |
| 765 | 765 | } else if (!strcmp(key, "maxFall")) { |
| @@ -1235,9 +1235,9 @@ static int flv_update_video_color_info(AVFormatContext *s, AVStream *st) · 469 unmodified lines | ||
| 1235 | 1235 | if (meta_video_color->primaries != AVCOL_PRI_RESERVED && |
| 1236 | 1236 | meta_video_color->primaries != AVCOL_PRI_RESERVED0) |
| 1237 | 1237 | st->codecpar->color_primaries = meta_video_color->primaries; |
| 1238 | − if (meta_video_color->transfer_characteristics != AVCOL_TRC_RESERVED && | |
| 1239 | − meta_video_color->transfer_characteristics != AVCOL_TRC_RESERVED0) | |
| 1240 | − st->codecpar->color_trc = meta_video_color->transfer_characteristics; | |
| 1238 | + if (meta_video_color->trc != AVCOL_TRC_RESERVED && | |
| 1239 | + meta_video_color->trc != AVCOL_TRC_RESERVED0) | |
| 1240 | + st->codecpar->color_trc = meta_video_color->trc; | |
| 1241 | 1241 | |
| 1242 | 1242 | if (meta_video_color->max_cll && meta_video_color->max_fall) { |
| 1243 | 1243 | size_t size = 0; |