From: Alexey K. <akh...@us...> - 2008-08-27 20:35:35
|
Update of /cvsroot/aaf/AAF/ref-impl/include/ref-api In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv23592/ref-impl/include/ref-api Modified Files: AAF.h Log Message: Change FileDescriptor's GetContainerFormat and GetCodecDef to check if the weak reference can be resolved before getting the referenced object. MXF files may have references to container and codec definitions that are not present in the dictionary. Index: AAF.h =================================================================== RCS file: /cvsroot/aaf/AAF/ref-impl/include/ref-api/AAF.h,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** AAF.h 17 Apr 2007 17:32:51 -0000 1.59 --- AAF.h 27 Aug 2008 20:35:41 -0000 1.60 *************** *** 5747,5751 **** /// Optional properties are added with separate functions. /// ! /// Succeeds if: /// - This object has not already been Initialize()d. /// --- 5747,5751 ---- /// Optional properties are added with separate functions. /// ! /// Succeds if: /// - This object has not already been Initialize()d. /// *************** *** 5874,5882 **** /// - the DescribedSlotIDs property is not present. /// ! /// @param describedSlotID [in] Described slot ID whose presence is to be queried ! /// @param pIsPresent [out,retval] True if describedSlotID is present /// STDMETHOD(IsDescribedSlotIDPresent) (THIS_ ! aafUInt32 describedSlotID, aafBoolean_t* pIsPresent) PURE; --- 5874,5882 ---- /// - the DescribedSlotIDs property is not present. /// ! /// @param DescribedSlotID [in] described slot ID whose presence is to be queried ! /// @param pIsPresent [out,retval] True if DescribedSlotID is present /// STDMETHOD(IsDescribedSlotIDPresent) (THIS_ ! aafUInt32 DescribedSlotID, aafBoolean_t* pIsPresent) PURE; *************** *** 5904,5911 **** /// of described slot IDs referenced by this DescriptiveClip. /// ! /// @param describedSlotID [in] Described slot ID to add. /// STDMETHOD(AddDescribedSlotID) (THIS_ ! aafUInt32 describedSlotID) PURE; --- 5904,5911 ---- /// of described slot IDs referenced by this DescriptiveClip. /// ! /// @param DescribedSlotID [in] described slot ID to add. /// STDMETHOD(AddDescribedSlotID) (THIS_ ! aafUInt32 DescribedSlotID) PURE; *************** *** 5939,5946 **** /// of described slot IDs referenced by this DescriptiveClip. /// ! /// @param describedSlotID [in] Described slot ID to remove. /// STDMETHOD(RemoveDescribedSlotID) (THIS_ ! aafUInt32 describedSlotID) PURE; --- 5939,5946 ---- /// of described slot IDs referenced by this DescriptiveClip. /// ! /// @param DescribedSlotID [in] described slot ID to remove. /// STDMETHOD(RemoveDescribedSlotID) (THIS_ ! aafUInt32 DescribedSlotID) PURE; *************** *** 9860,9863 **** --- 9860,9865 ---- /// Succeeds if all of the following are true: /// - the pCodecDef pointer is valid. + /// - the CodecDefinition identifying the codec is + /// present in the dictionary. /// /// If this method fails nothing will be written to *pCodecDef. *************** *** 9873,9876 **** --- 9875,9882 ---- /// - pCodecDef arg is NULL. /// + /// AAFRESULT_OBJECT_NOT_FOUND + /// - the CodecDefinition identifying the codec is not + /// in the dictionary. + /// /// @param pCodecDef [out] Which codec was used /// *************** *** 9960,9963 **** --- 9966,9971 ---- /// Succeeds if all of the following are true: /// - the pFormat pointer is valid. + /// - the ContainerDefinition identifying the file format is + /// present in the dictionary. /// /// If this method fails nothing will be written to *pFormat. *************** *** 9973,9976 **** --- 9981,9988 ---- /// - pFormat arg is NULL. /// + /// AAFRESULT_OBJECT_NOT_FOUND + /// - the ContainerDefinition identifying the file format is not + /// in the dictionary. + /// /// @param pFormat [out] Optional /// *************** *** 46371,46374 **** --- 46383,46388 ---- /// Succeeds if all of the following are true: /// - the pCodecDef pointer is valid. + /// - the CodecDefinition identifying the codec is + /// present in the dictionary. /// /// If this method fails nothing will be written to *pCodecDef. *************** *** 46384,46387 **** --- 46398,46405 ---- /// - pCodecDef arg is NULL. /// + /// AAFRESULT_OBJECT_NOT_FOUND + /// - the CodecDefinition identifying the codec is not + /// in the dictionary. + /// /// @param pCodecDef [out] Which codec was used /// *************** *** 46471,46474 **** --- 46489,46494 ---- /// Succeeds if all of the following are true: /// - the pFormat pointer is valid. + /// - the ContainerDefinition identifying the file format is + /// present in the dictionary. /// /// If this method fails nothing will be written to *pFormat. *************** *** 46484,46487 **** --- 46504,46511 ---- /// - pFormat arg is NULL. /// + /// AAFRESULT_OBJECT_NOT_FOUND + /// - the ContainerDefinition identifying the file format is not + /// in the dictionary. + /// /// @param pFormat [out] Optional /// |