acd935b540
Reason for revert: Relanding after known downstream breakages have been fixed. Original issue's description: > Revert of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (patchset #7 id:120001 of https://codereview.webrtc.org/2383093002/ ) > > Reason for revert: > Breaks chrome, see https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/19019/steps/compile/logs/stdio > > Analysis: Chrome uses cricket::VideoFrame, without explicitly including webrtc/media/base/videoframe.h, and breaks when that file is no longer included by any other webrtc headers. Will reland after updating Chrome. > > Original issue's description: > > Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. > > > > Replaced with webrtc::VideoFrame. > > > > TBR=mflodman@webrtc.org > > BUG=webrtc:5682 > > > > Committed: https://crrev.com/45c8b8940042bd2574c39920804ade8343cefdba > > Cr-Commit-Position: refs/heads/master@{#14885} > > TBR=perkj@webrtc.org,pthatcher@webrtc.org,tkchin@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:5682 > > Committed: https://crrev.com/7341ab8e2505c9763d208e069bda269018357e7d > Cr-Commit-Position: refs/heads/master@{#14886} TBR=perkj@webrtc.org,pthatcher@webrtc.org,tkchin@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2487633002 Cr-Commit-Position: refs/heads/master@{#15039}
60 lines
1.7 KiB
C++
60 lines
1.7 KiB
C++
/*
|
|
* Copyright (c) 2004 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.
|
|
*/
|
|
|
|
// Definition of class GtkVideoRenderer that implements the abstract class
|
|
// cricket::VideoRenderer via GTK.
|
|
|
|
#ifndef WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_
|
|
#define WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_
|
|
|
|
#include <memory>
|
|
|
|
#include "webrtc/base/basictypes.h"
|
|
#include "webrtc/media/base/videosinkinterface.h"
|
|
|
|
typedef struct _GtkWidget GtkWidget; // forward declaration, defined in gtk.h
|
|
namespace webrtc {
|
|
class VideoFrame;
|
|
}
|
|
|
|
namespace cricket {
|
|
|
|
class GtkVideoRenderer : public rtc::VideoSinkInterface<webrtc::VideoFrame> {
|
|
public:
|
|
GtkVideoRenderer(int x, int y);
|
|
virtual ~GtkVideoRenderer();
|
|
|
|
// Implementation of VideoSinkInterface.
|
|
void OnFrame(const webrtc::VideoFrame& frame) override;
|
|
|
|
private:
|
|
bool SetSize(int width, int height);
|
|
// Initialize the attributes when the first frame arrives.
|
|
bool Initialize(int width, int height);
|
|
// Pump the Gtk event loop until there are no events left.
|
|
void Pump();
|
|
// Check if the window has been closed.
|
|
bool IsClosed() const;
|
|
|
|
std::unique_ptr<uint8_t[]> image_;
|
|
GtkWidget* window_;
|
|
GtkWidget* draw_area_;
|
|
// The initial position of the window.
|
|
int initial_x_;
|
|
int initial_y_;
|
|
|
|
int width_;
|
|
int height_;
|
|
};
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_
|