[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-dev
Subject: RE: [datatype-dev] CR: HEAD fix - Fix to bring all WMA fourcc
From: "Eric Hyche" <ehyche () real ! com>
Date: 2008-10-28 13:27:00
Message-ID: 003201c93900$dcc45f50$964d1df0$ () com
[Download RAW message or body]
These changes look good.
=======================================
Eric Hyche (ehyche@real.com)
Principal Engineer
RealNetworks, Inc.
>-----Original Message-----
>From: datatype-dev-bounces@helixcommunity.org [mailto:datatype-dev-bounces@helixcommunity.org] On
>Behalf Of saleem.adookkattil@nokia.com
>Sent: Monday, October 27, 2008 1:39 PM
>To: datatype-dev@helixcommunity.org; nokia-private-dev@helixcommunity.org
>Subject: [datatype-dev] CR: HEAD fix - Fix to bring all WMA fourcc constant definition and other
>related constant definition to one place to avoid failure on making changes to it
>
>"Nokia submits this code under the terms of a commercial contribution agreement with RealNetworks, and
>I am authorized to contribute this code under said agreement."
>
>Modified by: saleem.adookkattil@nokia.com
>
>Reviewed by:
>
>Date: 10-Oct-2008
>
>Project: SymbianMmf_wm
>
>TSW:
>
>Synopsis: Fix to bring all WMA fourcc constant definition and other related constant definition to one
>place to avoid failure on making changes to it
>
>Overview: Recent changes made to fourcc constant definition in HEAD causes failure in symbian specific
>WMA source code. I mean the Code that compares fourcc string in symbian specific code fails after the
>changes. Moved fourcc and other related constant definition to a common header file to correct this
>failure as specified in the diff files. Made correction in masymbianswdecoder.cpp to avoid a crash on
>pAudConfig == NULL condition as well. Corrected forcc constant value "WMA10" defined in
>wmarender.cpp(five character string) to four character string "wmaA"(The value defined in
>wmadecoder.cpp) .
>
>Files Modified:
>
>/cvsroot/datatype/wm/common/pub/parse_audio.h
>/cvsroot/datatype/wm/audio/renderer/wmadecoder.cpp
>/cvsroot/datatype/wm/audio/renderer/wmarender.cpp
>/cvsroot/datatype/mdf/audio/arm/wma/platform/symbian/wmaaudioconfigs.cpp
>/cvsroot/datatype/mdf/audio/arm/wma/platform/symbian/wmasymbianswdecoder.cpp
>
>Image Size and Heap Use impact: None
>
>Module Release testing (STIF) : Pass
>
>Test case(s) Added : No
>
>Memory leak check performed : No new leaks introduced.
>
>Platforms and Profiles Build Verified:
>Profile -> helix-client-s60-32-mmf-mdf-arm, helix-client-s60-50-mmf-mdf-dsp BIF branch ->
>helix_restricted SYSTEM_ID -> symbian-91-armv5, symbian-91-winscw-emulator Target -> symbianMmf_wm
>
>Platforms and Profiles Functionality verified: armv5, winscw
>
>Branch: head
>
>Index: parse_audio.h
>===================================================================
>RCS file: /cvsroot/datatype/wm/common/pub/parse_audio.h,v
>retrieving revision 1.3
>diff -u -w -r1.3 parse_audio.h
>--- parse_audio.h 18 Sep 2008 23:53:21 -0000 1.3
>+++ parse_audio.h 24 Oct 2008 22:43:58 -0000
>@@ -85,6 +85,20 @@
> #define HXWM_SPEAKER_TOP_BACK_CENTER 0x10000
> #define HXWM_SPEAKER_TOP_BACK_RIGHT 0x20000
>
>+#define WMA_RENDERER_NAME "Windows Media Audio"
>+#define CODEC_FOURCC_CONFIG_PROPERTY "CodecFourCC"
>+#define WMDECODER_CODEC_NAME_WMA9 "Windows Media Audio 9"
>+#define WMDECODER_CODEC_NAME_WMA9_PROFESSIONAL "Windows Media Audio 9 Professional"
>+#define WMDECODER_CODEC_NAME_WMA9_LOSSLESS "Windows Media Audio 9 Lossless"
>+#define WMDECODER_CODEC_4CC_WMA9 "wma9"
>+#define WMDECODER_CODEC_4CC_WMA9_PROFESSIONAL "wma9"
>+#define WMDECODER_CODEC_4CC_WMA9_LOSSLESS "wma9"
>+#define WMDECODER_CODEC_NAME_WMA10 "Windows Media Audio 10"
>+#define WMDECODER_CODEC_NAME_WMA10_PROFESSIONAL "Windows Media Audio 10 Professional"
>+#define WMDECODER_CODEC_NAME_WMA10_LOSSLESS "Windows Media Audio 10 Lossless"
>+#define WMDECODER_CODEC_4CC_WMA10 "wmaA"
>+#define WMDECODER_CODEC_4CC_WMA10_PROFESSIONAL "wmaA"
>+#define WMDECODER_CODEC_4CC_WMA10_LOSSLESS "wmaA"
>
> HX_RESULT DetermineSamplesPerBlock(UINT16 usFormatTag, UINT32 ulSamplesPerSec, UINT32
>ulAvgBytesPerSec,
> UINT16 usEncodeOptions, UINT32* pulSamplesPerBlock);
>
>Index: wmadecoder.cpp
>===================================================================
>RCS file: /cvsroot/datatype/wm/audio/renderer/wmadecoder.cpp,v
>retrieving revision 1.10
>diff -u -w -r1.10 wmadecoder.cpp
>--- wmadecoder.cpp 8 Oct 2008 06:22:21 -0000 1.10
>+++ wmadecoder.cpp 24 Oct 2008 22:45:49 -0000
>@@ -50,20 +50,6 @@
> #include "hxtlogutil.h"
> #include "wmadecoder.h"
>
>-#define CODEC_FOURCC_CONFIG_PROPERTY "CodecFourCC"
>-#define WMDECODER_CODEC_NAME_WMA9 "Windows Media Audio 9"
>-#define WMDECODER_CODEC_NAME_WMA9_PROFESSIONAL "Windows Media Audio 9 Professional"
>-#define WMDECODER_CODEC_NAME_WMA9_LOSSLESS "Windows Media Audio 9 Lossless"
>-#define WMDECODER_CODEC_4CC_WMA9 "wma9"
>-#define WMDECODER_CODEC_4CC_WMA9_PROFESSIONAL "wma9"
>-#define WMDECODER_CODEC_4CC_WMA9_LOSSLESS "wma9"
>-#define WMDECODER_CODEC_NAME_WMA10 "Windows Media Audio 10"
>-#define WMDECODER_CODEC_NAME_WMA10_PROFESSIONAL "Windows Media Audio 10 Professional"
>-#define WMDECODER_CODEC_NAME_WMA10_LOSSLESS "Windows Media Audio 10 Lossless"
>-#define WMDECODER_CODEC_4CC_WMA10 "wmaA"
>-#define WMDECODER_CODEC_4CC_WMA10_PROFESSIONAL "wmaA"
>-#define WMDECODER_CODEC_4CC_WMA10_LOSSLESS "wmaA"
>-
> #if defined(WIN32) || defined(_WIN32) || defined(_SYMBIAN) const char* const
>CWMAudioDecoder::m_pszDLLSuffix = ".DLL"; #elif defined(_MAC_UNIX)
>
>Index: wmarender.cpp
>===================================================================
>RCS file: /cvsroot/datatype/wm/audio/renderer/wmarender.cpp,v
>retrieving revision 1.5
>diff -u -w -r1.5 wmarender.cpp
>--- wmarender.cpp 8 Oct 2008 06:22:21 -0000 1.5
>+++ wmarender.cpp 24 Oct 2008 22:49:10 -0000
>@@ -47,6 +47,7 @@
> #include "wmaformat.h"
> #include "wmarender.h"
> #include "wmarender.ver"
>+#include "parse_audio.h"
>
> #include "hxheap.h"
> #ifdef _DEBUG
>@@ -54,12 +55,6 @@
> static const char HX_THIS_FILE[] = __FILE__; #endif
>
>-#define WMA_RENDERER_NAME "Windows Media Audio"
>-#define WMA_CODEC_4CC "WMA9"
>-#define WMA_CODEC_NAME "Windows Media Audio 9"
>-#define WMA_CODEC_4CC "WMA10"
>-#define WMA_CODEC_NAME "Windows Media Audio 10"
>-
> const char* const CWMAudioRenderer::m_pszDescription = "RealNetworks Windows Media Audio
>Renderer Plugin";
> const char* const CWMAudioRenderer::m_pszCopyright = "Contains Windows Media Decoder
>Technology by Microsoft, Inc.\n"
>
> "This product is protected by certain
>intellectual property rights of Microsoft.\n"
>
>@@ -123,12 +118,12 @@
>
> const char* CWMAudioRenderer::GetCodecFourCC(void)
> {
>- return WMA_CODEC_4CC;
>+ return WMDECODER_CODEC_4CC_WMA10;
> }
>
> const char* CWMAudioRenderer::GetCodecName(void)
> {
>- return WMA_CODEC_NAME;
>+ return WMDECODER_CODEC_NAME_WMA10;
> }
>
> HX_RESULT STDAPICALLTYPE CWMAudioRenderer::HXCreateInstance(IUnknown** ppIUnknown)
>
>Index: wmaaudioconfigs.cpp
>===================================================================
>RCS file: /cvsroot/datatype/mdf/audio/arm/wma/platform/symbian/wmaaudioconfigs.cpp,v
>retrieving revision 1.4
>diff -u -w -r1.4 wmaaudioconfigs.cpp
>--- wmaaudioconfigs.cpp 14 Oct 2008 15:49:45 -0000 1.4
>+++ wmaaudioconfigs.cpp 24 Oct 2008 22:51:34 -0000
>@@ -49,7 +49,7 @@
> HXLOGL2(HXLOG_MDFA, "WMA CreateAudioConfigFromFourCC() FourCC=%s", pFourCC);
>
> // check if codec is supported
>- if(!strcmp(pFourCC, "WMA9"))
>+ if(!strncmp(pFourCC, WMDECODER_CODEC_4CC_WMA9, 4))
> {
> pAudConfig = new HXAudioConfiguratorWMA;
> }
>
>Index: wmasymbianswdecoder.cpp
>===================================================================
>RCS file: /cvsroot/datatype/mdf/audio/arm/wma/platform/symbian/wmasymbianswdecoder.cpp,v
>retrieving revision 1.6
>diff -u -w -r1.6 wmasymbianswdecoder.cpp
>--- wmasymbianswdecoder.cpp 14 Oct 2008 15:50:05 -0000 1.6
>+++ wmasymbianswdecoder.cpp 24 Oct 2008 22:52:10 -0000
>@@ -114,12 +114,12 @@
> }
> }
>
>+ if(SUCCEEDED(result))
>+ {
> UINT16 usWMAChannels = 2;
> ReadPrefUINT16(m_pContext, "MAXSupportedWMAChannels", usWMAChannels);
> pAudConfig->SetMaxSupportedChannels(usWMAChannels);
>
>- if(SUCCEEDED(result))
>- {
> // validate configuration parameters
> result = pAudConfig->ValidateDecoderConfig(cfgType, config, nBytes);
> }
>
>
>
>
>
_______________________________________________
Datatype-dev mailing list
Datatype-dev@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic