From: John F. <jo...@us...> - 2013-07-01 15:31:40
|
Update of /cvsroot/ingex/ingex/common In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1331/common Modified Files: VideoRaster.cpp VideoRaster.h Log Message: Further updates re. VideoRaster Index: VideoRaster.cpp =================================================================== RCS file: /cvsroot/ingex/ingex/common/VideoRaster.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** VideoRaster.cpp 6 Jun 2013 13:36:20 -0000 1.10 --- VideoRaster.cpp 1 Jul 2013 15:31:36 -0000 1.11 *************** *** 519,619 **** } ! void Ingex::VideoRaster::ModifyLineShift(bool shift) { switch (mEnum) { case PAL_4x3: case PAL_4x3_B: ! mEnum = shift ? PAL_4x3_B : PAL_4x3; break; case PAL_16x9: case PAL_16x9_B: ! mEnum = shift ? PAL_16x9_B : PAL_16x9; break; case PAL_592_4x3: case PAL_592_4x3_B: ! mEnum = shift ? PAL_592_4x3_B : PAL_592_4x3; break; case PAL_592_16x9: case PAL_592_16x9_B: ! mEnum = shift ? PAL_592_16x9_B : PAL_592_16x9; break; case PAL_608_4x3: case PAL_608_4x3_B: ! mEnum = shift ? PAL_608_4x3_B : PAL_608_4x3; break; case PAL_608_16x9: case PAL_608_16x9_B: ! mEnum = shift ? PAL_608_16x9_B : PAL_608_16x9; break; default: break; } } ! int Ingex::VideoRaster::LineShift() const { ! int shift; switch (mEnum) { ! case PAL_4x3_B: ! case PAL_16x9_B: ! case PAL_592_4x3_B: ! case PAL_592_16x9_B: ! case PAL_608_4x3_B: ! case PAL_608_16x9_B: ! shift = 1; break; ! default: ! shift = 0; break; } ! return shift; } ! /* ! Ingex::Rational Ingex::VideoRaster::SampleAspectRatio() { ! Ingex::Rational sar; ! switch (mEnum) { - case PAL_4x3: - case PAL_592_4x3: - case PAL_608_4x3: case PAL_4x3_B: - case PAL_592_4x3_B: - case PAL_608_4x3_B: - sar.numerator = 59; - sar.denominator = 54; - break; - case PAL_16x9: - case PAL_592_16x9: - case PAL_608_16x9: case PAL_16x9_B: case PAL_592_16x9_B: case PAL_608_16x9_B: ! sar.numerator = 118; ! sar.denominator = 81; ! break; ! case NTSC_4x3: ! case NTSC_502_4x3: ! sar.numerator = 10; ! sar.denominator = 11; ! break; ! case NTSC_16x9: ! case NTSC_502_16x9: ! sar.numerator = 40; ! sar.denominator = 33; break; default: ! sar.numerator = 1; ! sar.denominator = 1; break; } ! return sar; } ! */ --- 519,628 ---- } ! Ingex::VideoRaster::EnumType Ingex::VideoRaster::ShiftedEnumValue() const { + EnumType shifted_enum= NONE; switch (mEnum) { case PAL_4x3: case PAL_4x3_B: ! shifted_enum = PAL_4x3_B; break; case PAL_16x9: case PAL_16x9_B: ! shifted_enum = PAL_16x9_B; break; case PAL_592_4x3: case PAL_592_4x3_B: ! shifted_enum = PAL_592_4x3_B; break; case PAL_592_16x9: case PAL_592_16x9_B: ! shifted_enum = PAL_592_16x9_B; break; case PAL_608_4x3: case PAL_608_4x3_B: ! shifted_enum = PAL_608_4x3_B; break; case PAL_608_16x9: case PAL_608_16x9_B: ! shifted_enum = PAL_608_16x9_B; break; default: break; } + return shifted_enum; } ! Ingex::VideoRaster::EnumType Ingex::VideoRaster::SdEnumValue() const { ! VideoRaster::EnumType e = VideoRaster::NONE; ! switch (mEnum) { ! case VideoRaster::PAL_4x3: ! case VideoRaster::PAL_4x3_B: ! case VideoRaster::PAL_16x9: ! case VideoRaster::PAL_16x9_B: ! case VideoRaster::PAL_592_4x3: ! case VideoRaster::PAL_592_4x3_B: ! case VideoRaster::PAL_592_16x9: ! case VideoRaster::PAL_592_16x9_B: ! case VideoRaster::PAL_608_4x3: ! case VideoRaster::PAL_608_4x3_B: ! case VideoRaster::PAL_608_16x9: ! case VideoRaster::PAL_608_16x9_B: ! case VideoRaster::NTSC_4x3: ! case VideoRaster::NTSC_16x9: ! case VideoRaster::NTSC_502_4x3: ! case VideoRaster::NTSC_502_16x9: ! e = mEnum; break; ! case VideoRaster::SMPTE274_25I: ! case VideoRaster::SMPTE274_25PSF: ! case VideoRaster::SMPTE274_25P: ! case VideoRaster::SMPTE274_50P: ! case VideoRaster::SMPTE296_50P: ! e = VideoRaster::PAL_16x9; ! break; ! case VideoRaster::SMPTE274_29I: ! case VideoRaster::SMPTE274_29PSF: ! case VideoRaster::SMPTE274_29P: ! case VideoRaster::SMPTE274_59P: ! case VideoRaster::SMPTE296_59P: ! e = VideoRaster::NTSC_16x9; ! break; ! case VideoRaster::SMPTE274_30I: ! case VideoRaster::SMPTE274_30PSF: ! case VideoRaster::SMPTE274_30P: ! case VideoRaster::SMPTE274_60P: ! case VideoRaster::SMPTE296_60P: ! case VideoRaster::NONE: ! e = VideoRaster::NONE; break; } ! return e; } ! int Ingex::VideoRaster::LineShift() const { ! int shift; switch (mEnum) { case PAL_4x3_B: case PAL_16x9_B: + case PAL_592_4x3_B: case PAL_592_16x9_B: + case PAL_608_4x3_B: case PAL_608_16x9_B: ! shift = 1; break; default: ! shift = 0; break; } ! return shift; } ! Index: VideoRaster.h =================================================================== RCS file: /cvsroot/ingex/ingex/common/VideoRaster.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** VideoRaster.h 6 Jun 2013 13:36:21 -0000 1.9 --- VideoRaster.h 1 Jul 2013 15:31:37 -0000 1.10 *************** *** 94,98 **** }; VideoRaster(EnumType e); - void Init(std::string name, int width, int height, Ingex::Rational sample_aspect_ratio, Ingex::Rational rate, Interlace::EnumType interlace); EnumType EnumValue() const { return mEnum; } std::string Name() const { return mName; } --- 94,97 ---- *************** *** 106,111 **** bool Is4x3() const; bool Is1001() const { return mRate.denominator == 1001; } int LineShift() const; - void ModifyLineShift(bool shifted); friend bool operator== (const VideoRaster & l, const VideoRaster & r); --- 105,111 ---- bool Is4x3() const; bool Is1001() const { return mRate.denominator == 1001; } + EnumType ShiftedEnumValue() const; + EnumType SdEnumValue() const; int LineShift() const; friend bool operator== (const VideoRaster & l, const VideoRaster & r); *************** *** 113,116 **** --- 113,119 ---- private: + // Methods + void Init(std::string name, int width, int height, Ingex::Rational sample_aspect_ratio, Ingex::Rational rate, Interlace::EnumType interlace); + // Data EnumType mEnum; std::string mName; |