Signed-off-by: Stephen Hutchinson <qyo...@gmail.com>
---
libavformat/avisynth.c | 112 +++++++++++++++++++++--------------------
1 file changed, 58 insertions(+), 54 deletions(-)
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index 945ce0e245..ff4435758e 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -107,6 +107,7 @@ typedef struct AviSynthContext {
int frameprop_field_order;
int frameprop_range;
int frameprop_primaries;
+ int frameprop_transfer;
int frameprop_sar;
/* Linked list pointers. */
@@ -611,60 +612,62 @@ static int avisynth_create_stream_video(AVFormatContext
*s, AVStream *st)
}
/* Color Transfer Characteristics */
- switch (avs_library.avs_prop_get_int(avs->env, avsmap,
"_Transfer", 0, &error)) {
- case 1:
- st->codecpar->color_trc = AVCOL_TRC_BT709;
- break;
- case 2:
- st->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED;
- break;
- case 4:
- st->codecpar->color_trc = AVCOL_TRC_GAMMA22;
- break;
- case 5:
- st->codecpar->color_trc = AVCOL_TRC_GAMMA28;
- break;
- case 6:
- st->codecpar->color_trc = AVCOL_TRC_SMPTE170M;
- break;
- case 7:
- st->codecpar->color_trc = AVCOL_TRC_SMPTE240M;
- break;
- case 8:
- st->codecpar->color_trc = AVCOL_TRC_LINEAR;
- break;
- case 9:
- st->codecpar->color_trc = AVCOL_TRC_LOG;
- break;
- case 10:
- st->codecpar->color_trc = AVCOL_TRC_LOG_SQRT;
- break;
- case 11:
- st->codecpar->color_trc = AVCOL_TRC_IEC61966_2_4;
- break;
- case 12:
- st->codecpar->color_trc = AVCOL_TRC_BT1361_ECG;
- break;
- case 13:
- st->codecpar->color_trc = AVCOL_TRC_IEC61966_2_1;
- break;
- case 14:
- st->codecpar->color_trc = AVCOL_TRC_BT2020_10;
- break;
- case 15:
- st->codecpar->color_trc = AVCOL_TRC_BT2020_12;
- break;
- case 16:
- st->codecpar->color_trc = AVCOL_TRC_SMPTE2084;
- break;
- case 17:
- st->codecpar->color_trc = AVCOL_TRC_SMPTE428;
- break;
- case 18:
- st->codecpar->color_trc = AVCOL_TRC_ARIB_STD_B67;
- break;
- default:
- st->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED;
+ if(avs->frameprop_transfer) {
+ switch (avs_library.avs_prop_get_int(avs->env, avsmap,
"_Transfer", 0, &error)) {
+ case 1:
+ st->codecpar->color_trc = AVCOL_TRC_BT709;
+ break;
+ case 2:
+ st->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED;
+ break;
+ case 4:
+ st->codecpar->color_trc = AVCOL_TRC_GAMMA22;
+ break;
+ case 5:
+ st->codecpar->color_trc = AVCOL_TRC_GAMMA28;
+ break;
+ case 6:
+ st->codecpar->color_trc = AVCOL_TRC_SMPTE170M;
+ break;
+ case 7:
+ st->codecpar->color_trc = AVCOL_TRC_SMPTE240M;
+ break;
+ case 8:
+ st->codecpar->color_trc = AVCOL_TRC_LINEAR;
+ break;
+ case 9:
+ st->codecpar->color_trc = AVCOL_TRC_LOG;
+ break;
+ case 10:
+ st->codecpar->color_trc = AVCOL_TRC_LOG_SQRT;
+ break;
+ case 11:
+ st->codecpar->color_trc = AVCOL_TRC_IEC61966_2_4;
+ break;
+ case 12:
+ st->codecpar->color_trc = AVCOL_TRC_BT1361_ECG;
+ break;
+ case 13:
+ st->codecpar->color_trc = AVCOL_TRC_IEC61966_2_1;
+ break;
+ case 14:
+ st->codecpar->color_trc = AVCOL_TRC_BT2020_10;
+ break;
+ case 15:
+ st->codecpar->color_trc = AVCOL_TRC_BT2020_12;
+ break;
+ case 16:
+ st->codecpar->color_trc = AVCOL_TRC_SMPTE2084;
+ break;
+ case 17:
+ st->codecpar->color_trc = AVCOL_TRC_SMPTE428;
+ break;
+ case 18:
+ st->codecpar->color_trc = AVCOL_TRC_ARIB_STD_B67;
+ break;
+ default:
+ st->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED;
+ }
}
/* Matrix coefficients */
@@ -1164,6 +1167,7 @@ static const AVOption avisynth_options[] = {
{ "read_frameprop_field_order", "Read field order from script's frame
properties (AviSynth+ v3.7.1+).", OFFSET(frameprop_field_order),
AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
{ "read_frameprop_range", "Read color range from script's frame properties
(AviSynth+ v3.7.1+).", OFFSET(frameprop_range), AV_OPT_TYPE_BOOL, {.i64 = 1},
0, 1, AV_OPT_FLAG_DECODING_PARAM },
{ "read_frameprop_primaries", "Read color primaries from script's frame
properties (AviSynth+ v3.7.1+).", OFFSET(frameprop_primaries),
AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
+ { "read_frameprop_transfer", "Read color transfer characteristics from
script's frame properties (AviSynth+ v3.7.1+).", OFFSET(frameprop_transfer),
AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
{ "read_frameprop_sar", "Read SAR from script's frame properties
(AviSynth+ v3.7.1+).", OFFSET(frameprop_sar), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0,
1, AV_OPT_FLAG_DECODING_PARAM },
{ NULL },
};
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
