Skip to content

Commit c98ae61

Browse files
pinterfpinterf
committed
ColorRange-Range transition step 1: rename class to _compat, enums to AVS_COLORRANGE_xx,, declare ITU conform one (not used)
1 parent 4bbf619 commit c98ae61

11 files changed

Lines changed: 64 additions & 56 deletions

File tree

‎avs_core/convert/convert_bits.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,12 +1173,12 @@ ConvertBits::ConvertBits(PClip _child, const int _dither_mode, const int _target
11731173

11741174
// full or limited decision
11751175
// dest: if undefined, use src
1176-
if (_ColorRange_dest != ColorRange_e::AVS_RANGE_LIMITED && _ColorRange_dest != ColorRange_e::AVS_RANGE_FULL) {
1176+
if (_ColorRange_dest != ColorRange_Compat_e::AVS_COLORRANGE_LIMITED && _ColorRange_dest != ColorRange_Compat_e::AVS_COLORRANGE_FULL) {
11771177
_ColorRange_dest = _ColorRange_src;
11781178
}
11791179
//
1180-
fulls = _ColorRange_src == ColorRange_e::AVS_RANGE_FULL;
1181-
fulld = _ColorRange_dest == ColorRange_e::AVS_RANGE_FULL;
1180+
fulls = _ColorRange_src == ColorRange_Compat_e::AVS_COLORRANGE_FULL;
1181+
fulld = _ColorRange_dest == ColorRange_Compat_e::AVS_COLORRANGE_FULL;
11821182

11831183
if (!truerange) {
11841184
if ((target_bitdepth == 8 || target_bitdepth == 32) && pixelsize == 2)
@@ -1307,14 +1307,14 @@ AVSValue __cdecl ConvertBits::Create(AVSValue args, void* user_data, IScriptEnvi
13071307
int ColorRange_src;
13081308
int ColorRange_dest;
13091309
if (args[5].Defined())
1310-
ColorRange_src = args[5].AsBool() ? ColorRange_e::AVS_RANGE_FULL : ColorRange_e::AVS_RANGE_LIMITED;
1310+
ColorRange_src = args[5].AsBool() ? ColorRange_Compat_e::AVS_COLORRANGE_FULL : ColorRange_Compat_e::AVS_COLORRANGE_LIMITED;
13111311
else
13121312
ColorRange_src = -1; // undefined. A frame property may override
13131313
if (args[6].Defined())
1314-
ColorRange_dest = args[6].AsBool() ? ColorRange_e::AVS_RANGE_FULL : ColorRange_e::AVS_RANGE_LIMITED;
1314+
ColorRange_dest = args[6].AsBool() ? ColorRange_Compat_e::AVS_COLORRANGE_FULL : ColorRange_Compat_e::AVS_COLORRANGE_LIMITED;
13151315
else
13161316
ColorRange_dest = -1; // undefined. A frame property or ColorRange_src may override
1317-
if (ColorRange_src != ColorRange_e::AVS_RANGE_LIMITED && ColorRange_src != ColorRange_e::AVS_RANGE_FULL) {
1317+
if (ColorRange_src != ColorRange_Compat_e::AVS_COLORRANGE_LIMITED && ColorRange_src != ColorRange_Compat_e::AVS_COLORRANGE_FULL) {
13181318
// try getting frame props if parameter is not specified
13191319
auto frame0 = clip->GetFrame(0, env);
13201320
const AVSMap* props = env->getFramePropsRO(frame0);
@@ -1323,15 +1323,15 @@ AVSValue __cdecl ConvertBits::Create(AVSValue args, void* user_data, IScriptEnvi
13231323
}
13241324
else {
13251325
// no param, no frame property -> rgb is full others are limited
1326-
ColorRange_src = vi.IsRGB() ? ColorRange_e::AVS_RANGE_FULL : ColorRange_e::AVS_RANGE_LIMITED;
1326+
ColorRange_src = vi.IsRGB() ? ColorRange_Compat_e::AVS_COLORRANGE_FULL : ColorRange_Compat_e::AVS_COLORRANGE_LIMITED;
13271327
}
13281328
}
13291329
// cr_dest = cr_source if not specified
1330-
if (ColorRange_dest != ColorRange_e::AVS_RANGE_LIMITED && ColorRange_dest != ColorRange_e::AVS_RANGE_FULL) {
1330+
if (ColorRange_dest != ColorRange_Compat_e::AVS_COLORRANGE_LIMITED && ColorRange_dest != ColorRange_Compat_e::AVS_COLORRANGE_FULL) {
13311331
ColorRange_dest = ColorRange_src;
13321332
}
1333-
bool fulls = ColorRange_src == ColorRange_e::AVS_RANGE_FULL;
1334-
bool fulld = ColorRange_dest == ColorRange_e::AVS_RANGE_FULL;
1333+
bool fulls = ColorRange_src == ColorRange_Compat_e::AVS_COLORRANGE_FULL;
1334+
bool fulld = ColorRange_dest == ColorRange_Compat_e::AVS_COLORRANGE_FULL;
13351335

13361336

13371337
int dither_type = args[3].AsInt(-1);
@@ -1499,7 +1499,7 @@ PVideoFrame __stdcall ConvertBits::GetFrame(int n, IScriptEnvironment* env) {
14991499
PVideoFrame dst = env->NewVideoFrameP(vi, &src);
15001500

15011501
auto props = env->getFramePropsRW(dst);
1502-
update_ColorRange(props, fulld ? ColorRange_e::AVS_RANGE_FULL : ColorRange_e::AVS_RANGE_LIMITED, env);
1502+
update_ColorRange(props, fulld ? ColorRange_Compat_e::AVS_COLORRANGE_FULL : ColorRange_Compat_e::AVS_COLORRANGE_LIMITED, env);
15031503

15041504
if(vi.IsPlanar())
15051505
{

‎avs_core/convert/convert_helper.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@
4848
#include <vector>
4949
#include <sstream>
5050

51-
const std::vector<std::pair<const char*, ColorRange_e>> g_range_table{
52-
{ "limited", AVS_RANGE_LIMITED },
53-
{ "full", AVS_RANGE_FULL },
54-
{ "l", AVS_RANGE_LIMITED },
55-
{ "f", AVS_RANGE_FULL },
51+
const std::vector<std::pair<const char*, ColorRange_Compat_e>> g_range_table{
52+
{ "limited", AVS_COLORRANGE_LIMITED },
53+
{ "full", AVS_COLORRANGE_FULL },
54+
{ "l", AVS_COLORRANGE_LIMITED },
55+
{ "f", AVS_COLORRANGE_FULL },
5656
};
5757

5858
const std::vector<std::pair<const char*, ChromaLocation_e>> g_chromaloc_table{
@@ -196,7 +196,7 @@ static bool getChromaLocation(const char* chromaloc_name, IScriptEnvironment* en
196196
}
197197

198198
bool getColorRange(const char* color_range_name, IScriptEnvironment* env, int& _ColorRange) {
199-
auto color_range_enum = lookup_table<ColorRange_e>(g_range_table, color_range_name);
199+
auto color_range_enum = lookup_table<ColorRange_Compat_e>(g_range_table, color_range_name);
200200
if (color_range_enum >= 0) {
201201
_ColorRange = color_range_enum;
202202
return true;
@@ -222,27 +222,27 @@ static bool getOldMatrix(const char* matrix_name, int &_Matrix, int &_ColorRange
222222
switch (old_matrix_enum) {
223223
case Old_Avs_Matrix_e::AVS_OLD_MATRIX_Rec601:
224224
_Matrix = Matrix_e::AVS_MATRIX_ST170_M;
225-
_ColorRange = ColorRange_e::AVS_RANGE_LIMITED;
225+
_ColorRange = ColorRange_Compat_e::AVS_COLORRANGE_LIMITED;
226226
break;
227227
case Old_Avs_Matrix_e::AVS_OLD_MATRIX_PC_601:
228228
_Matrix = Matrix_e::AVS_MATRIX_ST170_M;
229-
_ColorRange = -1; // better no change the range ColorRange_e::AVS_RANGE_FULL;
229+
_ColorRange = -1; // better no change the range ColorRange_Compat_e::AVS_COLORRANGE_FULL;
230230
break;
231231
case Old_Avs_Matrix_e::AVS_OLD_MATRIX_Rec709:
232232
_Matrix = Matrix_e::AVS_MATRIX_BT709;
233-
_ColorRange = ColorRange_e::AVS_RANGE_LIMITED;
233+
_ColorRange = ColorRange_Compat_e::AVS_COLORRANGE_LIMITED;
234234
break;
235235
case Old_Avs_Matrix_e::AVS_OLD_MATRIX_PC_709:
236236
_Matrix = Matrix_e::AVS_MATRIX_BT709;
237-
_ColorRange = -1; // better no change the range ColorRange_e::AVS_RANGE_FULL;
237+
_ColorRange = -1; // better no change the range ColorRange_Compat_e::AVS_COLORRANGE_FULL;
238238
break;
239239
case Old_Avs_Matrix_e::AVS_OLD_MATRIX_Rec2020:
240240
_Matrix = Matrix_e::AVS_MATRIX_BT2020_NCL;
241-
_ColorRange = ColorRange_e::AVS_RANGE_LIMITED;
241+
_ColorRange = ColorRange_Compat_e::AVS_COLORRANGE_LIMITED;
242242
break;
243243
case Old_Avs_Matrix_e::AVS_OLD_MATRIX_PC_2020:
244244
_Matrix = Matrix_e::AVS_MATRIX_BT2020_NCL;
245-
_ColorRange = -1; // better no change the range ColorRange_e::AVS_RANGE_FULL;
245+
_ColorRange = -1; // better no change the range ColorRange_Compat_e::AVS_COLORRANGE_FULL;
246246
break;
247247
case Old_Avs_Matrix_e::AVS_OLD_MATRIX_AVERAGE:
248248
_Matrix = Matrix_e::AVS_MATRIX_AVERAGE; // non-standard!
@@ -274,8 +274,8 @@ static bool is_paramstring_empty_or_auto(const char* param) {
274274
// called from yuv <-> rgb and to_greyscale converters
275275
void matrix_parse_merge_with_props_def(bool rgb_in, bool rgb_out, const char* matrix_name, const AVSMap* props, int& _Matrix, int& _ColorRange, int& _ColorRange_Out, int _Matrix_Default, int _ColorRange_Default, IScriptEnvironment* env) {
276276
// if once we'd like to use input colorrange when input is rgb (e.g. studio rgb of ColorBars is limited)
277-
int _ColorRange_In = rgb_in ? ColorRange_e::AVS_RANGE_FULL : ColorRange_e::AVS_RANGE_LIMITED;
278-
int _Default_ColorRange_Out = rgb_out ? ColorRange_e::AVS_RANGE_FULL : ColorRange_e::AVS_RANGE_LIMITED; // RGB -> YUV or YUV -> RGB
277+
int _ColorRange_In = rgb_in ? ColorRange_Compat_e::AVS_COLORRANGE_FULL : ColorRange_Compat_e::AVS_COLORRANGE_LIMITED;
278+
int _Default_ColorRange_Out = rgb_out ? ColorRange_Compat_e::AVS_COLORRANGE_FULL : ColorRange_Compat_e::AVS_COLORRANGE_LIMITED; // RGB -> YUV or YUV -> RGB
279279

280280
if (props) {
281281
// _ColorRange exists for RGB as well
@@ -374,7 +374,7 @@ void matrix_parse_merge_with_props_def(bool rgb_in, bool rgb_out, const char* ma
374374

375375
void matrix_parse_merge_with_props(bool rgb_in, bool rgb_out, const char* matrix_name, const AVSMap* props, int& _Matrix, int& _ColorRange, int& ColorRange_Out, IScriptEnvironment * env) {
376376
int _Matrix_Default = Matrix_e::AVS_MATRIX_ST170_M; // Rec601 AVS_MATRIX_ST170_M (6-NTSC) and not AVS_MATRIX_BT470_BG (5-PAL)
377-
int _ColorRange_Default = ColorRange_e::AVS_RANGE_LIMITED;
377+
int _ColorRange_Default = ColorRange_Compat_e::AVS_COLORRANGE_LIMITED;
378378
matrix_parse_merge_with_props_def(rgb_in, rgb_out, matrix_name, props, _Matrix, _ColorRange, ColorRange_Out, _Matrix_Default, _ColorRange_Default, env);
379379
}
380380

@@ -432,7 +432,7 @@ void update_Matrix_and_ColorRange(AVSMap* props, int theMatrix, int theColorRang
432432
env->propDeleteKey(props, key);
433433
};
434434

435-
if (theColorRange == ColorRange_e::AVS_RANGE_FULL || theColorRange == ColorRange_e::AVS_RANGE_LIMITED)
435+
if (theColorRange == ColorRange_Compat_e::AVS_COLORRANGE_FULL || theColorRange == ColorRange_Compat_e::AVS_COLORRANGE_LIMITED)
436436
env->propSetInt(props, "_ColorRange", theColorRange, AVSPropAppendMode::PROPAPPENDMODE_REPLACE);
437437
else
438438
env->propDeleteKey(props, "_ColorRange");
@@ -457,7 +457,7 @@ void update_ChromaLocation(AVSMap* props, int theChromaLocation, IScriptEnvironm
457457

458458
void update_ColorRange(AVSMap* props, int theColorRange, IScriptEnvironment* env)
459459
{
460-
if (theColorRange == ColorRange_e::AVS_RANGE_FULL || theColorRange == ColorRange_e::AVS_RANGE_LIMITED)
460+
if (theColorRange == ColorRange_Compat_e::AVS_COLORRANGE_FULL || theColorRange == ColorRange_Compat_e::AVS_COLORRANGE_LIMITED)
461461
env->propSetInt(props, "_ColorRange", theColorRange, AVSPropAppendMode::PROPAPPENDMODE_REPLACE);
462462
else
463463
env->propDeleteKey(props, "_ColorRange");

‎avs_core/convert/convert_helper.h‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,19 @@
3939
#include <string>
4040
#include <cstring>
4141

42+
// ITU-T H.265 (Table E.1)
4243
typedef enum ColorRange_e {
43-
AVS_RANGE_FULL = 0,
44-
AVS_RANGE_LIMITED = 1
44+
AVS_RANGE_LIMITED = 0, // video_full_range_flag = 0, studio swing, e.g. 16-235 for 8-bit luma
45+
AVS_RANGE_FULL = 1, // video_full_range_flag = 1, full swing, e.g. 0-255 for 8-bit luma
4546
} ColorRange_e;
4647

48+
// Old constants borrowed from VapourSynth, which transitioned to the ITU-T H.265 standard (Table E.1)
49+
// Just the opposite as the standard.
50+
typedef enum ColorRange_Compat_e {
51+
AVS_COLORRANGE_FULL = 0,
52+
AVS_COLORRANGE_LIMITED = 1
53+
} ColorRange_Compat_e;
54+
4755
typedef enum ChromaLocation_e {
4856
AVS_CHROMA_UNUSED = -1,
4957
AVS_CHROMA_LEFT = 0,

‎avs_core/convert/convert_matrix.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -299,13 +299,13 @@ bool GetKrKb(int matrix, double& Kr, double& Kb)
299299

300300
bool do_BuildMatrix_Rgb2Yuv(int _Matrix, int _ColorRange, int _ColorRange_Out, int int_arith_shift, int bits_per_pixel, ConversionMatrix& matrix)
301301
{
302-
if (_ColorRange != ColorRange_e::AVS_RANGE_FULL && _ColorRange != ColorRange_e::AVS_RANGE_LIMITED)
302+
if (_ColorRange != ColorRange_Compat_e::AVS_COLORRANGE_FULL && _ColorRange != ColorRange_Compat_e::AVS_COLORRANGE_LIMITED)
303303
return false;
304-
if (_ColorRange_Out != ColorRange_e::AVS_RANGE_FULL && _ColorRange_Out != ColorRange_e::AVS_RANGE_LIMITED)
304+
if (_ColorRange_Out != ColorRange_Compat_e::AVS_COLORRANGE_FULL && _ColorRange_Out != ColorRange_Compat_e::AVS_COLORRANGE_LIMITED)
305305
return false;
306306

307-
const bool is_full_s = _ColorRange == ColorRange_e::AVS_RANGE_FULL;
308-
const bool is_full_d = _ColorRange_Out == ColorRange_e::AVS_RANGE_FULL;
307+
const bool is_full_s = _ColorRange == ColorRange_Compat_e::AVS_COLORRANGE_FULL;
308+
const bool is_full_d = _ColorRange_Out == ColorRange_Compat_e::AVS_COLORRANGE_FULL;
309309

310310
// Special cases not handled by GetKrKb
311311
if (_Matrix == Matrix_e::AVS_MATRIX_RGB) {
@@ -326,13 +326,13 @@ bool do_BuildMatrix_Rgb2Yuv(int _Matrix, int _ColorRange, int _ColorRange_Out, i
326326

327327
bool do_BuildMatrix_Yuv2Rgb(int _Matrix, int _ColorRange, int _ColorRange_Out, int int_arith_shift, int bits_per_pixel, ConversionMatrix& matrix)
328328
{
329-
if (_ColorRange != ColorRange_e::AVS_RANGE_FULL && _ColorRange != ColorRange_e::AVS_RANGE_LIMITED)
329+
if (_ColorRange != ColorRange_Compat_e::AVS_COLORRANGE_FULL && _ColorRange != ColorRange_Compat_e::AVS_COLORRANGE_LIMITED)
330330
return false;
331-
if (_ColorRange_Out != ColorRange_e::AVS_RANGE_FULL && _ColorRange_Out != ColorRange_e::AVS_RANGE_LIMITED)
331+
if (_ColorRange_Out != ColorRange_Compat_e::AVS_COLORRANGE_FULL && _ColorRange_Out != ColorRange_Compat_e::AVS_COLORRANGE_LIMITED)
332332
return false;
333333

334-
const bool is_full_s = _ColorRange == ColorRange_e::AVS_RANGE_FULL;
335-
const bool is_full_d = _ColorRange_Out == ColorRange_e::AVS_RANGE_FULL;
334+
const bool is_full_s = _ColorRange == ColorRange_Compat_e::AVS_COLORRANGE_FULL;
335+
const bool is_full_d = _ColorRange_Out == ColorRange_Compat_e::AVS_COLORRANGE_FULL;
336336

337337
// Special cases not handled by GetKrKb
338338
if (_Matrix == Matrix_e::AVS_MATRIX_RGB) {

‎avs_core/convert/convert_planar.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ ConvertYUV444ToRGB::ConvertYUV444ToRGB(PClip src, const char *matrix_name, int _
771771
}
772772

773773
theOutMatrix = Matrix_e::AVS_MATRIX_RGB;
774-
//theOutColorRange = ColorRange_e::AVS_RANGE_FULL; // PC709 must keep the input one!
774+
//theOutColorRange = ColorRange_Compat_e::AVS_COLORRANGE_FULL; // PC709 must keep the input one!
775775

776776
switch (pixel_step)
777777
{

‎avs_core/filters/color.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ ColorYUV::ColorYUV(PClip child,
897897
// size limited to either 8 or 10 bits, independenly of 12/14/16 or 32bit float bit-depth
898898
vi.width = chroma_range << vi.GetPlaneWidthSubsampling(PLANAR_U);
899899
vi.height = vi.width;
900-
theColorRange = colorbar_fullrange ? ColorRange_e::AVS_RANGE_FULL : ColorRange_e::AVS_RANGE_LIMITED;
900+
theColorRange = colorbar_fullrange ? ColorRange_Compat_e::AVS_COLORRANGE_FULL : ColorRange_Compat_e::AVS_COLORRANGE_LIMITED;
901901
theMatrix = Matrix_e::AVS_MATRIX_BT470_BG; // all the same
902902
theChromaLocation = ChromaLocation_e::AVS_CHROMA_CENTER; // default "mpeg1" for 4:2:0
903903
return;
@@ -911,23 +911,23 @@ ColorYUV::ColorYUV(PClip child,
911911
theOutColorRange, // n/a
912912
Matrix_e::AVS_MATRIX_UNSPECIFIED, // default matrix n/a
913913
configY.force_tv_range ?
914-
ColorRange_e::AVS_RANGE_LIMITED :
915-
ColorRangeCanBeGuessed ? ColorRange_e::AVS_RANGE_FULL : -1 /* n/a invalid */, env);
914+
ColorRange_Compat_e::AVS_COLORRANGE_LIMITED :
915+
ColorRangeCanBeGuessed ? ColorRange_Compat_e::AVS_COLORRANGE_FULL : -1 /* n/a invalid */, env);
916916
// although we read _ColorRange full/limited, nothing stops us to feed with full-range clip a "TV->PC" conversion
917917
// Anyway: a frame property can set theColorRange from the default "FULL" to the actual one.
918918
switch (configY.range) {
919919
case COLORYUV_RANGE_PC_TV:
920920
case COLORYUV_RANGE_PC_TVY:
921-
theColorRange = ColorRange_e::AVS_RANGE_LIMITED;
921+
theColorRange = ColorRange_Compat_e::AVS_COLORRANGE_LIMITED;
922922
break;
923923
case COLORYUV_RANGE_TV_PC:
924-
theColorRange = ColorRange_e::AVS_RANGE_FULL;
924+
theColorRange = ColorRange_Compat_e::AVS_COLORRANGE_FULL;
925925
break;
926926
default:
927927
if (configY.force_tv_range) // "TV" overrides default "PC". Info is needed for gamma correction
928-
theColorRange = ColorRange_e::AVS_RANGE_LIMITED;
928+
theColorRange = ColorRange_Compat_e::AVS_COLORRANGE_LIMITED;
929929
else if (configY.clip_tv) // coring is also sets this frame property
930-
theColorRange = ColorRange_e::AVS_RANGE_LIMITED;
930+
theColorRange = ColorRange_Compat_e::AVS_COLORRANGE_LIMITED;
931931
else
932932
theColorRange = theOutColorRange;
933933
break;
@@ -1206,7 +1206,7 @@ PVideoFrame __stdcall ColorYUV::GetFrame(int n, IScriptEnvironment* env)
12061206
}
12071207

12081208
// when there was no such property from constructor and it could not be guessed then we do not put one
1209-
if (theColorRange == ColorRange_e::AVS_RANGE_FULL || theColorRange == ColorRange_e::AVS_RANGE_LIMITED) {
1209+
if (theColorRange == ColorRange_Compat_e::AVS_COLORRANGE_FULL || theColorRange == ColorRange_Compat_e::AVS_COLORRANGE_LIMITED) {
12101210
auto props = env->getFramePropsRW(dst);
12111211
update_ColorRange(props, theColorRange, env);
12121212
}

‎avs_core/filters/conditional/conditional_reader.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,8 +1607,8 @@ PVideoFrame __stdcall ShowProperties::GetFrame(int n, IScriptEnvironment* env)
16071607
if (propName_s == "_ColorRange") {
16081608
ss << " = ";
16091609
switch (arr[0]) {
1610-
case ColorRange_e::AVS_RANGE_LIMITED: ss << "limited"; break;
1611-
case ColorRange_e::AVS_RANGE_FULL: ss << "full"; break;
1610+
case ColorRange_Compat_e::AVS_COLORRANGE_LIMITED: ss << "limited"; break;
1611+
case ColorRange_Compat_e::AVS_COLORRANGE_FULL: ss << "full"; break;
16121612
}
16131613
}
16141614
else if (propName_s == "_Matrix") {

‎avs_core/filters/greyscale.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Greyscale::Greyscale(PClip _child, const char* matrix_name, IScriptEnvironment*
8080
const AVSMap* props = env->getFramePropsRO(frame0);
8181
// input _ColorRange frame property can appear for RGB source (studio range limited rgb)
8282
matrix_parse_merge_with_props(true /*in rgb*/, true /*out rgb, same range*/, matrix_name, props, theMatrix, theColorRange, theOutColorRange, env);
83-
/*if (theColorRange == ColorRange_e::AVS_RANGE_FULL && theMatrix != Matrix_e::AVS_MATRIX_AVERAGE)
83+
/*if (theColorRange == ColorRange_Compat_e::AVS_COLORRANGE_FULL && theMatrix != Matrix_e::AVS_MATRIX_AVERAGE)
8484
env->ThrowError("GreyScale: only limited range matrix definition or \"Average\" is allowed.");
8585
*/
8686

‎avs_core/filters/histogram.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ PVideoFrame Histogram::VectorscopePrelude(
876876
auto props = env->getFramePropsRO(dst);
877877
int error;
878878
auto val = env->propGetInt(props, "_ColorRange", 0, &error);
879-
if (!error) full_range = val == ColorRange_e::AVS_RANGE_FULL;
879+
if (!error) full_range = val == ColorRange_Compat_e::AVS_COLORRANGE_FULL;
880880
return dst;
881881
}
882882

@@ -1954,7 +1954,7 @@ PVideoFrame Histogram::DrawModeLevels(int n, IScriptEnvironment* env) {
19541954
auto props = env->getFramePropsRO(dst);
19551955
int error;
19561956
auto val = env->propGetInt(props, "_ColorRange", 0, &error);
1957-
if (!error) full_range = val == ColorRange_e::AVS_RANGE_FULL;
1957+
if (!error) full_range = val == ColorRange_Compat_e::AVS_COLORRANGE_FULL;
19581958

19591959
// Note: drawing colors are of limited range independently from clip range
19601960

‎avs_core/filters/planeswap.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ PVideoFrame __stdcall SwapUVToY::GetFrame(int n, IScriptEnvironment* env)
305305
env->propDeleteKey(props, "_ChromaLocation");
306306
// keep _Matrix (?) fixme: really?
307307
if (mode == AToY8) // alpha is always full range, otherwise keep source
308-
env->propSetInt(props, "_ColorRange", ColorRange_e::AVS_RANGE_FULL, AVSPropAppendMode::PROPAPPENDMODE_REPLACE);
308+
env->propSetInt(props, "_ColorRange", ColorRange_Compat_e::AVS_COLORRANGE_FULL, AVSPropAppendMode::PROPAPPENDMODE_REPLACE);
309309
// else we keep _ColorRange value (if any)
310310
return sub;
311311
}

0 commit comments

Comments
 (0)