| Index: webrtc/video_decoder.h | 
| diff --git a/webrtc/video_decoder.h b/webrtc/video_decoder.h | 
| index 2822677868db4f3aa531e1e7bd4bf3c2dc6ff176..8fa376c5124bdf4fe5c2ee0627540a7085df990a 100644 | 
| --- a/webrtc/video_decoder.h | 
| +++ b/webrtc/video_decoder.h | 
| @@ -11,6 +11,7 @@ | 
| #ifndef WEBRTC_VIDEO_DECODER_H_ | 
| #define WEBRTC_VIDEO_DECODER_H_ | 
|  | 
| +#include <string> | 
| #include <vector> | 
|  | 
| #include "webrtc/common_types.h" | 
| @@ -63,6 +64,7 @@ class VideoDecoder { | 
|  | 
| virtual int32_t Release() = 0; | 
| virtual int32_t Reset() = 0; | 
| +  virtual const char* ImplementationName() const { return "unknown"; } | 
| }; | 
|  | 
| // Class used to wrap external VideoDecoders to provide a fallback option on | 
| @@ -88,6 +90,8 @@ class VideoDecoderSoftwareFallbackWrapper : public webrtc::VideoDecoder { | 
| int32_t Release() override; | 
| int32_t Reset() override; | 
|  | 
| +  const char* ImplementationName() const override; | 
| + | 
| private: | 
| bool InitFallbackDecoder(); | 
|  | 
| @@ -96,6 +100,7 @@ class VideoDecoderSoftwareFallbackWrapper : public webrtc::VideoDecoder { | 
|  | 
| VideoCodec codec_settings_; | 
| int32_t number_of_cores_; | 
| +  std::string fallback_implementation_name_; | 
| rtc::scoped_ptr<VideoDecoder> fallback_decoder_; | 
| DecodedImageCallback* callback_; | 
| }; | 
|  |