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

Side by Side Diff: content/renderer/pepper/pepper_media_stream_video_track_host.h

Issue 955253002: Add metadata to media::VideoFrame and plumb it through IPC/MediaStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tommi's nits addressed Created 5 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_PEPPER_PEPPER_MEDIA_STREAM_VIDEO_TRACK_HOST_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_VIDEO_TRACK_HOST_H_
6 #define CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_VIDEO_TRACK_HOST_H_ 6 #define CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_VIDEO_TRACK_HOST_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "content/public/renderer/media_stream_video_sink.h" 10 #include "content/public/renderer/media_stream_video_sink.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 // PepperMediaStreamTrackHostBase overrides: 50 // PepperMediaStreamTrackHostBase overrides:
51 void OnClose() override; 51 void OnClose() override;
52 int32_t OnHostMsgEnqueueBuffer(ppapi::host::HostMessageContext* context, 52 int32_t OnHostMsgEnqueueBuffer(ppapi::host::HostMessageContext* context,
53 int32_t index) override; 53 int32_t index) override;
54 54
55 // Sends frame with |index| to |track_|. 55 // Sends frame with |index| to |track_|.
56 int32_t SendFrameToTrack(int32_t index); 56 int32_t SendFrameToTrack(int32_t index);
57 57
58 void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame, 58 void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame,
59 const media::VideoCaptureFormat& format,
60 const base::TimeTicks& estimated_capture_time); 59 const base::TimeTicks& estimated_capture_time);
61 60
62 // MediaStreamVideoSource overrides: 61 // MediaStreamVideoSource overrides:
63 void GetCurrentSupportedFormats( 62 void GetCurrentSupportedFormats(
64 int max_requested_width, 63 int max_requested_width,
65 int max_requested_height, 64 int max_requested_height,
66 double max_requested_frame_rate, 65 double max_requested_frame_rate,
67 const VideoCaptureDeviceFormatsCB& callback) override; 66 const VideoCaptureDeviceFormatsCB& callback) override;
68 67
69 void StartSourceImpl( 68 void StartSourceImpl(
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 scoped_refptr<FrameDeliverer> frame_deliverer_; 123 scoped_refptr<FrameDeliverer> frame_deliverer_;
125 124
126 base::WeakPtrFactory<PepperMediaStreamVideoTrackHost> weak_factory_; 125 base::WeakPtrFactory<PepperMediaStreamVideoTrackHost> weak_factory_;
127 126
128 DISALLOW_COPY_AND_ASSIGN(PepperMediaStreamVideoTrackHost); 127 DISALLOW_COPY_AND_ASSIGN(PepperMediaStreamVideoTrackHost);
129 }; 128 };
130 129
131 } // namespace content 130 } // namespace content
132 131
133 #endif // CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_VIDEO_TRACK_HOST_H_ 132 #endif // CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_VIDEO_TRACK_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698