Merge ScreenCapturerWinDirectx::frames_ and contexts_

webrtc/modules/desktop_capture/win/dxgi_frame.h

Index: webrtc/modules/desktop_capture/win/dxgi_frame.h
diff --git a/webrtc/modules/desktop_capture/win/dxgi_frame.h b/webrtc/modules/desktop_capture/win/dxgi_frame.h
new file mode 100644
index 0000000000000000000000000000000000000000..030232254f32b64c19ebf5c08a3a0a509e87e8a7
--- /dev/null
+++ b/webrtc/modules/desktop_capture/win/dxgi_frame.h
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2017 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_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_
+#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_
+
+#include <memory>
+
+#include "webrtc/modules/desktop_capture/desktop_capturer.h"
+#include "webrtc/modules/desktop_capture/desktop_capture_types.h"
+#include "webrtc/modules/desktop_capture/desktop_geometry.h"
+#include "webrtc/modules/desktop_capture/resolution_change_detector.h"
+#include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
+#include "webrtc/modules/desktop_capture/shared_memory.h"
+#include "webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h"
+
+namespace webrtc {
+
+// A pair of a SharedDesktopFrame and a DxgiDuplicatorController::Context for
+// the client of DxgiDuplicatorController.
+class DxgiFrame final {
+ public:
+  // DxgiFrame does not take ownership of |factory|, consumers should ensure it
+  // outlives this instance.
+  explicit DxgiFrame(SharedMemoryFactory* factory);
+  ~DxgiFrame();
+
+  // Should not be called if Prepare() is not executed or returns false.
+  SharedDesktopFrame* frame() const;
+
+ private:
+  // Allows DxgiDuplicatorController to access Prepare() and context() function.
+  friend DxgiDuplicatorController::Result
+      DxgiDuplicatorController::DoDuplicate(DxgiFrame*, int);
+
+  // Prepares current instance with desktop size and source id.
+  bool Prepare(DesktopSize size, DesktopCapturer::SourceId source_id);
+
+  // Should not be called if Prepare() is not executed or returns false.
+  DxgiDuplicatorController::Context* context();

[Sergey Ulanov, 2017/04/18 18:10:16]

Do we need this as private? This class is not used outside
DxgiDuplicatorController and it's not useful without access to the context.

Also see my comments about DxgiDuplicatorController::Context.

[Hzj_jie, 2017/04/18 22:17:53]

This class is used in ScreenCapturerWinDirectx or other consumers of
DxgiDuplicatorController. I think some of its internal states should be kept
hidden to the consumers, e.g. Prepare() function.

+
+  SharedMemoryFactory* const factory_;
+  ResolutionChangeDetector resolution_change_detector_;
+  DesktopCapturer::SourceId source_id_ = kFullDesktopScreenId;
+  std::unique_ptr<SharedDesktopFrame> frame_;
+  DxgiDuplicatorController::Context context_;
+};
+
+}  // namespace webrtc
+
+#endif  // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_