[Common-dev] CR: Avoiding conflict with STATS
Alberto Meza ameza at dextratech.com
Index: include/ihxtlogsystem.h
===================================================================
RCS file: /cvsroot/common/include/ihxtlogsystem.h,v
retrieving revision 1.12
diff -u -w -r1.12 ihxtlogsystem.h
--- include/ihxtlogsystem.h 14 Mar 2005 19:27:09 -0000 1.12
+++ include/ihxtlogsystem.h 30 Mar 2005 21:44:00 -0000
@@ -126,7 +126,7 @@
FA_SDK_ENCODE, // SDK encoding (typically encpipeline, streammanager)
FA_SDK_CORE, // RSCore, RSUtil, RSGraphManager stuff
FA_GEN_FILTER, // Generic filter msgs
- STATS,
+ HXLOG_STATS,
VIDCODEC,
VIDPREFIL,
VIDRENDR,
-----Original Message-----
From: Liam Murray [mailto:liamm at real.com]
Sent: Thursday, April 28, 2005 2:38 PM
To: Alberto Meza
Subject: Re: Redifining STATS
I suggest you just change the name to something like HXLOG_STATS in the
ihxtlogsystem.h enum. I don't think that enum is used much in the client
code base.
Thanks,
Liam
Everything looks good. However, we should double-check
with the Producer team to make sure that this change:
Index: include/ihxtlogsystem.h
===================================================================
RCS file: /cvsroot/common/include/ihxtlogsystem.h,v
retrieving revision 1.12
diff -u -w -r1.12 ihxtlogsystem.h
--- include/ihxtlogsystem.h 14 Mar 2005 19:27:09 -0000 1.12
+++ include/ihxtlogsystem.h 30 Mar 2005 21:44:00 -0000
@@ -126,7 +126,7 @@
FA_SDK_ENCODE, // SDK encoding (typically encpipeline, streammanager)
FA_SDK_CORE, // RSCore, RSUtil, RSGraphManager stuff
FA_GEN_FILTER, // Generic filter msgs
- STATS,
+ STATSX,
VIDCODEC,
VIDPREFIL,
VIDRENDR,
is OK with them. Don't check this include/ihxtlogsystem.h
change in yet, but the rest look OK.
Eric
> -----Original Message-----
> From: Alberto Meza [mailto:ameza at dextratech.com]
> Sent: Thursday, April 28, 2005 1:22 PM
> To: ehyche at real.com; 'common-dev'
> Subject: CR-Resend: Add #defines for Symbian 8.0
>
>
>
> -----Original Message-----
> From: common-dev-bounces at helixcommunity.org
> [mailto:common-dev-bounces at helixcommunity.org]On Behalf Of
> Alberto Meza
> Sent: Wednesday, April 06, 2005 2:44 PM
> To: ehyche at real.com; 'common-dev'
> Subject: RE: [Common-dev] CR: Add #defines for Symbian 8.0
>
>
> OK, that works for me
> Here is the rediff with your suggested changes.
>
> Thanks and regards, Alberto
>
>
> -----Original Message-----
> From: Eric Hyche [mailto:ehyche at real.com]
> Sent: Thursday, March 31, 2005 8:58 AM
> To: 'Alberto Meza'; 'common-dev'
> Subject: RE: [Common-dev] CR: Add #defines for Symbian 8.0
>
>
>
> comments inline...
>
> > -----Original Message-----
> > From: common-dev-bounces at helixcommunity.org
> > [mailto:common-dev-bounces at helixcommunity.org] On Behalf Of
> > Alberto Meza
> > Sent: Wednesday, March 30, 2005 8:22 PM
> > To: common-dev
> > Subject: [Common-dev] CR: Add #defines for Symbian 8.0
> >
> > Modified by: ameza at dextratech.com
> > Date : Mar/30/2004
> > Reviewed By:
> >
> > Image Size and Heap Use impact : Minimal
> > Branch : helix HEAD
> > Platform: Build verified symbian-81-winscw
> >
> > File Modified:
> > include/hxtypes.h
> >
> >
> > Copyright assignment:
> > I agree to assign to RealNetworks full copyright ownership
> of the code
> > represented by the attached patch. I warrant that I am
> > legally entitled to
> > grant the copyright assignment and that my contribution does
> > not violate any
> > law or breach any contract. I understand that RealNetworks
> > may license this
> > code under RPSL, RCSL, and/or any other license at
> RealNetworks' sole
> > discretion.
> >
> >
> > Thanks and regards,
> > Alberto Meza
> >
> >
> >
> > Index: include/hxtypes.h
> > ===================================================================
> > RCS file: /cvsroot/common/include/hxtypes.h,v
> > retrieving revision 1.25
> > diff -u -w -r1.25 hxtypes.h
> > --- include/hxtypes.h 10 Mar 2005 19:49:29 -0000 1.25
> > +++ include/hxtypes.h 29 Mar 2005 22:09:51 -0000
> > @@ -165,7 +165,7 @@
> > #elif defined(_WINDOWS) || defined(_OPENWAVE_SIMULATOR)
> > typedef __int64 INT64;
> > typedef unsigned __int64 UINT64;
> > -#elif defined(_SYMBIAN) && !defined (_SYMBIAN_81_)
> > +#elif defined(_SYMBIAN) && !defined (_SYMBIAN_81_) && !defined
> > (_SYMBIAN_80_)
>
> OK.
>
> > typedef SymInt64 INT64;
> > typedef SymInt64 UINT64;
> > #else
> > @@ -186,7 +186,7 @@
> > * so, we provide these casting macros that have to be used
> > * to cast 64-bit ints to smaller datatypes
> > */
> > -#if defined(_SYMBIAN) && !defined (_SYMBIAN_81_)
> > +#if defined(_SYMBIAN) && !defined (_SYMBIAN_81_) && !defined
> > (_SYMBIAN_80_)
>
> OK.
>
> > #define INT64_TO_ULONG32(a) ((ULONG32)((a).Low()))
> > #define INT64_TO_UINT32(a) ((UINT32)((a).Low()))
> > #define INT64_TO_INT32(a) ((INT32)((a).Low()))
> >
> > Index: include/platform/symbian/symbiantypes.h
> > ===================================================================
> > RCS file: /cvsroot/common/include/platform/symbian/symbiantypes.h,v
> > retrieving revision 1.12
> > diff -u -w -r1.12 symbiantypes.h
> > --- include/platform/symbian/symbiantypes.h 16 Mar 2005
> > 01:43:22 -0000 1.12
> > +++ include/platform/symbian/symbiantypes.h 29 Mar 2005
> > 22:10:47 -0000
> > @@ -75,6 +75,7 @@
> > }
> >
> > #ifndef _SYMBIAN_81_
> > +#ifndef _SYMBIAN_80_
> > class SymInt64 : private TInt64
> > {
> > public:
> > @@ -517,6 +518,7 @@
> > return bVal > aVal;
> > }
> >
> > +#endif // _SYMBIAN_80_
> > #endif // _SYMBIAN_81_
>
> This seems a little awkward. How about just
> making this:
>
> -#ifndef _SYMBIAN_81_
> +#if !defined(_SYMBIAN_80_) && !defined(_SYMBIAN_81_)
>
> This seems a little easier to read...
>
> Eric
> >
> >
> >
>