| Index: webrtc/modules/video_coding/generic_decoder.h
|
| diff --git a/webrtc/modules/video_coding/main/source/generic_decoder.h b/webrtc/modules/video_coding/generic_decoder.h
|
| similarity index 85%
|
| rename from webrtc/modules/video_coding/main/source/generic_decoder.h
|
| rename to webrtc/modules/video_coding/generic_decoder.h
|
| index 7788425d444de481b8e22ee588d8eb9aa08252f5..d79b5e59f22213995942d0cdbc86cc6abf95fb30 100644
|
| --- a/webrtc/modules/video_coding/main/source/generic_decoder.h
|
| +++ b/webrtc/modules/video_coding/generic_decoder.h
|
| @@ -12,10 +12,10 @@
|
| #define WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_
|
|
|
| #include "webrtc/modules/include/module_common_types.h"
|
| -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
|
| -#include "webrtc/modules/video_coding/main/source/encoded_frame.h"
|
| -#include "webrtc/modules/video_coding/main/source/timestamp_map.h"
|
| -#include "webrtc/modules/video_coding/main/source/timing.h"
|
| +#include "webrtc/modules/video_coding/include/video_codec_interface.h"
|
| +#include "webrtc/modules/video_coding/encoded_frame.h"
|
| +#include "webrtc/modules/video_coding/timestamp_map.h"
|
| +#include "webrtc/modules/video_coding/timing.h"
|
|
|
| namespace webrtc
|
| {
|
| @@ -69,25 +69,25 @@ public:
|
| ~VCMGenericDecoder();
|
|
|
| /**
|
| - * Initialize the decoder with the information from the VideoCodec
|
| + * Initialize the decoder with the information from the VideoCodec
|
| */
|
| int32_t InitDecode(const VideoCodec* settings,
|
| int32_t numberOfCores);
|
|
|
| /**
|
| - * Decode to a raw I420 frame,
|
| + * Decode to a raw I420 frame,
|
| *
|
| - * inputVideoBuffer reference to encoded video frame
|
| + * inputVideoBuffer reference to encoded video frame
|
| */
|
| int32_t Decode(const VCMEncodedFrame& inputFrame, int64_t nowMs);
|
|
|
| /**
|
| - * Free the decoder memory
|
| + * Free the decoder memory
|
| */
|
| int32_t Release();
|
|
|
| /**
|
| - * Reset the decoder state, prepare for a new call
|
| + * Reset the decoder state, prepare for a new call
|
| */
|
| int32_t Reset();
|
|
|
|
|