Menu
▾
▴
[aaf-commits] AAF/Utilities/AAFAnalyzer/RegressionTest/TestFiles EPAnnotationTest.xml,1.3,1.4 EPAnnotationTest2.xml,1.1,1.2 EPEditRateTest2.xml,1.3,1.4 EPDerivationTest.xml,1.5,1.6 EPHeaderTest1.xml,1.1,1.2 EPNameTest.xml,1.4,1.5 SlotInfo.h,1.2,1.3 EPEditRateTest4.xml,1.3,1.4 EPEffectTest.xml,1.4,1.5 EPEditRateTest5.xml,1.3,1.4 EPDefinitionTest2.xml,1.1,1.2 EPEditRateTest.xml,1.4,1.5 EPDerivationTest.expected,1.6,1.7 TestFileBuilder.h,1.12,1.13 EPParameterTest.xml,1.1,1.2 EPContainedTrackTest.xml,1.5,1.6 EPHeaderTest2.xml,1.1,1.2 EPEditRateTest6.xml,1.3,1.4 InputParser.h,1.9,1.10 EPTrackContentsTest.xml,1.6,1.7 EPHeaderTest3.xml,1.1,1.2 EPEditRateTest3.xml,1.3,1.4 TestFileBuilder.cpp,1.12,1.13 EPDefinitionTest.xml,1.2,1.3 EPMultiChannelAudioTest.xml,1.1,1.2 InputParser.cpp,1.12,1.13 EPDerivationChain.dtd,1.12,1.13
Update of /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/RegressionTest/TestFiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1565/RegressionTest/TestFiles Modified Files: EPAnnotationTest.xml EPAnnotationTest2.xml EPEditRateTest2.xml EPDerivationTest.xml EPHeaderTest1.xml EPNameTest.xml SlotInfo.h EPEditRateTest4.xml EPEffectTest.xml EPEditRateTest5.xml EPDefinitionTest2.xml EPEditRateTest.xml EPDerivationTest.expected TestFileBuilder.h EPParameterTest.xml EPContainedTrackTest.xml EPHeaderTest2.xml EPEditRateTest6.xml InputParser.h EPTrackContentsTest.xml EPHeaderTest3.xml EPEditRateTest3.xml TestFileBuilder.cpp EPDefinitionTest.xml EPMultiChannelAudioTest.xml InputParser.cpp EPDerivationChain.dtd Log Message: Improved/Fixed component reference resolution Index: TestFileBuilder.h =================================================================== RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/RegressionTest/TestFiles/TestFileBuilder.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TestFileBuilder.h 7 Dec 2005 15:48:02 -0000 1.12 --- TestFileBuilder.h 14 Dec 2005 17:25:59 -0000 1.13 *************** *** 53,61 **** { public: ! enum TrackType { NONE, AUDIO, PICTURE, TIMECODE, EDGECODE, AUXILIARY }; static const int INPUT_SEGMENT = 1; static const int RENDERING = 2; ! TestFileBuilder( const char* outFile ); ~TestFileBuilder(); --- 53,61 ---- { public: ! enum TrackType { NONE, AUDIO, PICTURE, TIMECODE, EDGECODE, AUXILIARY }; static const int INPUT_SEGMENT = 1; static const int RENDERING = 2; ! TestFileBuilder( const char* outFile ); ~TestFileBuilder(); *************** *** 91,116 **** //Create Segments: //Type A: ! shared_ptr<AxComponent> CreateTimecode( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength ); ! shared_ptr<AxComponent> CreateEdgecode( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength ); ! shared_ptr<AxComponent> CreateTimecodeStream12M( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength ); ! shared_ptr<AxComponent> CreateEOC( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength ); ! shared_ptr<AxComponent> CreateOOF( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength ); //Type B: ! shared_ptr<AxComponent> CreateSourceClip( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength ); //Type C: ! shared_ptr<AxComponent> CreateTransition( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength ); ! shared_ptr<AxComponent> CreateSequence( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength ); ! shared_ptr<AxComponent> CreateCommentMarker( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength ); ! shared_ptr<AxComponent> CreateDescriptiveMarker( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength ); ! //Type D: ! shared_ptr<AxComponent> CreateOperationGroup( TrackType essenceType, const AxString& opDef, aafLength_t length, bool hasLength ); ! //Fill Components: //Type B: void InitializeSourceClip( shared_ptr<AxSourceReference> parent, AxMob& child ); ! //Type C: void AddToTransition( shared_ptr<AxComponent> parent, AxComponent& child ); --- 91,116 ---- //Create Segments: //Type A: ! shared_ptr<AxComponent> CreateTimecode( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength, int intNothing, bool boolNothing ); ! shared_ptr<AxComponent> CreateEdgecode( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength, int intNothing, bool boolNothing ); ! shared_ptr<AxComponent> CreateTimecodeStream12M( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength, int intNothing, bool boolNothing ); ! shared_ptr<AxComponent> CreateEOC( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength, int intNothing, bool boolNothing ); ! shared_ptr<AxComponent> CreateOOF( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength, int startTime, bool hasStartTime ); //Type B: ! shared_ptr<AxComponent> CreateSourceClip( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength, int startTime, bool hasStartTime ); //Type C: ! shared_ptr<AxComponent> CreateTransition( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength, int intNothing, bool boolNothing ); ! shared_ptr<AxComponent> CreateSequence( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength, int intNothing, bool boolNothing ); ! shared_ptr<AxComponent> CreateCommentMarker( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength, int position, bool hasPosition ); ! shared_ptr<AxComponent> CreateDescriptiveMarker( TrackType essenceType, const AxString& strNothing, aafLength_t length, bool hasLength, int position, bool hasPosition ); ! //Type D: ! shared_ptr<AxComponent> CreateOperationGroup( TrackType essenceType, const AxString& opDef, aafLength_t length, bool hasLength, int intNothing, bool boolNothing ); ! //Fill Components: //Type B: void InitializeSourceClip( shared_ptr<AxSourceReference> parent, AxMob& child ); ! //Type C: void AddToTransition( shared_ptr<AxComponent> parent, AxComponent& child ); *************** *** 120,124 **** //Type D: void AddToOperationGroup( shared_ptr<AxSegment> parent, AxSegment& child, int property ); ! //Annotation: void AddComment( shared_ptr<AxComponent> axComponent, const AxString& name, const AxString& value ); --- 120,124 ---- //Type D: void AddToOperationGroup( shared_ptr<AxSegment> parent, AxSegment& child, int property ); ! //Annotation: void AddComment( shared_ptr<AxComponent> axComponent, const AxString& name, const AxString& value ); *************** *** 126,140 **** //Mob Slots: ! void AttachTimelineSlot( AxMob& parent, AxSegment& axSegment, aafRational_t editRate, const AxString& name, bool isNamed, int physicalTrackNum, bool isNumbered, int markedIn, bool isMarkedIn, int markedOut, bool isMarkedOut ); ! void AttachEventSlot( AxMob& parent, AxSegment& axSegment, aafRational_t editRate, const AxString& name, bool isNamed, int physicalTrackNum, bool isNumbered, int intNothing1, bool boolNothing1, int intNothing2, bool boolNothing2 ); ! void AttachStaticSlot( AxMob& parent, AxSegment& axSegment, aafRational_t editRate, const AxString& name, bool isNamed, int physicalTrackNum, bool isNumbered, int intNothing1, bool boolNothing1, int intNothing2, bool boolNothing2 ); ! //Parameters: void AttachConstantRationalParameter( AxOperationGroup& axOpGroup, const aafUID_t& paramDefId, aafUInt32 numerator, aafUInt32 denominator, const aafUID_t& uidNothing ); void AttachVaryingRationalParameter( AxOperationGroup& axOpGroup, const aafUID_t& paramDefId, aafUInt32 numerator, aafUInt32 denominator, const aafUID_t& interpolationDefId ); ! //Interchange Objects: void AttachDescriptiveFramework( shared_ptr<AxDescriptiveMarker> axMarker ); ! //Other: void SetOperationalPattern( aafUID_t pattern ); --- 126,140 ---- //Mob Slots: ! void AttachTimelineSlot( AxMob& parent, AxSegment& axSegment, aafRational_t editRate, const AxString& name, bool isNamed, int physicalTrackNum, bool isNumbered, int markedIn, bool isMarkedIn, int markedOut, bool isMarkedOut, int orgin ); ! void AttachEventSlot( AxMob& parent, AxSegment& axSegment, aafRational_t editRate, const AxString& name, bool isNamed, int physicalTrackNum, bool isNumbered, int intNothing1, bool boolNothing1, int intNothing2, bool boolNothing2, int intNothing3 ); ! void AttachStaticSlot( AxMob& parent, AxSegment& axSegment, aafRational_t editRate, const AxString& name, bool isNamed, int physicalTrackNum, bool isNumbered, int intNothing1, bool boolNothing1, int intNothing2, bool boolNothing2, int intNothing3 ); ! //Parameters: void AttachConstantRationalParameter( AxOperationGroup& axOpGroup, const aafUID_t& paramDefId, aafUInt32 numerator, aafUInt32 denominator, const aafUID_t& uidNothing ); void AttachVaryingRationalParameter( AxOperationGroup& axOpGroup, const aafUID_t& paramDefId, aafUInt32 numerator, aafUInt32 denominator, const aafUID_t& interpolationDefId ); ! //Interchange Objects: void AttachDescriptiveFramework( shared_ptr<AxDescriptiveMarker> axMarker ); ! //Other: void SetOperationalPattern( aafUID_t pattern ); *************** *** 142,151 **** private: ! AxFile _axFile; aafUInt32 _mobCount; map<AxString, aafUID_t> _namedAUIDs; bool _useLegacyEffectDefinitions; ! const aafMobID_t GenerateMobId(); const aafUID_t GenerateAUID(); --- 142,151 ---- private: ! AxFile _axFile; aafUInt32 _mobCount; map<AxString, aafUID_t> _namedAUIDs; bool _useLegacyEffectDefinitions; ! const aafMobID_t GenerateMobId(); const aafUID_t GenerateAUID(); Index: EPDerivationTest.expected =================================================================== RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/RegressionTest/TestFiles/EPDerivationTest.expected,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EPDerivationTest.expected 30 Nov 2005 16:49:10 -0000 1.6 --- EPDerivationTest.expected 14 Dec 2005 17:25:59 -0000 1.7 *************** *** 92,156 **** Name: Verify Mob Chain Desc: Verify the structure of one mob chain. - Detail: Analyzing root composition mob "L01 Top Level" - Result: Passed - Passing Requirements: REQ_EP_017; REQ_EP_018; REQ_EP_019; REQ_EP_025; REQ_EP_026; REQ_EP_030; REQ_EP_031; REQ_EP_036; REQ_EP_045; REQ_EP_050; REQ_EP_055; REQ_EP_063; REQ_EP_064; REQ_EP_072; REQ_EP_076; REQ_EP_083 - Warning Requirements: None - Failing Requirements: None - - Name: MobChainVisitor - Desc: Visit mobs and verify derivation order. - Detail: OK - Transition to Top-Level Composition: "L01 Top Level" - Detail: OK - Transition to Adjusted-Clip Composition: "L02 Adjusted Clip" - Detail: OK - Transition to Template Clip: "L03 Template Clip A" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Sub-Clip Composition: "L02 Sub-Clip" - Detail: OK - Transition to Adjusted-Clip Composition: "L03 Adjusted Clip" - Detail: OK - Transition to Clip: "L05 Clip A" - Detail: OK - Transition to Film Source: "L06 Film Source" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Clip: "L05 Clip B" - Detail: OK - Transition to Tape Source: "L06 Tape Source" - Detail: OK - Transition to Film Source: "L07 Film Source A" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Template Clip: "L02 Template Clip" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Lower-Level Composition: "L02 Lower Level" - Detail: OK - Transition to Lower-Level Composition: "L03 Lower Level" - Detail: OK - Transition to Clip: "L05 Clip C" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to File Source: "L06 File Source" - Detail: OK - Transition to Import Source: "L07 Import Source" - Detail: OK - Transition to Film Source: "L08 Film Source A" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Tape Source: "L08 Tape Source A" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Recording Source: "L07 Recording Source" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to File Source: "L07 File Source" - Detail: OK - Transition to Tape Source: "L08 Tape Source B" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Film Source: "L08 Film Source B" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Sub-Clip Composition: "L04 Sub-Clip" - Detail: OK - Transition to Template Clip: "L05 Template Clip A" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Clip: "L05 Clip D" - Detail: OK - Transition to Import Source: "L06 Import Source" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Adjusted-Clip Composition: "L04 Adjusted Clip" - Detail: OK - Transition to Template Clip: "L05 Template Clip B" - Detail: OK - Transition to Source Clip - Detail: OK - Transition to Template Clip: "L03 Template Clip B" - Detail: OK - Transition to Source Clip - Result: Passed - Passing Requirements: REQ_EP_017; REQ_EP_018; REQ_EP_019; REQ_EP_025; REQ_EP_026; REQ_EP_030; REQ_EP_031; REQ_EP_036; REQ_EP_045; REQ_EP_050; REQ_EP_055; REQ_EP_063; REQ_EP_064; REQ_EP_072; REQ_EP_076; REQ_EP_083 - Warning Requirements: None - Failing Requirements: None - - Name: Verify Mob Chain - Desc: Verify the structure of one mob chain. Detail: Analyzing root composition mob "Invalid out of Recording Source: Top Level C" Result: Failed --- 92,95 ---- *************** *** 1473,1476 **** --- 1412,1435 ---- Name: Verify Mob Chain Desc: Verify the structure of one mob chain. + Detail: Analyzing root composition mob "Missing EOC Import Source: Top-Level" + Result: Failed + Reason: Visitor Failed - See "MobChainVisitor" Visitor for details. + Passing Requirements: REQ_EP_018; REQ_EP_019; REQ_EP_025; REQ_EP_026; REQ_EP_030; REQ_EP_031; REQ_EP_036; REQ_EP_045; REQ_EP_050; REQ_EP_055; REQ_EP_063; REQ_EP_064; REQ_EP_072; REQ_EP_076; REQ_EP_083 + Warning Requirements: None + Failing Requirements: REQ_EP_017 + + Name: MobChainVisitor + Desc: Visit mobs and verify derivation order. + Detail: OK - Transition to Top-Level Composition: "Missing EOC Import Source: Top-Level" + Detail: OK - Transition to Clip: "Missing EOC Import Source: Clip" + Detail: OK - Transition to Import Source: "Missing EOC Import Source" + Result: Failed + Reason: End of derivation chain encountered without a zero-valued source clip or out of file reference at Source Mob: "Missing EOC Import Source" + Passing Requirements: REQ_EP_018; REQ_EP_019; REQ_EP_025; REQ_EP_026; REQ_EP_030; REQ_EP_031; REQ_EP_036; REQ_EP_045; REQ_EP_050; REQ_EP_055; REQ_EP_063; REQ_EP_064; REQ_EP_072; REQ_EP_076; REQ_EP_083 + Warning Requirements: None + Failing Requirements: REQ_EP_017 + + Name: Verify Mob Chain + Desc: Verify the structure of one mob chain. Detail: Analyzing root composition mob "Missing EOC Adjusted Clip: Top-Level" Result: Failed *************** *** 1630,1653 **** Name: Verify Mob Chain Desc: Verify the structure of one mob chain. - Detail: Analyzing root composition mob "Missing EOC Import Source: Top-Level" - Result: Failed - Reason: Visitor Failed - See "MobChainVisitor" Visitor for details. - Passing Requirements: REQ_EP_018; REQ_EP_019; REQ_EP_025; REQ_EP_026; REQ_EP_030; REQ_EP_031; REQ_EP_036; REQ_EP_045; REQ_EP_050; REQ_EP_055; REQ_EP_063; REQ_EP_064; REQ_EP_072; REQ_EP_076; REQ_EP_083 - Warning Requirements: None - Failing Requirements: REQ_EP_017 - - Name: MobChainVisitor - Desc: Visit mobs and verify derivation order. - Detail: OK - Transition to Top-Level Composition: "Missing EOC Import Source: Top-Level" - Detail: OK - Transition to Clip: "Missing EOC Import Source: Clip" - Detail: OK - Transition to Import Source: "Missing EOC Import Source" - Result: Failed - Reason: End of derivation chain encountered without a zero-valued source clip or out of file reference at Source Mob: "Missing EOC Import Source" - Passing Requirements: REQ_EP_018; REQ_EP_019; REQ_EP_025; REQ_EP_026; REQ_EP_030; REQ_EP_031; REQ_EP_036; REQ_EP_045; REQ_EP_050; REQ_EP_055; REQ_EP_063; REQ_EP_064; REQ_EP_072; REQ_EP_076; REQ_EP_083 - Warning Requirements: None - Failing Requirements: REQ_EP_017 - - Name: Verify Mob Chain - Desc: Verify the structure of one mob chain. Detail: Analyzing root composition mob "Invalid out of Clip: Top Level G" Result: Failed --- 1589,1592 ---- *************** *** 1901,1904 **** --- 1840,1904 ---- Name: Verify Mob Chain Desc: Verify the structure of one mob chain. + Detail: Analyzing root composition mob "L01 Top Level" + Result: Passed + Passing Requirements: REQ_EP_017; REQ_EP_018; REQ_EP_019; REQ_EP_025; REQ_EP_026; REQ_EP_030; REQ_EP_031; REQ_EP_036; REQ_EP_045; REQ_EP_050; REQ_EP_055; REQ_EP_063; REQ_EP_064; REQ_EP_072; REQ_EP_076; REQ_EP_083 + Warning Requirements: None + Failing Requirements: None + + Name: MobChainVisitor + Desc: Visit mobs and verify derivation order. + Detail: OK - Transition to Top-Level Composition: "L01 Top Level" + Detail: OK - Transition to Adjusted-Clip Composition: "L02 Adjusted Clip" + Detail: OK - Transition to Template Clip: "L03 Template Clip A" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Sub-Clip Composition: "L02 Sub-Clip" + Detail: OK - Transition to Adjusted-Clip Composition: "L03 Adjusted Clip" + Detail: OK - Transition to Clip: "L05 Clip A" + Detail: OK - Transition to Film Source: "L06 Film Source" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Clip: "L05 Clip B" + Detail: OK - Transition to Tape Source: "L06 Tape Source" + Detail: OK - Transition to Film Source: "L07 Film Source A" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Template Clip: "L02 Template Clip" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Lower-Level Composition: "L02 Lower Level" + Detail: OK - Transition to Lower-Level Composition: "L03 Lower Level" + Detail: OK - Transition to Clip: "L05 Clip C" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to File Source: "L06 File Source" + Detail: OK - Transition to Import Source: "L07 Import Source" + Detail: OK - Transition to Film Source: "L08 Film Source A" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Tape Source: "L08 Tape Source A" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Recording Source: "L07 Recording Source" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to File Source: "L07 File Source" + Detail: OK - Transition to Tape Source: "L08 Tape Source B" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Film Source: "L08 Film Source B" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Sub-Clip Composition: "L04 Sub-Clip" + Detail: OK - Transition to Template Clip: "L05 Template Clip A" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Clip: "L05 Clip D" + Detail: OK - Transition to Import Source: "L06 Import Source" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Adjusted-Clip Composition: "L04 Adjusted Clip" + Detail: OK - Transition to Template Clip: "L05 Template Clip B" + Detail: OK - Transition to Source Clip + Detail: OK - Transition to Template Clip: "L03 Template Clip B" + Detail: OK - Transition to Source Clip + Result: Passed + Passing Requirements: REQ_EP_017; REQ_EP_018; REQ_EP_019; REQ_EP_025; REQ_EP_026; REQ_EP_030; REQ_EP_031; REQ_EP_036; REQ_EP_045; REQ_EP_050; REQ_EP_055; REQ_EP_063; REQ_EP_064; REQ_EP_072; REQ_EP_076; REQ_EP_083 + Warning Requirements: None + Failing Requirements: None + + Name: Verify Mob Chain + Desc: Verify the structure of one mob chain. Detail: Analyzing root composition mob "Initial->Lower-Level" Result: Failed Index: EPEffectTest.xml =================================================================== RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/RegressionTest/TestFiles/EPEffectTest.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EPEffectTest.xml 6 Dec 2005 16:50:48 -0000 1.4 --- EPEffectTest.xml 14 Dec 2005 17:25:59 -0000 1.5 *************** *** 4,11 **** <aaf-file> ! <!-- Test everything outside of a transition --> <top-level name="Video Dissolve not in Transition"> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence track-type="picture"> <eoc track-type="picture" length="1"/> <video-dissolve track-type="picture" length="1"/> --- 4,11 ---- <aaf-file> [...2059 lines suppressed...] <!-- Test that the correct result are produced when a failure occus on one branch of the file, but not on the next branch. --> <top-level name="Heredity Test"> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence length="0" track-type="audio"> <eoc track-type="audio" length="1"/> <mono-audio-dissolve track-type="audio" length="1"/> *************** *** 1179,1183 **** </timeline-mob-slot> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence track-type="audio"> <eoc track-type="audio" length="1"/> <mono-audio-pan track-type="audio" length="1"/> --- 1179,1183 ---- </timeline-mob-slot> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence length="0" track-type="audio"> <eoc track-type="audio" length="1"/> <mono-audio-pan track-type="audio" length="1"/> Index: SlotInfo.h =================================================================== RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/RegressionTest/TestFiles/SlotInfo.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SlotInfo.h 1 Dec 2005 19:18:18 -0000 1.2 --- SlotInfo.h 14 Dec 2005 17:25:59 -0000 1.3 *************** *** 34,60 **** public: ! SlotInfo( const AxString& element, const aafRational_t editRate, InputParser::OptionalStringAttrib name, InputParser::OptionalIntAttrib physicalTrackNum, InputParser::OptionalIntAttrib markedInPoint, InputParser::OptionalIntAttrib markedOutPoint ) ! : element( element ), ! editRate( editRate ), name( name ), physicalTrackNum( physicalTrackNum ), componentsSinceSlot( 0 ), markedInPoint( markedInPoint ), ! markedOutPoint( markedOutPoint ) {} ! ~SlotInfo() {} SlotInfo( const SlotInfo& other ) ! : element( other.element ), ! editRate( other.editRate ), name( other.name ), physicalTrackNum( other.physicalTrackNum ), componentsSinceSlot( other.componentsSinceSlot ), markedInPoint( other.markedInPoint ), ! markedOutPoint( other.markedOutPoint ) {} ! AxString element; aafRational_t editRate; --- 34,62 ---- public: ! SlotInfo( const AxString& element, const aafRational_t editRate, InputParser::OptionalStringAttrib name, InputParser::OptionalIntAttrib physicalTrackNum, InputParser::OptionalIntAttrib markedInPoint, InputParser::OptionalIntAttrib markedOutPoint, aafPosition_t orgin ) ! : element( element ), ! editRate( editRate ), name( name ), physicalTrackNum( physicalTrackNum ), componentsSinceSlot( 0 ), markedInPoint( markedInPoint ), ! markedOutPoint( markedOutPoint ), ! orgin( orgin ) {} ! ~SlotInfo() {} SlotInfo( const SlotInfo& other ) ! : element( other.element ), ! editRate( other.editRate ), name( other.name ), physicalTrackNum( other.physicalTrackNum ), componentsSinceSlot( other.componentsSinceSlot ), markedInPoint( other.markedInPoint ), ! markedOutPoint( other.markedOutPoint ), ! orgin( other.orgin ) {} ! AxString element; aafRational_t editRate; *************** *** 64,72 **** InputParser::OptionalIntAttrib markedInPoint; InputParser::OptionalIntAttrib markedOutPoint; private: ! //prohibited: ! SlotInfo& operator=( const SlotInfo& other ); }; --- 66,75 ---- InputParser::OptionalIntAttrib markedInPoint; InputParser::OptionalIntAttrib markedOutPoint; + aafPosition_t orgin; private: ! //prohibited: ! SlotInfo& operator=( const SlotInfo& other ); }; Index: EPMultiChannelAudioTest.xml =================================================================== RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/RegressionTest/TestFiles/EPMultiChannelAudioTest.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EPMultiChannelAudioTest.xml 1 Dec 2005 19:18:18 -0000 1.1 --- EPMultiChannelAudioTest.xml 14 Dec 2005 17:25:59 -0000 1.2 *************** *** 3,13 **** <aaf-file> ! ! <top-level> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <source-clip track-type="audio"> <clip> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <source-clip track-type="audio"> <mono-audio name="Mono Audio in Composition and Master" sample-rate-denominator="1" sample-rate-numerator="1"> <bad-eoc/> --- 3,13 ---- <aaf-file> ! ! <top-level> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <source-clip length="0" track-type="audio"> <clip> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <source-clip length="0" track-type="audio"> <mono-audio name="Mono Audio in Composition and Master" sample-rate-denominator="1" sample-rate-numerator="1"> <bad-eoc/> *************** *** 16,20 **** </timeline-mob-slot> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <source-clip track-type="audio"> <multi-channel-audio name="Multi-Channel Audio in Composition and Master" sample-rate-denominator="1" sample-rate-numerator="1"> <bad-eoc/> --- 16,20 ---- </timeline-mob-slot> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <source-clip length="0" track-type="audio"> <multi-channel-audio name="Multi-Channel Audio in Composition and Master" sample-rate-denominator="1" sample-rate-numerator="1"> <bad-eoc/> *************** *** 26,29 **** </timeline-mob-slot> </top-level> ! </aaf-file> \ No newline at end of file --- 26,29 ---- </timeline-mob-slot> </top-level> ! </aaf-file> \ No newline at end of file Index: EPDerivationChain.dtd =================================================================== RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/RegressionTest/TestFiles/EPDerivationChain.dtd,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** EPDerivationChain.dtd 7 Dec 2005 15:48:02 -0000 1.12 --- EPDerivationChain.dtd 14 Dec 2005 17:25:59 -0000 1.13 *************** *** 13,17 **** <!ELEMENT aaf-file ( dictionary?, ( %MOB; ) )+> <!ATTLIST aaf-file ! operational-pattern ( edit-protocol | invalid ) #IMPLIED effect-data-definitions ( current | legacy ) #IMPLIED > --- 13,17 ---- <!ELEMENT aaf-file ( dictionary?, ( %MOB; ) )+> <!ATTLIST aaf-file ! operational-pattern ( edit-protocol | invalid ) #IMPLIED effect-data-definitions ( current | legacy ) #IMPLIED > *************** *** 58,63 **** <!ELEMENT file-source ( %MOB_SLOT; | bad-eoc )+> ! <!ATTLIST file-source ! name CDATA #IMPLIED sample-rate-numerator CDATA #REQUIRED sample-rate-denominator CDATA #REQUIRED --- 58,63 ---- <!ELEMENT file-source ( %MOB_SLOT; | bad-eoc )+> ! <!ATTLIST file-source ! name CDATA #IMPLIED sample-rate-numerator CDATA #REQUIRED sample-rate-denominator CDATA #REQUIRED *************** *** 65,70 **** <!ELEMENT multi-channel-audio ( %MOB_SLOT; | bad-eoc )+> ! <!ATTLIST multi-channel-audio ! name CDATA #IMPLIED sample-rate-numerator CDATA #REQUIRED sample-rate-denominator CDATA #REQUIRED --- 65,70 ---- <!ELEMENT multi-channel-audio ( %MOB_SLOT; | bad-eoc )+> ! <!ATTLIST multi-channel-audio ! name CDATA #IMPLIED sample-rate-numerator CDATA #REQUIRED sample-rate-denominator CDATA #REQUIRED *************** *** 72,77 **** <!ELEMENT mono-audio ( %MOB_SLOT; | bad-eoc )+> ! <!ATTLIST mono-audio ! name CDATA #IMPLIED sample-rate-numerator CDATA #REQUIRED sample-rate-denominator CDATA #REQUIRED --- 72,77 ---- <!ELEMENT mono-audio ( %MOB_SLOT; | bad-eoc )+> ! <!ATTLIST mono-audio ! name CDATA #IMPLIED sample-rate-numerator CDATA #REQUIRED sample-rate-denominator CDATA #REQUIRED *************** *** 79,84 **** <!ELEMENT cdci-source ( %MOB_SLOT; | bad-eoc )+> ! <!ATTLIST cdci-source ! name CDATA #IMPLIED sample-rate-numerator CDATA #REQUIRED sample-rate-denominator CDATA #REQUIRED --- 79,84 ---- <!ELEMENT cdci-source ( %MOB_SLOT; | bad-eoc )+> ! <!ATTLIST cdci-source ! name CDATA #IMPLIED sample-rate-numerator CDATA #REQUIRED sample-rate-denominator CDATA #REQUIRED *************** *** 87,92 **** <!ELEMENT rgba-source ( %MOB_SLOT; | bad-eoc )+> ! <!ATTLIST rgba-source ! name CDATA #IMPLIED sample-rate-numerator CDATA #REQUIRED sample-rate-denominator CDATA #REQUIRED --- 87,92 ---- <!ELEMENT rgba-source ( %MOB_SLOT; | bad-eoc )+> ! <!ATTLIST rgba-source ! name CDATA #IMPLIED sample-rate-numerator CDATA #REQUIRED sample-rate-denominator CDATA #REQUIRED *************** *** 127,151 **** <!ATTLIST timecode track-type ( timecode ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT edgecode ( ( comment | klv-data )* )> <!ATTLIST edgecode track-type ( edgecode ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT timecode-stream-12m ( ( comment | klv-data )* )> <!ATTLIST timecode-stream-12m track-type ( timecode ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT eoc ( ( comment | klv-data )* )> ! <!ATTLIST eoc track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT oof ( ( comment | klv-data )* )> ! <!ATTLIST oof track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED> <!-- Type B Components --> --- 127,157 ---- <!ATTLIST timecode track-type ( timecode ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT edgecode ( ( comment | klv-data )* )> <!ATTLIST edgecode track-type ( edgecode ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT timecode-stream-12m ( ( comment | klv-data )* )> <!ATTLIST timecode-stream-12m track-type ( timecode ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT eoc ( ( comment | klv-data )* )> ! <!ATTLIST eoc track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT oof ( ( comment | klv-data )* )> ! <!ATTLIST oof track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED ! start-time CDATA #IMPLIED ! > <!-- Type B Components --> *************** *** 154,179 **** <!ATTLIST source-clip track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED> <!-- Type C Components --> ! <!ELEMENT transition ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST transition track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT sequence ( ( comment | klv-data )*, ( %COMPONENT; ), %COMMENTS_AND_COMPONENTS; )> <!ATTLIST sequence track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT comment-marker ( ( comment | klv-data )*, ( %SOURCE_REFERENCE; )?, ( comment | klv-data )* )> <!ATTLIST comment-marker track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT descriptive-marker ( ( comment | klv-data )*, ( ( ( %SOURCE_REFERENCE; )?, ( comment | klv-data )*, descriptive-framework? ) | ( descriptive-framework?, ( comment | klv-data )*, ( %SOURCE_REFERENCE; )? ) ), ( comment | klv-data )* )> <!ATTLIST descriptive-marker track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED> <!-- Type D components --> --- 160,193 ---- <!ATTLIST source-clip track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED ! start-time CDATA #IMPLIED ! > <!-- Type C Components --> ! <!ELEMENT transition ( ( comment | klv-data )*, ( %OPERATION_GROUP; | operation-group ), ( comment | klv-data )* )> <!ATTLIST transition track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT sequence ( ( comment | klv-data )*, ( %COMPONENT; ), %COMMENTS_AND_COMPONENTS; )> <!ATTLIST sequence track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT comment-marker ( ( comment | klv-data )*, ( %SOURCE_REFERENCE; )?, ( comment | klv-data )* )> <!ATTLIST comment-marker track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED ! position CDATA #IMPLIED ! > <!ELEMENT descriptive-marker ( ( comment | klv-data )*, ( ( ( %SOURCE_REFERENCE; )?, ( comment | klv-data )*, descriptive-framework? ) | ( descriptive-framework?, ( comment | klv-data )*, ( %SOURCE_REFERENCE; )? ) ), ( comment | klv-data )* )> <!ATTLIST descriptive-marker track-type ( %ESSENCE_TYPE; ) #REQUIRED ! length CDATA #IMPLIED ! position CDATA #IMPLIED ! > <!-- Type D components --> *************** *** 181,190 **** <!-- Operation Groups: ! In Specification: ! Contain 1 SourceReference (pre-rendered version) ! n Parameters ! m Segments ! In XML: ! Contain 1 Segment --> --- 195,204 ---- <!-- Operation Groups: ! In Specification: ! Contain 1 SourceReference (pre-rendered version) ! n Parameters ! m Segments ! In XML: ! Contain 1 Segment --> *************** *** 193,221 **** track-type ( %ESSENCE_TYPE; ) #REQUIRED length CDATA #IMPLIED ! operation-definition CDATA #REQUIRED> <!ELEMENT video-dissolve ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-dissolve track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT smpte-video-wipe ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST smpte-video-wipe track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT video-speed-control ( %COMMENTS_AND_COMPONENTS;, ( constant-speed-ratio | varying-speed-ratio )?, %COMMENTS_AND_COMPONENTS; )> <!ATTLIST video-speed-control track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> ! <!ELEMENT constant-speed-ratio EMPTY> ! <!ATTLIST constant-speed-ratio numerator CDATA #REQUIRED denominator CDATA #REQUIRED > ! <!ELEMENT varying-speed-ratio EMPTY> ! <!ATTLIST varying-speed-ratio numerator CDATA #REQUIRED denominator CDATA #REQUIRED --- 207,239 ---- track-type ( %ESSENCE_TYPE; ) #REQUIRED length CDATA #IMPLIED ! operation-definition CDATA #REQUIRED ! > <!ELEMENT video-dissolve ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-dissolve track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT smpte-video-wipe ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST smpte-video-wipe track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT video-speed-control ( %COMMENTS_AND_COMPONENTS;, ( constant-speed-ratio | varying-speed-ratio )?, %COMMENTS_AND_COMPONENTS; )> <!ATTLIST video-speed-control track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > ! <!ELEMENT constant-speed-ratio EMPTY> ! <!ATTLIST constant-speed-ratio numerator CDATA #REQUIRED denominator CDATA #REQUIRED > ! <!ELEMENT varying-speed-ratio EMPTY> ! <!ATTLIST varying-speed-ratio numerator CDATA #REQUIRED denominator CDATA #REQUIRED *************** *** 226,310 **** <!ATTLIST video-repeat track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT video-flip ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-flip track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT video-flop ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-flop track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT video-flip-flop ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-flip-flop track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT video-position ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-position track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT video-crop ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-crop track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT video-scale ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-scale track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT video-rotate ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-rotate track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT video-corner-pinning ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-corner-pinning track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT alpha-with-video-key ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST alpha-with-video-key track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT separate-alpha-key ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST separate-alpha-key track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT luminance-key ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST luminance-key track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT chroma-key ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST chroma-key track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT mono-audio-gain ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST mono-audio-gain track-type ( audio ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT mono-audio-pan ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST mono-audio-pan track-type ( audio ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT mono-audio-dissolve ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST mono-audio-dissolve track-type ( audio ) #REQUIRED ! length CDATA #IMPLIED> <!ELEMENT two-parameter-mono-audio-dissolve ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST two-parameter-mono-audio-dissolve track-type ( audio ) #REQUIRED ! length CDATA #IMPLIED> <!-- Mob Slots --> --- 244,345 ---- <!ATTLIST video-repeat track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT video-flip ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-flip track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT video-flop ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-flop track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT video-flip-flop ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-flip-flop track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT video-position ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-position track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT video-crop ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-crop track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT video-scale ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-scale track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT video-rotate ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-rotate track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT video-corner-pinning ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST video-corner-pinning track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT alpha-with-video-key ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST alpha-with-video-key track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT separate-alpha-key ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST separate-alpha-key track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT luminance-key ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST luminance-key track-type ( picture ) #REQUIRED ! length CDATA #REQUIRED ! > <!ELEMENT chroma-key ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST chroma-key track-type ( picture ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT mono-audio-gain ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST mono-audio-gain track-type ( audio ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT mono-audio-pan ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST mono-audio-pan track-type ( audio ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT mono-audio-dissolve ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST mono-audio-dissolve track-type ( audio ) #REQUIRED ! length CDATA #IMPLIED ! > <!ELEMENT two-parameter-mono-audio-dissolve ( %COMMENTS_AND_SEGMENTS; )> <!ATTLIST two-parameter-mono-audio-dissolve track-type ( audio ) #REQUIRED ! length CDATA #IMPLIED ! > <!-- Mob Slots --> *************** *** 318,321 **** --- 353,357 ---- marked-in-point CDATA #IMPLIED marked-out-point CDATA #IMPLIED + orgin CDATA #IMPLIED > Index: EPEditRateTest6.xml =================================================================== RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/RegressionTest/TestFiles/EPEditRateTest6.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EPEditRateTest6.xml 24 Nov 2005 17:10:48 -0000 1.3 --- EPEditRateTest6.xml 14 Dec 2005 17:25:59 -0000 1.4 *************** *** 8,29 **** <clip name="Clip 1"> <timeline-mob-slot edit-rate-denominator="24" edit-rate-numerator="600"> ! <source-clip track-type="audio"> ! <file-source name="File Source 1" sample-rate-denominator="24" sample-rate-numerator="1200000"> ! <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <eoc track-type="none"/> </timeline-mob-slot> ! </file-source> ! </source-clip> </timeline-mob-slot> </clip> <clip name="Clip 2"> <timeline-mob-slot edit-rate-denominator="24" edit-rate-numerator="600"> ! <source-clip track-type="audio"> ! <file-source name="File Source 1" sample-rate-denominator="24" sample-rate-numerator="1200000"> ! <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <eoc track-type="none"/> </timeline-mob-slot> ! </file-source> ! </source-clip> </timeline-mob-slot> </clip> --- 8,29 ---- <clip name="Clip 1"> <timeline-mob-slot edit-rate-denominator="24" edit-rate-numerator="600"> ! <source-clip length="0" track-type="audio"> ! <file-source name="File Source 1" sample-rate-denominator="24" sample-rate-numerator="1200000"> ! <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <eoc length="0" track-type="none"/> </timeline-mob-slot> ! </file-source> ! </source-clip> </timeline-mob-slot> </clip> <clip name="Clip 2"> <timeline-mob-slot edit-rate-denominator="24" edit-rate-numerator="600"> ! <source-clip length="0" track-type="audio"> ! <file-source name="File Source 1" sample-rate-denominator="24" sample-rate-numerator="1200000"> ! <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <eoc length="0" track-type="none"/> </timeline-mob-slot> ! </file-source> ! </source-clip> </timeline-mob-slot> </clip> Index: EPContainedTrackTest.xml =================================================================== RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/RegressionTest/TestFiles/EPContainedTrackTest.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EPContainedTrackTest.xml 24 Nov 2005 17:10:48 -0000 1.5 --- EPContainedTrackTest.xml 14 Dec 2005 17:25:59 -0000 1.6 *************** *** 4,189 **** <aaf-file> ! <!-- Test Top-Level Compositions --> <top-level name="One Primary"> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1" physical-track-number="1"> ! <timecode track-type="timecode"/> </timeline-mob-slot> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <eoc track-type="none"/> [...3533 lines suppressed...] </source-clip> </timeline-mob-slot> ! <static-mob-slot> ! <source-clip length="0" track-type="auxiliary"> <template-clip> <static-mob-slot> ! <eoc length="0" track-type="auxiliary"/> </static-mob-slot> </template-clip> *************** *** 1780,1783 **** </static-mob-slot> </auxiliary-source> ! </aaf-file> --- 1780,1783 ---- </static-mob-slot> </auxiliary-source> ! </aaf-file> Index: EPAnnotationTest2.xml =================================================================== RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/RegressionTest/TestFiles/EPAnnotationTest2.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EPAnnotationTest2.xml 30 Nov 2005 16:49:10 -0000 1.1 --- EPAnnotationTest2.xml 14 Dec 2005 17:25:59 -0000 1.2 *************** *** 4,18 **** <aaf-file> ! <!-- This test is the same as EPAnnotationTest, but, does not have any dictionary entries so it should result in extra failures --> ! <!-- Test UserComments property --> <top-level name="User Comments in Mob Slot Segment"> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <source-clip track-type="none"> <comment value="Should Pass" name="Test Case 1"/> <lower-level> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <eoc track-type="none"/> </timeline-mob-slot> </lower-level> --- 4,18 ---- <aaf-file> ! <!-- This test is the same as EPAnnotationTest, but, does not have any dictionary entries so it should result in extra failures --> ! <!-- Test UserComments property --> <top-level name="User Comments in Mob Slot Segment"> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <source-clip length="0" track-type="none"> <comment value="Should Pass" name="Test Case 1"/> <lower-level> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <eoc length="0" track-type="none"/> </timeline-mob-slot> </lower-level> *************** *** 20,28 **** </timeline-mob-slot> </top-level> ! <top-level name="User Comments in CommentMarker"> ! <event-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence track-type="none"> ! <comment-marker track-type="none" length="1"> <comment value="Should Pass" name="Test Case 2"/> </comment-marker> --- 20,28 ---- </timeline-mob-slot> </top-level> ! <top-level name="User Comments in CommentMarker"> ! <event-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence length="0" track-type="none"> ! <comment-marker track-type="none" length="1"> <comment value="Should Pass" name="Test Case 2"/> </comment-marker> *************** *** 30,42 **** </event-mob-slot> </top-level> ! ! <!-- NOTE: Currently this test case is not causing an error because the ! comment is not in the dictionary. This is occuring because ! the traversal ends when a UserComment is detected in the second ! sequence. If the traversal is made to continue, this test case ! will fail --> <top-level name="Illegal User Comments"> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence track-type="none"> <sequence track-type="none" length="1"> <comment value="Should Fail" name="Test Case 3"/> --- 30,42 ---- </event-mob-slot> </top-level> ! ! <!-- NOTE: Currently this test case is not causing an error because the ! comment is not in the dictionary. This is occuring because ! the traversal ends when a UserComment is detected in the second ! sequence. If the traversal is made to continue, this test case ! will fail --> <top-level name="Illegal User Comments"> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence length="0" track-type="none"> <sequence track-type="none" length="1"> <comment value="Should Fail" name="Test Case 3"/> *************** *** 47,145 **** </top-level> ! <!-- Test CommentMarkes in essence/non-essence tracks --> <!-- Note: Case 2 above tests CommentMarkers in non-essence tracks --> <top-level name="CommentMarker in Essence Track"> ! <event-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence track-type="audio"> ! <comment-marker track-type="audio" length="1"/> </sequence> </event-mob-slot> </top-level> ! <top-level name="DescriptiveMarker in Essence Track"> ! <event-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence track-type="audio"> ! <descriptive-marker track-type="audio" length="1"/> </sequence> </event-mob-slot> </top-level> ! <!-- NEED TO TEST A DESCRIPTIVE MARKER IN AN ESSENCE TRACK --> ! <!-- Test CommentMarkes in Mob Slots (and nested in mob slots) --> <!-- Note: "CommentMarker in Essence Track" above test tests nested in an event mob slot --> <top-level name="CommentMarker in Event Mob Slot"> ! <event-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <comment-marker track-type="none"/> </event-mob-slot> </top-level> ! <top-level name="CommentMarker nested in Timeline Mob Slot"> ! <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence track-type="none"> ! <comment-marker track-type="none"/> </sequence> </timeline-mob-slot> </top-level> ! <top-level name="CommentMarker in Timeline Mob Slot"> ! <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <comment-marker track-type="none"/> </timeline-mob-slot> </top-level> ! ! <top-level name="CommentMarker nested in Static Mob Slot"> ! <static-mob-slot> ! <sequence track-type="none"> ! <comment-marker track-type="none"/> </sequence> </static-mob-slot> </top-level> ! <top-level name="CommentMarker in Static Mob Slot"> ! <static-mob-slot> ! <comment-marker track-type="none"/> </static-mob-slot> </top-level> ! <!-- Note: "DescriptiveMarker in Essence Track" above test tests nested in an event mob slot --> <top-level name="DescriptiveMarker in Event Mob Slot"> ! <event-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <descriptive-marker track-type="none"/> </event-mob-slot> </top-level> ! <top-level name="DescriptiveMarker nested in Timeline Mob Slot"> ! <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence track-type="none"> ! <descriptive-marker track-type="none" length="1"/> </sequence> </timeline-mob-slot> </top-level> ! <top-level name="DescriptiveMarker in Timeline Mob Slot"> ! <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <descriptive-marker track-type="none"/> </timeline-mob-slot> </top-level> ! ! <top-level name="DescriptiveMarker nested in Static Mob Slot"> ! <static-mob-slot> ! <sequence track-type="none"> ! <descriptive-marker track-type="none" length="1"/> </sequence> </static-mob-slot> </top-level> ! <top-level name="DescriptiveMarker in Static Mob Slot"> ! <static-mob-slot> ! <descriptive-marker track-type="none"/> </static-mob-slot> </top-level> ! <!-- Test a registered KLV Data --> <top-level name="Registered KLV Data"> <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence track-type="audio"> <klv-data value="Should Pass" key-name="KLV Test"/> <eoc track-type="audio" length="1"/> --- 47,145 ---- </top-level> ! <!-- Test CommentMarkes in essence/non-essence tracks --> <!-- Note: Case 2 above tests CommentMarkers in non-essence tracks --> <top-level name="CommentMarker in Essence Track"> ! <event-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence length="0" track-type="audio"> ! <comment-marker track-type="audio" length="1"/> </sequence> </event-mob-slot> </top-level> ! <top-level name="DescriptiveMarker in Essence Track"> ! <event-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence length="0" track-type="audio"> ! <descriptive-marker track-type="audio" length="1"/> </sequence> </event-mob-slot> </top-level> ! <!-- NEED TO TEST A DESCRIPTIVE MARKER IN AN ESSENCE TRACK --> ! <!-- Test CommentMarkes in Mob Slots (and nested in mob slots) --> <!-- Note: "CommentMarker in Essence Track" above test tests nested in an event mob slot --> <top-level name="CommentMarker in Event Mob Slot"> ! <event-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <comment-marker length="0" track-type="none"/> </event-mob-slot> </top-level> ! <top-level name="CommentMarker nested in Timeline Mob Slot"> ! <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! <sequence length="0" track-type="none"> ! <comment-marker length="0" track-type="none"/> </sequence> </timeline-mob-slot> </top-level> ! <top-level name="CommentMarker in Timeline Mob Slot"> ! <timeline-mob-slot edit-rate-denominator="1" edit-rate-numerator="1"> ! ... [truncated message content] |