modules/video_coding refactorings

The main purpose was the interface-> include rename, but other files were also moved, eliminating the "main" dir. To avoid breaking downstream, the "interface" directories were copied into a new "video_coding/include" dir. The old headers got pragma warnings added about deprecation (a very short deprecation since I plan to remove them as soon downstream is updated). Other files also moved: video_coding/main/source -> video_coding video_coding/main/test -> video_coding/test BUG=webrtc:5095 TESTED=Passing compile-trybots with --clobber flag: git cl try --clobber --bot=win_compile_rel --bot=linux_compile_rel --bot=android_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc R=stefan@webrtc.org, tommi@webrtc.org Review URL: https://codereview.webrtc.org/1417283007 . Cr-Commit-Position: refs/heads/master@{#10694}
2015-11-18 22:00:21 +01:00
parent 4dd7a653b5
commit 2557b86e76
133 changed files with 1423 additions and 420 deletions
--- a/webrtc/modules/video_coding/generic_decoder.h
+++ b/webrtc/modules/video_coding/generic_decoder.h
@ -0,0 +1,113 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_
+#define WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_
+
+#include "webrtc/modules/include/module_common_types.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
+{
+
+class VCMReceiveCallback;
+
+enum { kDecoderFrameMemoryLength = 10 };
+
+struct VCMFrameInformation
+{
+    int64_t     renderTimeMs;
+    int64_t     decodeStartTimeMs;
+    void*             userData;
+    VideoRotation rotation;
+};
+
+class VCMDecodedFrameCallback : public DecodedImageCallback
+{
+public:
+    VCMDecodedFrameCallback(VCMTiming& timing, Clock* clock);
+    virtual ~VCMDecodedFrameCallback();
+    void SetUserReceiveCallback(VCMReceiveCallback* receiveCallback);
+    VCMReceiveCallback* UserReceiveCallback();
+
+    virtual int32_t Decoded(VideoFrame& decodedImage);
+    virtual int32_t Decoded(VideoFrame& decodedImage, int64_t decode_time_ms);
+    virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId);
+    virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId);
+
+    uint64_t LastReceivedPictureID() const;
+
+    void Map(uint32_t timestamp, VCMFrameInformation* frameInfo);
+    int32_t Pop(uint32_t timestamp);
+
+private:
+    // Protect |_receiveCallback| and |_timestampMap|.
+    CriticalSectionWrapper* _critSect;
+    Clock* _clock;
+    VCMReceiveCallback* _receiveCallback;  // Guarded by |_critSect|.
+    VCMTiming& _timing;
+    VCMTimestampMap _timestampMap;  // Guarded by |_critSect|.
+    uint64_t _lastReceivedPictureID;
+};
+
+
+class VCMGenericDecoder
+{
+    friend class VCMCodecDataBase;
+public:
+    VCMGenericDecoder(VideoDecoder& decoder, bool isExternal = false);
+    ~VCMGenericDecoder();
+
+    /**
+    * Initialize the decoder with the information from the VideoCodec
+    */
+    int32_t InitDecode(const VideoCodec* settings,
+                             int32_t numberOfCores);
+
+    /**
+    * Decode to a raw I420 frame,
+    *
+    * inputVideoBuffer reference to encoded video frame
+    */
+    int32_t Decode(const VCMEncodedFrame& inputFrame, int64_t nowMs);
+
+    /**
+    * Free the decoder memory
+    */
+    int32_t Release();
+
+    /**
+    * Reset the decoder state, prepare for a new call
+    */
+    int32_t Reset();
+
+    /**
+    * Set decode callback. Deregistering while decoding is illegal.
+    */
+    int32_t RegisterDecodeCompleteCallback(VCMDecodedFrameCallback* callback);
+
+    bool External() const;
+
+private:
+    VCMDecodedFrameCallback*    _callback;
+    VCMFrameInformation         _frameInfos[kDecoderFrameMemoryLength];
+    uint32_t                    _nextFrameInfoIdx;
+    VideoDecoder&               _decoder;
+    VideoCodecType              _codecType;
+    bool                        _isExternal;
+    bool                        _keyFrameDecoded;
+};
+
+}  // namespace webrtc
+
+#endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_