Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Side by Side Diff: content/renderer/media/webrtc/webrtc_video_frame_adapter.h

Issue 2925313002: Update WebRtcVideoFrameAdapter to new buffer interface (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_
6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "media/base/video_frame.h" 11 #include "media/base/video_frame.h"
12 #include "third_party/webrtc/api/video/video_frame_buffer.h" 12 #include "third_party/webrtc/api/video/video_frame_buffer.h"
13 13
14 namespace content { 14 namespace content {
15 // Thin adapter from media::VideoFrame to webrtc::VideoFrameBuffer. This 15 // Thin adapter from media::VideoFrame to webrtc::VideoFrameBuffer. This
16 // implementation is read-only and will return null if trying to get a 16 // implementation is read-only and will return null if trying to get a
17 // non-const pointer to the pixel data. This object will be accessed from 17 // non-const pointer to the pixel data. This object will be accessed from
18 // different threads, but that's safe since it's read-only. 18 // different threads, but that's safe since it's read-only.
19 class WebRtcVideoFrameAdapter : public webrtc::VideoFrameBuffer { 19 class WebRtcVideoFrameAdapter : public webrtc::VideoFrameBuffer {
20 public: 20 public:
21 using CopyTextureFrameCallback = 21 using CopyTextureFrameCallback =
22 base::Callback<void(const scoped_refptr<media::VideoFrame>&, 22 base::Callback<void(const scoped_refptr<media::VideoFrame>&,
23 scoped_refptr<media::VideoFrame>*)>; 23 scoped_refptr<media::VideoFrame>*)>;
24 24
25 WebRtcVideoFrameAdapter( 25 WebRtcVideoFrameAdapter(
26 const scoped_refptr<media::VideoFrame>& frame, 26 const scoped_refptr<media::VideoFrame>& frame,
27 const CopyTextureFrameCallback& copy_texture_callback); 27 const CopyTextureFrameCallback& copy_texture_callback);
28 28
29 scoped_refptr<media::VideoFrame> getMediaVideoFrame() const { return frame_; }
30
29 private: 31 private:
32 Type type() const override;
30 int width() const override; 33 int width() const override;
31 int height() const override; 34 int height() const override;
32 35
36 // TODO(magjed): Remove Data, Stride, and native_handle() functions.
33 const uint8_t* DataY() const override; 37 const uint8_t* DataY() const override;
34 const uint8_t* DataU() const override; 38 const uint8_t* DataU() const override;
35 const uint8_t* DataV() const override; 39 const uint8_t* DataV() const override;
36 40
37 int StrideY() const override; 41 int StrideY() const override;
38 int StrideU() const override; 42 int StrideU() const override;
39 int StrideV() const override; 43 int StrideV() const override;
40 44
41 void* native_handle() const override; 45 void* native_handle() const override;
42 46
43 rtc::scoped_refptr<VideoFrameBuffer> NativeToI420Buffer() override; 47 rtc::scoped_refptr<webrtc::I420BufferInterface> ToI420() override;
44 48
45 friend class rtc::RefCountedObject<WebRtcVideoFrameAdapter>; 49 friend class rtc::RefCountedObject<WebRtcVideoFrameAdapter>;
46 50
47 protected: 51 protected:
48 ~WebRtcVideoFrameAdapter() override; 52 ~WebRtcVideoFrameAdapter() override;
49 53
50 scoped_refptr<media::VideoFrame> frame_; 54 scoped_refptr<media::VideoFrame> frame_;
51 const CopyTextureFrameCallback copy_texture_callback_; 55 const CopyTextureFrameCallback copy_texture_callback_;
52 }; 56 };
53 57
54 } // namespace content 58 } // namespace content
55 59
56 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_ 60 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698