Revert of Make cricket::VideoFrame inherit webrtc::VideoFrame. (patchset #9 id:160001 of https://codereview.webrtc.org/2315663002/ )
Reason for revert: Breaks compile for Chromium builds: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/10761 https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/18142 FAILED: obj/remoting/protocol/protocol/webrtc_video_renderer_adapter.o ../../remoting/protocol/webrtc_video_renderer_adapter.cc:110:52: error: no member named 'transport_frame_id' in 'cricket::VideoFrame' weak_factory_.GetWeakPtr(), frame.transport_frame_id(), ~~~~~ ^ 1 error generated. Please run chromium trybots as described at https://webrtc.org/contributing/#tryjobs-on-chromium-trybots before relanding. Original issue's description: > Make cricket::VideoFrame inherit webrtc::VideoFrame. Delete > all methods but a few constructors. And similarly for the > subclass cricket::WebRtcVideoFrame. > > TBR=tkchin@webrtc.org # Added an include line > BUG=webrtc:5682 > > Committed: https://crrev.com/dda6ec008a0fc8d52e118814fb779032e8931968 > Cr-Commit-Position: refs/heads/master@{#14576} TBR=perkj@webrtc.org,pthatcher@webrtc.org,pthatcher@chromium.org,tkchin@webrtc.org,nisse@webrtc.org NOTRY=True NOPRESUBMIT=True BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2402853002 Cr-Commit-Position: refs/heads/master@{#14583}
This commit is contained in:
@ -26,7 +26,6 @@
|
||||
|
||||
#include "webrtc/base/bind.h"
|
||||
#include "webrtc/base/checks.h"
|
||||
#include "webrtc/base/logging.h"
|
||||
#include "webrtc/base/thread.h"
|
||||
#include "webrtc/common_video/include/corevideo_frame_buffer.h"
|
||||
#include "webrtc/common_video/rotation.h"
|
||||
|
||||
Reference in New Issue
Block a user