commit 9718711deed8d932503842df39bb161d578b1d64
author philipel <philipel@webrtc.org> Fri Mar 23 09:43:21 2018
committer Commit Bot <commit-bot@chromium.org> Fri Mar 23 13:58:55 2018
tree c4909c8fe229822dab0c1de2cb9a4f1ae8105953
parent a9d988d17571d5e53142f823ebae9c3bd29ca8f7

VideoStreamDecoderImpl implementation, part 1.

In this CL the OnFrame function is implemented.

Bug: webrtc:8909
Change-Id: I68488a033e86eadd0b16d091faad14e9cda7cc36
Reviewed-on: https://webrtc-review.googlesource.com/64121
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22583}

video/video_stream_decoder_impl.h

diff --git a/video/video_stream_decoder_impl.h b/video/video_stream_decoder_impl.h
index f44913b..97de050 100644
--- a/video/video_stream_decoder_impl.h
+++ b/video/video_stream_decoder_impl.h
@@ -11,17 +11,17 @@
 #ifndef VIDEO_VIDEO_STREAM_DECODER_IMPL_H_
 #define VIDEO_VIDEO_STREAM_DECODER_IMPL_H_
 
-#include <functional>
 #include <map>
 #include <memory>
 #include <utility>
 
-#include "api/optional.h"
-#include "api/video/encoded_frame.h"
-#include "api/video/video_frame.h"
 #include "api/video/video_stream_decoder.h"
-#include "api/video_codecs/sdp_video_format.h"
-#include "api/video_codecs/video_decoder_factory.h"
+#include "modules/video_coding/frame_buffer2.h"
+#include "modules/video_coding/jitter_estimator.h"
+#include "modules/video_coding/timing.h"
+#include "rtc_base/task_queue.h"
+#include "rtc_base/thread_checker.h"
+#include "system_wrappers/include/clock.h"
 
 namespace webrtc {
 
@@ -45,9 +45,21 @@
                rtc::Optional<int32_t> decode_time_ms,
                rtc::Optional<uint8_t> qp) override;
 
-  VideoStreamDecoder::Callbacks* callbacks_;
-  VideoDecoderFactory* decoder_factory_;
+  VideoStreamDecoder::Callbacks* const callbacks_
+      RTC_PT_GUARDED_BY(bookkeeping_queue_);
+  VideoDecoderFactory* const decoder_factory_;
   std::map<int, std::pair<SdpVideoFormat, int>> decoder_settings_;
+
+  // The |bookkeeping_queue_| is used to:
+  //  - Make |callbacks_|.
+  //  - Insert/extract frames from the |frame_buffer_|
+  //  - Synchronize with whatever thread that makes the Decoded callback.
+  rtc::TaskQueue bookkeeping_queue_;
+
+  VCMJitterEstimator jitter_estimator_;
+  VCMTiming timing_;
+  video_coding::FrameBuffer frame_buffer_;
+  video_coding::VideoLayerFrameId last_continuous_id_;
 };
 
 }  // namespace webrtc