API_REF/Public_API: comparison epoc32/include/mmf/devvideo/devvideobase.h

equal deleted inserted replaced

-:e1b950c65cb4
+:837f303aceeb
 // Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
 //
 // Contributors:
 #include <e32base.h>
 #include <w32std.h>
 #include <mmf/devvideo/devvideoconstants.h>
 #include <ecom/ecom.h>
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <mmf/devvideo/devvideohwdeviceadaptersetup.h>
+#endif
 /**
 Panic utility function
-@internalTechnology
+@publishedAll
 */
 LOCAL_C void DevVideoPanic(TInt aReason)
 	{
 	User::Panic(KDevVideoPanicCategory, aReason);
 	}
 		/**
 		Pointer to an RGB bitmap. Valid if iDataFormat is ERgbFbsBitmap.
 		*/
 		CFbsBitmap* iRgbBitmap;
+		/**
+		 Buffer number of current buffer for composition that is used when submitting a surface update. Valid if iDataFormat is set to ESurfaceBuffer
+		*/
+		TInt iSurfaceBufNum;
 		};
 	};
 /**
 Header information for one decoded picture.
 		/** Set if a picture effect is in use and the picture effect field is valid.
 		*/
 		EPictureEffect	 = 0x00000040,
 		/** Set if picture effect parameters are valid.
 		*/
-		EEffectParameters  = 0x00000080
+		EEffectParameters  = 0x00000080,
+		/** Content protected pictures cannot be displayed on unprotected
+		    external displays such as TV-out.
+		*/
+		EContentProtected = 0x00000100
 		};
 	/**
 	The picture data. The picture data, including all pointers, must remain valid until
 	the picture has been returned to its originator.
 	Tests whether this CCompressedVideoFormat is identical to aOther or not.
 	@return "ETrue if the two objects are identical, EFalse if not."
 	*/
 	IMPORT_C TBool operator==(const CCompressedVideoFormat& aOther) const;
 protected:
 /**
 @internalTechnology
 */
 	CCompressedVideoFormat();
 /**
 @internalTechnology
 */
 	void ConstructL(const TDesC8& aMimeType, const TDesC8& aOptionalData);
 private:
 	HBufC8* iMimeType;
 	HBufC8* iOptionalData;
 	};
 	The quality/temporal tradeoff for bit-rate control. The value range is [0.0…1.0]. Value 0.0
 	specifies that picture quality should be maintained as well as possible, sacrificing picture rate.
 	Value 1.0 specifies that picture rate should be maintained as well as possible, sacrificing
 	picture quality.
 	*/
 	TReal iQualityTemporalTradeoff;
 	/**
-	The latency/quality tradeoff for bit-rate control. The value range is [0.0…1.0]. Value 0.0
+The latency/quality tradeoff for bit-rate control. The value range is [0.0…1.0]. Value 0.0
-	specifies that the transmission delay and the decoder input buffer occupancy level caused by
+specifies that the transmission delay and the decoder input buffer occupancy level caused by
-	the bit-rate control is minimized, i.e. the actual coded bit-rate follows the target bit-rate
+the bit-rate control is minimized, i.e. the actual coded bit-rate follows the target bit-rate
-	as closely as possible. 1.0 specifies that the transmission delay caused by the bit-rate control
+as closely as possible. 1.0 specifies that the transmission delay caused by the bit-rate control
-	should be as high as needed to guarantee a constant picture quality and frame rate as long as
+should be as high as needed to guarantee a constant picture quality and frame rate as long as
-	the coded data conforms to the given HRD/VBV parameters (if any).
+the coded data conforms to the given HRD/VBV parameters (if any).
-	*/
+*/
 	TReal iLatencyQualityTradeoff;
 	};
 /**
 Custom interface Uid for setting up the DevVideo hw device adapter
 */
 const TInt	KUidDevVideoHwDeviceAdapterSetup = 0x102737EF;
-/**
-Custom interface for setting up the DevVideo hw device adapter
-@publishedPartner
-@prototype
-*/
-class MDevVideoHwDeviceAdapterSetup
-	{
-public:
-	/**
-	Set the Uid of the processing unit into the hw device adapter
-	*/
-	virtual void LoadProcessingUnitL(const CImplementationInformation& aImplInfo) = 0;
-	};
 #include <mmf/devvideo/devvideobase.inl>
 #endif

branch	Symbian3
changeset 4	837f303aceeb
parent 2	2fe1408b6811