09347858f7
This cl now makes cricket::VideoFrame and cricket::WebRtcVideoFrame aliases for webrtc::VideoFrame. Reason for revert: Fixing backwards compatibility issues. Original issue's description: > 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 > > Committed: https://crrev.com/d36dd499c8f253cbcf37364c2a070c2e8c7100e9 > Cr-Commit-Position: refs/heads/master@{#14583} TBR=perkj@webrtc.org,pthatcher@webrtc.org,pthatcher@chromium.org,tkchin@webrtc.org,kjellander@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2411953002 Cr-Commit-Position: refs/heads/master@{#14678}
34 lines
1.1 KiB
C++
34 lines
1.1 KiB
C++
/*
|
|
* Copyright (c) 2011 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.
|
|
*/
|
|
|
|
// TODO(nisse): Deprecated, replace cricket::WebRtcVideoFrame with
|
|
// webrtc::VideoFrame everywhere, then delete this file. See
|
|
// https://bugs.chromium.org/p/webrtc/issues/detail?id=5682.
|
|
|
|
#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
|
|
#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
|
|
|
|
#include <memory>
|
|
|
|
#include "webrtc/base/buffer.h"
|
|
#include "webrtc/base/refcount.h"
|
|
#include "webrtc/base/scoped_ref_ptr.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/common_video/include/video_frame_buffer.h"
|
|
#include "webrtc/media/base/videoframe.h"
|
|
|
|
namespace cricket {
|
|
|
|
using WebRtcVideoFrame = webrtc::VideoFrame;
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
|