Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / utility / source / file_player_impl.cc

diff --git a/src/third_party/webrtc/modules/utility/source/file_player_impl.cc b/src/third_party/webrtc/modules/utility/source/file_player_impl.cc
index 9240e64..8049245 100644 (file)
--- a/src/third_party/webrtc/modules/utility/source/file_player_impl.cc
+++ b/src/third_party/webrtc/modules/utility/source/file_player_impl.cc
@@ -9,7 +9,7 @@
  */
 
 #include "webrtc/modules/utility/source/file_player_impl.h"
-#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/logging.h"
 
 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
     #include "frame_scaler.h"
@@ -35,8 +35,6 @@ FilePlayer* FilePlayer::CreateFilePlayer(uint32_t instanceID,
 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
         return new VideoFilePlayerImpl(instanceID, fileFormat);
 #else
-        WEBRTC_TRACE(kTraceError, kTraceFile, -1,
-                     "Invalid file format: %d", kFileFormatAviFile);
         assert(false);
         return NULL;
 #endif
@@ -114,10 +112,9 @@ int32_t FilePlayerImpl::Get10msAudioFromFile(
 {
     if(_codec.plfreq == 0)
     {
-        WEBRTC_TRACE(kTraceWarning, kTraceVoice, _instanceID,
-           "FilePlayerImpl::Get10msAudioFromFile() playing not started!\
- codecFreq = %d, wantedFreq = %d",
-           _codec.plfreq, frequencyInHz);
+        LOG(LS_WARNING) << "Get10msAudioFromFile() playing not started!"
+                        << " codec freq = " << _codec.plfreq
+                        << ", wanted freq = " << frequencyInHz;
         return -1;
     }
 
@@ -175,8 +172,7 @@ int32_t FilePlayerImpl::Get10msAudioFromFile(
     if(_resampler.ResetIfNeeded(unresampledAudioFrame.sample_rate_hz_,
                                 frequencyInHz, kResamplerSynchronous))
     {
-        WEBRTC_TRACE(kTraceWarning, kTraceVoice, _instanceID,
-           "FilePlayerImpl::Get10msAudioFromFile() unexpected codec");
+        LOG(LS_WARNING) << "Get10msAudioFromFile() unexpected codec.";
 
         // New sampling frequency. Update state.
         outLen = frequencyInHz / 100;
@@ -214,8 +210,7 @@ int32_t FilePlayerImpl::SetAudioScaling(float scaleFactor)
         _scaling = scaleFactor;
         return 0;
     }
-    WEBRTC_TRACE(kTraceWarning, kTraceVoice, _instanceID,
-              "FilePlayerImpl::SetAudioScaling() not allowed scale factor");
+    LOG(LS_WARNING) << "SetAudioScaling() non-allowed scale factor.";
     return -1;
 }
 
@@ -255,9 +250,8 @@ int32_t FilePlayerImpl::StartPlayingFile(const char* fileName,
             codecInstL16.pacsize  = 160;
         } else
         {
-            WEBRTC_TRACE(kTraceError, kTraceVoice, _instanceID,
-                       "FilePlayerImpl::StartPlayingFile() sample frequency\
- specifed not supported for PCM format.");
+            LOG(LS_ERROR) << "StartPlayingFile() sample frequency not "
+                          << "supported for PCM format.";
             return -1;
         }
 
@@ -266,12 +260,8 @@ int32_t FilePlayerImpl::StartPlayingFile(const char* fileName,
                                               startPosition,
                                               stopPosition) == -1)
         {
-            WEBRTC_TRACE(
-                kTraceWarning,
-                kTraceVoice,
-                _instanceID,
-                "FilePlayerImpl::StartPlayingFile() failed to initialize file\
- %s playout.", fileName);
+            LOG(LS_WARNING) << "StartPlayingFile() failed to initialize "
+                            << "pcm file " << fileName;
             return -1;
         }
         SetAudioScaling(volumeScaling);
@@ -280,13 +270,8 @@ int32_t FilePlayerImpl::StartPlayingFile(const char* fileName,
         if (_fileModule.StartPlayingAudioFile(fileName, notification, loop,
                                               _fileFormat, codecInst) == -1)
         {
-            WEBRTC_TRACE(
-                kTraceWarning,
-                kTraceVoice,
-                _instanceID,
-                "FilePlayerImpl::StartPlayingPreEncodedFile() failed to\
- initialize pre-encoded file %s playout.",
-                fileName);
+            LOG(LS_WARNING) << "StartPlayingFile() failed to initialize "
+                            << "pre-encoded file " << fileName;
             return -1;
         }
     } else
@@ -297,12 +282,8 @@ int32_t FilePlayerImpl::StartPlayingFile(const char* fileName,
                                               startPosition,
                                               stopPosition) == -1)
         {
-            WEBRTC_TRACE(
-                kTraceWarning,
-                kTraceVoice,
-                _instanceID,
-                "FilePlayerImpl::StartPlayingFile() failed to initialize file\
- %s playout.", fileName);
+            LOG(LS_WARNING) << "StartPlayingFile() failed to initialize file "
+                            << fileName;
             return -1;
         }
         SetAudioScaling(volumeScaling);
@@ -350,12 +331,8 @@ int32_t FilePlayerImpl::StartPlayingFile(InStream& sourceStream,
             codecInstL16.pacsize  = 160;
         }else
         {
-            WEBRTC_TRACE(
-                kTraceError,
-                kTraceVoice,
-                _instanceID,
-                "FilePlayerImpl::StartPlayingFile() sample frequency specifed\
- not supported for PCM format.");
+            LOG(LS_ERROR) << "StartPlayingFile() sample frequency not "
+                          << "supported for PCM format.";
             return -1;
         }
         if (_fileModule.StartPlayingAudioStream(sourceStream, notification,
@@ -363,12 +340,8 @@ int32_t FilePlayerImpl::StartPlayingFile(InStream& sourceStream,
                                                 startPosition,
                                                 stopPosition) == -1)
         {
-            WEBRTC_TRACE(
-                kTraceError,
-                kTraceVoice,
-                _instanceID,
-                "FilePlayerImpl::StartPlayingFile() failed to initialize stream\
- playout.");
+            LOG(LS_ERROR) << "StartPlayingFile() failed to initialize stream "
+                          << "playout.";
             return -1;
         }
 
@@ -377,12 +350,8 @@ int32_t FilePlayerImpl::StartPlayingFile(InStream& sourceStream,
         if (_fileModule.StartPlayingAudioStream(sourceStream, notification,
                                                 _fileFormat, codecInst) == -1)
         {
-            WEBRTC_TRACE(
-                kTraceWarning,
-                kTraceVoice,
-                _instanceID,
-                "FilePlayerImpl::StartPlayingFile() failed to initialize stream\
- playout.");
+            LOG(LS_ERROR) << "StartPlayingFile() failed to initialize stream "
+                          << "playout.";
             return -1;
         }
     } else {
@@ -392,9 +361,8 @@ int32_t FilePlayerImpl::StartPlayingFile(InStream& sourceStream,
                                                 startPosition,
                                                 stopPosition) == -1)
         {
-            WEBRTC_TRACE(kTraceError, kTraceVoice, _instanceID,
-                       "FilePlayerImpl::StartPlayingFile() failed to initialize\
- stream playout.");
+            LOG(LS_ERROR) << "StartPlayingFile() failed to initialize stream "
+                          << "playout.";
             return -1;
         }
     }
@@ -430,23 +398,14 @@ int32_t FilePlayerImpl::SetUpAudioDecoder()
 {
     if ((_fileModule.codec_info(_codec) == -1))
     {
-        WEBRTC_TRACE(
-            kTraceWarning,
-            kTraceVoice,
-            _instanceID,
-            "FilePlayerImpl::StartPlayingFile() failed to retrieve Codec info\
- of file data.");
+        LOG(LS_WARNING) << "Failed to retrieve codec info of file data.";
         return -1;
     }
     if( STR_CASE_CMP(_codec.plname, "L16") != 0 &&
         _audioDecoder.SetDecodeCodec(_codec,AMRFileStorage) == -1)
     {
-        WEBRTC_TRACE(
-            kTraceWarning,
-            kTraceVoice,
-            _instanceID,
-            "FilePlayerImpl::StartPlayingFile() codec %s not supported",
-            _codec.plname);
+        LOG(LS_WARNING) << "SetUpAudioDecoder() codec " << _codec.plname
+                        << " not supported.";
         return -1;
     }
     _numberOf10MsPerFrame = _codec.pacsize / (_codec.plfreq / 100);
@@ -458,7 +417,7 @@ int32_t FilePlayerImpl::SetUpAudioDecoder()
 VideoFilePlayerImpl::VideoFilePlayerImpl(uint32_t instanceID,
                                          FileFormats fileFormat)
     : FilePlayerImpl(instanceID, fileFormat),
-      video_decoder_(new VideoCoder(instanceID)),
+      video_decoder_(new VideoCoder()),
       video_codec_info_(),
       _decodedVideoFrames(0),
       _encodedData(*new EncodedVideoData()),
@@ -522,7 +481,7 @@ int32_t VideoFilePlayerImpl::StopPlayingFile()
     CriticalSectionScoped lock( _critSec);
 
     _decodedVideoFrames = 0;
-    video_decoder_.reset(new VideoCoder(_instanceID));
+    video_decoder_.reset(new VideoCoder());
 
     return FilePlayerImpl::StopPlayingFile();
 }
@@ -627,12 +586,7 @@ int32_t VideoFilePlayerImpl::TimeUntilNextVideoFrame()
                    reinterpret_cast< int8_t*>(_encodedData.payloadData),
                    encodedBufferLengthInBytes) != 0)
             {
-                 WEBRTC_TRACE(
-                     kTraceWarning,
-                     kTraceVideo,
-                     _instanceID,
-                     "FilePlayerImpl::TimeUntilNextVideoFrame() error reading\
- video data");
+                LOG(LS_WARNING) << "Error reading video data.";
                 return -1;
             }
             _encodedData.payloadSize = encodedBufferLengthInBytes;
@@ -685,23 +639,16 @@ int32_t VideoFilePlayerImpl::SetUpVideoDecoder()
 {
     if (_fileModule.VideoCodecInst(video_codec_info_) != 0)
     {
-        WEBRTC_TRACE(
-            kTraceWarning,
-            kTraceVideo,
-            _instanceID,
-            "FilePlayerImpl::SetVideoDecoder() failed to retrieve Codec info of\
- file data.");
+        LOG(LS_WARNING) << "SetVideoDecoder() failed to retrieve codec info of "
+                        << "file data.";
         return -1;
     }
 
     int32_t useNumberOfCores = 1;
     if (video_decoder_->SetDecodeCodec(video_codec_info_, useNumberOfCores) !=
         0) {
-      WEBRTC_TRACE(kTraceWarning,
-                   kTraceVideo,
-                   _instanceID,
-                   "FilePlayerImpl::SetUpVideoDecoder() codec %s not supported",
-                   video_codec_info_.plName);
+        LOG(LS_WARNING) << "SetUpVideoDecoder() codec "
+                        << video_codec_info_.plName << " not supported.";
         return -1;
     }