Update of /cvsroot/dirac/compress/libdirac_common
In directory
sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv20946/libdirac_com
mon
Modified Files:
common.cpp common.h common_types.h
video_format_defaults.cpp
Log Message:
Terminology changes - renamed Video format names to match
spec. Renamed
interlace coding flag to interlaced coding flag as per spec.
Note that command
line interface of encoder app has changed as a result of
these changes.
Index: common_types.h
============================================================
=======
RCS file:
/cvsroot/dirac/compress/libdirac_common/common_types.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** common_types.h 28 Sep 2007 15:46:08 -0000 1.11
--- common_types.h 7 Nov 2007 06:49:30 -0000 1.12
***************
*** 89,100 ****
typedef enum {
VIDEO_FORMAT_CUSTOM=0,
! VIDEO_FORMAT_QSIF,
VIDEO_FORMAT_QCIF,
! VIDEO_FORMAT_SIF,
VIDEO_FORMAT_CIF,
VIDEO_FORMAT_4CIF,
! VIDEO_FORMAT_4SIF,
! VIDEO_FORMAT_SD_525_DIGITAL,
! VIDEO_FORMAT_SD_625_DIGITAL,
VIDEO_FORMAT_HD_720P60,
VIDEO_FORMAT_HD_720P50,
--- 89,100 ----
typedef enum {
VIDEO_FORMAT_CUSTOM=0,
! VIDEO_FORMAT_QSIF525,
VIDEO_FORMAT_QCIF,
! VIDEO_FORMAT_SIF525,
VIDEO_FORMAT_CIF,
+ VIDEO_FORMAT_4SIF525,
VIDEO_FORMAT_4CIF,
! VIDEO_FORMAT_SD_480I60,
! VIDEO_FORMAT_SD_576I50,
VIDEO_FORMAT_HD_720P60,
VIDEO_FORMAT_HD_720P50,
***************
*** 103,108 ****
VIDEO_FORMAT_HD_1080P60,
VIDEO_FORMAT_HD_1080P50,
! VIDEO_FORMAT_DIGI_CINEMA_2K,
! VIDEO_FORMAT_DIGI_CINEMA_4K,
VIDEO_FORMAT_UNDEFINED
} VideoFormat;
--- 103,108 ----
VIDEO_FORMAT_HD_1080P60,
VIDEO_FORMAT_HD_1080P50,
! VIDEO_FORMAT_DIGI_CINEMA_2K24,
! VIDEO_FORMAT_DIGI_CINEMA_4K24,
VIDEO_FORMAT_UNDEFINED
} VideoFormat;
***************
*** 156,159 ****
--- 156,160 ----
ASPECT_RATIO_40_33,
ASPECT_RATIO_16_11,
+ ASPECT_RATIO_4_3,
ASPECT_RATIO_UNDEFINED
} AspectRatioType;
***************
*** 166,169 ****
--- 167,171 ----
SIGNAL_RANGE_8BIT_VIDEO,
SIGNAL_RANGE_10BIT_VIDEO,
+ SIGNAL_RANGE_12BIT_VIDEO,
SIGNAL_RANGE_UNDEFINED
} SignalRangeType;
Index: common.cpp
============================================================
=======
RCS file:
/cvsroot/dirac/compress/libdirac_common/common.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** common.cpp 10 Oct 2007 08:30:20 -0000 1.55
--- common.cpp 7 Nov 2007 06:49:30 -0000 1.56
***************
*** 557,569 ****
switch (GetVideoFormat())
{
! case VIDEO_FORMAT_QSIF:
case VIDEO_FORMAT_QCIF:
case VIDEO_FORMAT_CUSTOM:
! case VIDEO_FORMAT_SIF:
case VIDEO_FORMAT_CIF:
case VIDEO_FORMAT_4CIF:
! case VIDEO_FORMAT_4SIF:
! case VIDEO_FORMAT_SD_525_DIGITAL:
! case VIDEO_FORMAT_SD_625_DIGITAL:
case VIDEO_FORMAT_HD_720P60:
case VIDEO_FORMAT_HD_720P50:
--- 557,569 ----
switch (GetVideoFormat())
{
! case VIDEO_FORMAT_QSIF525:
case VIDEO_FORMAT_QCIF:
case VIDEO_FORMAT_CUSTOM:
! case VIDEO_FORMAT_SIF525:
case VIDEO_FORMAT_CIF:
case VIDEO_FORMAT_4CIF:
! case VIDEO_FORMAT_4SIF525:
! case VIDEO_FORMAT_SD_480I60:
! case VIDEO_FORMAT_SD_576I50:
case VIDEO_FORMAT_HD_720P60:
case VIDEO_FORMAT_HD_720P50:
***************
*** 572,577 ****
case VIDEO_FORMAT_HD_1080P60:
case VIDEO_FORMAT_HD_1080P50:
! case VIDEO_FORMAT_DIGI_CINEMA_2K:
! case VIDEO_FORMAT_DIGI_CINEMA_4K:
if (ftype == INTRA_FRAME)
{
--- 572,577 ----
case VIDEO_FORMAT_HD_1080P60:
case VIDEO_FORMAT_HD_1080P50:
! case VIDEO_FORMAT_DIGI_CINEMA_2K24:
! case VIDEO_FORMAT_DIGI_CINEMA_4K24:
if (ftype == INTRA_FRAME)
{
***************
*** 630,634 ****
ParseParams::ParseParams():
m_major_ver(0),
! m_minor_ver(109),
m_profile(0),
m_level(0)
--- 630,634 ----
ParseParams::ParseParams():
m_major_ver(0),
! m_minor_ver(1093),
m_profile(0),
m_level(0)
***************
*** 744,747 ****
--- 744,751 ----
m_aspect_ratio.m_denom = 11;
break;
+ case ASPECT_RATIO_4_3:
+ m_aspect_ratio.m_num = 4;
+ m_aspect_ratio.m_denom = 3;
+ break;
default:
m_asr_idx = ASPECT_RATIO_CUSTOM;
***************
*** 759,769 ****
m_luma_offset = 0;
m_luma_excursion = 255;
! m_chroma_offset = 0;
m_chroma_excursion = 255;
break;
case SIGNAL_RANGE_8BIT_VIDEO:
m_luma_offset = 16;
! m_luma_excursion = 235;
! m_chroma_offset = 0;
m_chroma_excursion = 224;
break;
--- 763,773 ----
m_luma_offset = 0;
m_luma_excursion = 255;
! m_chroma_offset = 128;
m_chroma_excursion = 255;
break;
case SIGNAL_RANGE_8BIT_VIDEO:
m_luma_offset = 16;
! m_luma_excursion = 219;
! m_chroma_offset = 128;
m_chroma_excursion = 224;
break;
***************
*** 771,777 ****
m_luma_offset = 64;
m_luma_excursion = 876;
! m_chroma_offset = 0;
m_chroma_excursion = 896;
break;
default:
m_sr_idx = SIGNAL_RANGE_CUSTOM;
--- 775,787 ----
m_luma_offset = 64;
m_luma_excursion = 876;
! m_chroma_offset = 512;
m_chroma_excursion = 896;
break;
+ case SIGNAL_RANGE_12BIT_VIDEO:
+ m_luma_offset = 256;
+ m_luma_excursion = 3504;
+ m_chroma_offset = 2048;
+ m_chroma_excursion = 3584;
+ break;
default:
m_sr_idx = SIGNAL_RANGE_CUSTOM;
***************
*** 806,810 ****
case 4:
m_col_primary = CP_CIE_XYZ;
! m_col_matrix = CM_REVERSIBLE;
m_transfer_func = TF_DCINEMA;
break;
--- 816,820 ----
case 4:
m_col_primary = CP_CIE_XYZ;
! m_col_matrix = CM_HDTV_COMP_INTERNET;
m_transfer_func = TF_DCINEMA;
break;
***************
*** 1105,1124 ****
case VIDEO_FORMAT_CUSTOM:
return VIDEO_FORMAT_CUSTOM;
! case VIDEO_FORMAT_QSIF:
! return VIDEO_FORMAT_QSIF;
case VIDEO_FORMAT_QCIF:
return VIDEO_FORMAT_QCIF;
! case VIDEO_FORMAT_SIF:
! return VIDEO_FORMAT_SIF;
case VIDEO_FORMAT_CIF:
return VIDEO_FORMAT_CIF;
case VIDEO_FORMAT_4CIF:
return VIDEO_FORMAT_4CIF;
! case VIDEO_FORMAT_4SIF:
! return VIDEO_FORMAT_4SIF;
! case VIDEO_FORMAT_SD_525_DIGITAL:
! return VIDEO_FORMAT_SD_525_DIGITAL;
! case VIDEO_FORMAT_SD_625_DIGITAL:
! return VIDEO_FORMAT_SD_625_DIGITAL;
case VIDEO_FORMAT_HD_720P60:
return VIDEO_FORMAT_HD_720P60;
--- 1115,1134 ----
case VIDEO_FORMAT_CUSTOM:
return VIDEO_FORMAT_CUSTOM;
! case VIDEO_FORMAT_QSIF525:
! return VIDEO_FORMAT_QSIF525;
case VIDEO_FORMAT_QCIF:
return VIDEO_FORMAT_QCIF;
! case VIDEO_FORMAT_SIF525:
! return VIDEO_FORMAT_SIF525;
case VIDEO_FORMAT_CIF:
return VIDEO_FORMAT_CIF;
case VIDEO_FORMAT_4CIF:
return VIDEO_FORMAT_4CIF;
! case VIDEO_FORMAT_4SIF525:
! return VIDEO_FORMAT_4SIF525;
! case VIDEO_FORMAT_SD_480I60:
! return VIDEO_FORMAT_SD_480I60;
! case VIDEO_FORMAT_SD_576I50:
! return VIDEO_FORMAT_SD_576I50;
case VIDEO_FORMAT_HD_720P60:
return VIDEO_FORMAT_HD_720P60;
***************
*** 1133,1140 ****
case VIDEO_FORMAT_HD_1080P50:
return VIDEO_FORMAT_HD_1080P50;
! case VIDEO_FORMAT_DIGI_CINEMA_2K:
! return VIDEO_FORMAT_DIGI_CINEMA_2K;
! case VIDEO_FORMAT_DIGI_CINEMA_4K:
! return VIDEO_FORMAT_DIGI_CINEMA_4K;
default:
return VIDEO_FORMAT_UNDEFINED;
--- 1143,1150 ----
case VIDEO_FORMAT_HD_1080P50:
return VIDEO_FORMAT_HD_1080P50;
! case VIDEO_FORMAT_DIGI_CINEMA_2K24:
! return VIDEO_FORMAT_DIGI_CINEMA_2K24;
! case VIDEO_FORMAT_DIGI_CINEMA_4K24:
! return VIDEO_FORMAT_DIGI_CINEMA_4K24;
default:
return VIDEO_FORMAT_UNDEFINED;
***************
*** 1200,1203 ****
--- 1210,1215 ----
case ASPECT_RATIO_16_11:
return ASPECT_RATIO_16_11;
+ case ASPECT_RATIO_4_3:
+ return ASPECT_RATIO_4_3;
default:
return ASPECT_RATIO_UNDEFINED;
***************
*** 1218,1221 ****
--- 1230,1235 ----
case SIGNAL_RANGE_10BIT_VIDEO:
return SIGNAL_RANGE_10BIT_VIDEO;
+ case SIGNAL_RANGE_12BIT_VIDEO:
+ return SIGNAL_RANGE_12BIT_VIDEO;
default:
return SIGNAL_RANGE_UNDEFINED;
Index: common.h
============================================================
=======
RCS file:
/cvsroot/dirac/compress/libdirac_common/common.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** common.h 10 Oct 2007 12:26:52 -0000 1.61
--- common.h 7 Nov 2007 06:49:30 -0000 1.62
***************
*** 1052,1056 ****
//! Returns true if we're coding as interlace
(independent of source format!)
! bool InterlaceCoding() const {return
m_interlace_coding;}
//! Returns true if the topmost field comes first
in time when coding
--- 1052,1056 ----
//! Returns true if we're coding as interlace
(independent of source format!)
! bool InterlacedCoding() const {return
m_interlaced_coding;}
//! Returns true if the topmost field comes first
in time when coding
***************
*** 1132,1136 ****
//! Sets whether interlace coding tools are to be
used
! void SetInterlaceCoding(bool
intlc){m_interlace_coding=intlc;}
//! Sets whether the topmost field comes first in
time [NB: TBD since this duplicates metadata in the sequence
header]
--- 1132,1136 ----
//! Sets whether interlace coding tools are to be
used
! void SetInterlacedCoding(bool
intlc){m_interlaced_coding=intlc;}
//! Sets whether the topmost field comes first in
time [NB: TBD since this duplicates metadata in the sequence
header]
***************
*** 1218,1222 ****
//! True if input is treated as interlaced (even
if it isn't!), false otherwise
! bool m_interlace_coding;
//! True if interlaced and top field is first in
temporal order
--- 1218,1222 ----
//! True if input is treated as interlaced (even
if it isn't!), false otherwise
! bool m_interlaced_coding;
//! True if interlaced and top field is first in
temporal order
Index: video_format_defaults.cpp
============================================================
=======
RCS file:
/cvsroot/dirac/compress/libdirac_common/video_format_default
s.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** video_format_defaults.cpp 10 Oct 2007 12:26:52
-0000 1.15
--- video_format_defaults.cpp 7 Nov 2007 06:49:30
-0000 1.16
***************
*** 62,78 ****
// of whether the source material is interlaced or
progressive.
// Overridden from command line of encoder or in
bytestream for decoder.
! cparams.SetInterlaceCoding(false);
cparams.SetTopFieldFirst(true);
switch (cparams.GetVideoFormat())
{
! case VIDEO_FORMAT_QSIF:
case VIDEO_FORMAT_QCIF:
case VIDEO_FORMAT_CUSTOM:
! case VIDEO_FORMAT_SIF:
case VIDEO_FORMAT_CIF:
case VIDEO_FORMAT_4CIF:
! case VIDEO_FORMAT_4SIF:
! case VIDEO_FORMAT_SD_525_DIGITAL:
! case VIDEO_FORMAT_SD_625_DIGITAL:
case VIDEO_FORMAT_HD_720P60:
case VIDEO_FORMAT_HD_720P50:
--- 62,78 ----
// of whether the source material is interlaced or
progressive.
// Overridden from command line of encoder or in
bytestream for decoder.
! cparams.SetInterlacedCoding(false);
cparams.SetTopFieldFirst(true);
switch (cparams.GetVideoFormat())
{
! case VIDEO_FORMAT_QSIF525:
case VIDEO_FORMAT_QCIF:
case VIDEO_FORMAT_CUSTOM:
! case VIDEO_FORMAT_SIF525:
case VIDEO_FORMAT_CIF:
case VIDEO_FORMAT_4CIF:
! case VIDEO_FORMAT_4SIF525:
! case VIDEO_FORMAT_SD_480I60:
! case VIDEO_FORMAT_SD_576I50:
case VIDEO_FORMAT_HD_720P60:
case VIDEO_FORMAT_HD_720P50:
***************
*** 81,86 ****
case VIDEO_FORMAT_HD_1080P60:
case VIDEO_FORMAT_HD_1080P50:
! case VIDEO_FORMAT_DIGI_CINEMA_2K:
! case VIDEO_FORMAT_DIGI_CINEMA_4K:
cparams.SetSpatialPartition(true);
break;
--- 81,86 ----
case VIDEO_FORMAT_HD_1080P60:
case VIDEO_FORMAT_HD_1080P50:
! case VIDEO_FORMAT_DIGI_CINEMA_2K24:
! case VIDEO_FORMAT_DIGI_CINEMA_4K24:
cparams.SetSpatialPartition(true);
break;
***************
*** 102,106 ****
SetDefaultBlockParameters(bparams,
cparams.GetVideoFormat());
cparams.SetLumaBlockParams(bparams);
! cparams.SetInterlaceCoding(false);
cparams.SetMVPrecision(MV_PRECISION_QUARTER_PIXEL);
// NOTE: FIXME - need to add global motion params
here
--- 102,106 ----
SetDefaultBlockParameters(bparams,
cparams.GetVideoFormat());
cparams.SetLumaBlockParams(bparams);
! cparams.SetInterlacedCoding(false);
cparams.SetMVPrecision(MV_PRECISION_QUARTER_PIXEL);
// NOTE: FIXME - need to add global motion params
here
***************
*** 144,148 ****
sparams.SetColourSpecification(0);
break;
! case VIDEO_FORMAT_QSIF:
sparams.SetXl(176);
sparams.SetYl(120);
--- 144,148 ----
sparams.SetColourSpecification(0);
break;
! case VIDEO_FORMAT_QSIF525:
sparams.SetXl(176);
sparams.SetYl(120);
***************
*** 163,167 ****
sparams.SetColourSpecification(2);
break;
! case VIDEO_FORMAT_SIF:
sparams.SetXl(352);
sparams.SetYl(240);
--- 163,167 ----
sparams.SetColourSpecification(2);
break;
! case VIDEO_FORMAT_SIF525:
sparams.SetXl(352);
sparams.SetYl(240);
***************
*** 182,186 ****
sparams.SetColourSpecification(2);
break;
! case VIDEO_FORMAT_4SIF:
sparams.SetXl(704);
sparams.SetYl(480);
--- 182,186 ----
sparams.SetColourSpecification(2);
break;
! case VIDEO_FORMAT_4SIF525:
sparams.SetXl(704);
sparams.SetYl(480);
***************
*** 201,205 ****
sparams.SetColourSpecification(2);
break;
! case VIDEO_FORMAT_SD_525_DIGITAL:
sparams.SetXl(720);
sparams.SetYl(480);
--- 201,205 ----
sparams.SetColourSpecification(2);
break;
! case VIDEO_FORMAT_SD_480I60:
sparams.SetXl(720);
sparams.SetYl(480);
***************
*** 212,219 ****
sparams.SetCleanHeight(480);
sparams.SetLeftOffset(8);
! sparams.SetSignalRange(SIGNAL_RANGE_8BIT_VIDEO);
sparams.SetColourSpecification(1);
break;
! case VIDEO_FORMAT_SD_625_DIGITAL:
sparams.SetXl(720);
sparams.SetYl(576);
--- 212,219 ----
sparams.SetCleanHeight(480);
sparams.SetLeftOffset(8);
! sparams.SetSignalRange(SIGNAL_RANGE_10BIT_VIDEO);
sparams.SetColourSpecification(1);
break;
! case VIDEO_FORMAT_SD_576I50:
sparams.SetXl(720);
sparams.SetYl(576);
***************
*** 225,229 ****
sparams.SetCleanHeight(576);
sparams.SetLeftOffset(8);
! sparams.SetSignalRange(SIGNAL_RANGE_8BIT_VIDEO);
sparams.SetColourSpecification(2);
break;
--- 225,229 ----
sparams.SetCleanHeight(576);
sparams.SetLeftOffset(8);
! sparams.SetSignalRange(SIGNAL_RANGE_10BIT_VIDEO);
sparams.SetColourSpecification(2);
break;
***************
*** 239,243 ****
sparams.SetCleanWidth(1280);
sparams.SetCleanHeight(720);
! sparams.SetSignalRange(SIGNAL_RANGE_8BIT_VIDEO);
sparams.SetColourSpecification(3);
break;
--- 239,243 ----
sparams.SetCleanWidth(1280);
sparams.SetCleanHeight(720);
! sparams.SetSignalRange(SIGNAL_RANGE_10BIT_VIDEO);
sparams.SetColourSpecification(3);
break;
***************
*** 252,261 ****
{
case VIDEO_FORMAT_HD_1080I60:
- sparams.SetFrameRate(FRAMERATE_29p97_FPS);
sparams.SetInterlace(true);
break;
case VIDEO_FORMAT_HD_1080I50:
- sparams.SetFrameRate(FRAMERATE_25_FPS);
sparams.SetInterlace(true);
break;
case VIDEO_FORMAT_HD_1080P60:
--- 252,261 ----
{
case VIDEO_FORMAT_HD_1080I60:
sparams.SetInterlace(true);
+ sparams.SetFrameRate(FRAMERATE_29p97_FPS);
break;
case VIDEO_FORMAT_HD_1080I50:
sparams.SetInterlace(true);
+ sparams.SetFrameRate(FRAMERATE_25_FPS);
break;
case VIDEO_FORMAT_HD_1080P60:
***************
*** 268,277 ****
break;
}
! sparams.SetSignalRange(SIGNAL_RANGE_8BIT_VIDEO);
sparams.SetCleanWidth(1920);
sparams.SetCleanHeight(1080);
sparams.SetColourSpecification(3);
break;
! case VIDEO_FORMAT_DIGI_CINEMA_2K:
sparams.SetXl(2048);
sparams.SetYl(1080);
--- 268,277 ----
break;
}
! sparams.SetSignalRange(SIGNAL_RANGE_10BIT_VIDEO);
sparams.SetCleanWidth(1920);
sparams.SetCleanHeight(1080);
sparams.SetColourSpecification(3);
break;
! case VIDEO_FORMAT_DIGI_CINEMA_2K24:
sparams.SetXl(2048);
sparams.SetYl(1080);
***************
*** 280,291 ****
sparams.SetCleanWidth(2048);
sparams.SetCleanHeight(1080);
! sparams.SetSignalRange(SIGNAL_RANGE_CUSTOM);
! sparams.SetLumaOffset(0);
! sparams.SetLumaExcursion(4095);
! sparams.SetChromaOffset(4096);
! sparams.SetChromaExcursion(8190);
sparams.SetColourSpecification(4);
break;
! case VIDEO_FORMAT_DIGI_CINEMA_4K:
sparams.SetXl(4096);
sparams.SetYl(2160);
--- 280,287 ----
sparams.SetCleanWidth(2048);
sparams.SetCleanHeight(1080);
! sparams.SetSignalRange(SIGNAL_RANGE_12BIT_VIDEO);
sparams.SetColourSpecification(4);
break;
! case VIDEO_FORMAT_DIGI_CINEMA_4K24:
sparams.SetXl(4096);
sparams.SetYl(2160);
***************
*** 294,302 ****
sparams.SetCleanWidth(4096);
sparams.SetCleanHeight(2160);
! sparams.SetSignalRange(SIGNAL_RANGE_CUSTOM);
! sparams.SetLumaOffset(0);
! sparams.SetLumaExcursion(4095);
! sparams.SetChromaOffset(4096);
! sparams.SetChromaExcursion(8190);
sparams.SetColourSpecification(4);
break;
--- 290,294 ----
sparams.SetCleanWidth(4096);
sparams.SetCleanHeight(2160);
! sparams.SetSignalRange(SIGNAL_RANGE_12BIT_VIDEO);
sparams.SetColourSpecification(4);
break;
***************
*** 320,327 ****
switch (encparams.GetVideoFormat())
{
! case VIDEO_FORMAT_4SIF:
case VIDEO_FORMAT_4CIF:
! case VIDEO_FORMAT_SD_625_DIGITAL:
! case VIDEO_FORMAT_SD_525_DIGITAL:
encparams.SetL1Sep(3);
encparams.SetNumL1(7);
--- 312,319 ----
switch (encparams.GetVideoFormat())
{
! case VIDEO_FORMAT_4SIF525:
case VIDEO_FORMAT_4CIF:
! case VIDEO_FORMAT_SD_480I60:
! case VIDEO_FORMAT_SD_576I50:
encparams.SetL1Sep(3);
encparams.SetNumL1(7);
***************
*** 361,365 ****
{
case VIDEO_FORMAT_QCIF:
! case VIDEO_FORMAT_QSIF:
bparams.SetXblen(8);
bparams.SetYblen(8);
--- 353,357 ----
{
case VIDEO_FORMAT_QCIF:
! case VIDEO_FORMAT_QSIF525:
bparams.SetXblen(8);
bparams.SetYblen(8);
***************
*** 369,378 ****
case VIDEO_FORMAT_CUSTOM:
case VIDEO_FORMAT_CIF:
! case VIDEO_FORMAT_SIF:
case VIDEO_FORMAT_4CIF:
! case VIDEO_FORMAT_4SIF:
! case VIDEO_FORMAT_SD_525_DIGITAL:
! case VIDEO_FORMAT_SD_625_DIGITAL:
bparams.SetXblen(12);
bparams.SetYblen(12);
--- 361,370 ----
case VIDEO_FORMAT_CUSTOM:
+ case VIDEO_FORMAT_SIF525:
case VIDEO_FORMAT_CIF:
! case VIDEO_FORMAT_4SIF525:
case VIDEO_FORMAT_4CIF:
! case VIDEO_FORMAT_SD_480I60:
! case VIDEO_FORMAT_SD_576I50:
bparams.SetXblen(12);
bparams.SetYblen(12);
***************
*** 393,398 ****
case VIDEO_FORMAT_HD_1080P60:
case VIDEO_FORMAT_HD_1080P50:
! case VIDEO_FORMAT_DIGI_CINEMA_2K:
! case VIDEO_FORMAT_DIGI_CINEMA_4K:
bparams.SetXblen(24);
bparams.SetYblen(24);
--- 385,390 ----
case VIDEO_FORMAT_HD_1080P60:
case VIDEO_FORMAT_HD_1080P50:
! case VIDEO_FORMAT_DIGI_CINEMA_2K24:
! case VIDEO_FORMAT_DIGI_CINEMA_4K24:
bparams.SetXblen(24);
bparams.SetYblen(24);
------------------------------------------------------------
-------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and
a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Dirac-commits mailing list
Dirac-commits lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dirac-com
mits
|