Change the char to wchar_t
authorKyungYoun <ky99.won@samsung.com>
Tue, 18 Jun 2013 06:47:57 +0000 (15:47 +0900)
committerKyungYoun <ky99.won@samsung.com>
Tue, 18 Jun 2013 06:47:57 +0000 (15:47 +0900)
Change-Id: I4244a9c048ec6b227b9b93700863cfa50e15b754
Signed-off-by: KyungYoun <ky99.won@samsung.com>
src/FMedia_VideoRecorderImpl.cpp

index 99f9322..aaacb1c 100755 (executable)
@@ -110,7 +110,7 @@ static const _VideoCallbackEventTable _VIDEO_CALLBACK_EVENT[] =
 
 typedef struct
 {
-       const char* pCodecName;
+       const wchar_t* pCodecName;
        CodecType audioCodec;
        CodecType videoCodec;
        MediaContainerType container;
@@ -118,11 +118,11 @@ typedef struct
 
 static const _CodecValTable _CODEC_VAL_TABLE[] =
 {
-       {"VIDEO_CODEC_NONE",            CODEC_NONE,     CODEC_NONE,     MEDIA_CONTAINER_NONE},
-       {"VIDEO_CODEC_H263",            CODEC_AMR_NB, CODEC_H263,       MEDIA_CONTAINER_3GP},           //TODO bug reported
-//     {"VIDEO_CODEC_H263",            CODEC_AAC,      CODEC_H263,     MEDIA_CONTAINER_3GP},
-       {"VIDEO_CODEC_MPEG4SP",         CODEC_AAC,      CODEC_MPEG4,    MEDIA_CONTAINER_MP4},
-       {"VIDEO_CODEC_H264",            CODEC_AAC,      CODEC_H264,     MEDIA_CONTAINER_MP4},
+       {L"VIDEO_CODEC_NONE",           CODEC_NONE,     CODEC_NONE,     MEDIA_CONTAINER_NONE},
+       {L"VIDEO_CODEC_H263",           CODEC_AMR_NB, CODEC_H263,       MEDIA_CONTAINER_3GP},           //TODO bug reported
+//     {L"VIDEO_CODEC_H263",           CODEC_AAC,      CODEC_H263,     MEDIA_CONTAINER_3GP},
+       {L"VIDEO_CODEC_MPEG4SP",        CODEC_AAC,      CODEC_MPEG4,    MEDIA_CONTAINER_MP4},
+       {L"VIDEO_CODEC_H264",           CODEC_AAC,      CODEC_H264,     MEDIA_CONTAINER_MP4},
        {null,                                          CODEC_NONE,     CODEC_NONE,     MEDIA_CONTAINER_NONE}
 };
 
@@ -1668,11 +1668,9 @@ void
 _VideoRecorderImpl::GetMediaType(const Base::String& codec, CodecType& audioCodec, CodecType& videoCodec, MediaContainerType& container) const
 {
        int i = 0;
-       std::unique_ptr<char[]> pCodecChars (Tizen::Base::_StringConverter::CopyToCharArrayN(codec));
-
        while (_CODEC_VAL_TABLE[i].pCodecName != null)
        {
-               if (strcmp(_CODEC_VAL_TABLE[i].pCodecName, pCodecChars.get()) == 0)
+               if (String(_CODEC_VAL_TABLE[i].pCodecName).Equals(codec))
                {
                        videoCodec = _CODEC_VAL_TABLE[i].videoCodec;
                        audioCodec = _CODEC_VAL_TABLE[i].audioCodec;