61b22dde13
Reason for revert: More downstream breakage discovered. Original issue's description: > Reland of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2854883002/ ) > > Reason for revert: > Will make another attempt to track down and fix downstream projects. > > Original issue's description: > > Revert of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2852303002/ ) > > > > Reason for revert: > > Unfortunately, more downstream updates needed. > > > > Original issue's description: > > > Reland of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2845333002/ ) > > > > > > Reason for revert: > > > Downstream projects being updated. > > > > > > For Chrome, relanding depends on cl > > > https://codereview.chromium.org/2855783003/ > > > > > > Original issue's description: > > > > Revert of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #17 id:320001 of https://codereview.webrtc.org/2622263002/ ) > > > > > > > > Reason for revert: > > > > Broke Chrome build, see, e.g., > > > > http://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/16237 > > > > > > > > Original issue's description: > > > > > Delete deprecated and transitional stuff related to video frame refactoring. > > > > > > > > > > BUG=webrtc:5880 > > > > > > > > > > Review-Url: https://codereview.webrtc.org/2622263002 > > > > > Cr-Commit-Position: refs/heads/master@{#17928} > > > > > Committed:713a3bbcc7> > > > > > > > TBR=mflodman@webrtc.org,perkj@webrtc.org > > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > > NOPRESUBMIT=true > > > > NOTREECHECKS=true > > > > NOTRY=true > > > > BUG=webrtc:5880 > > > > > > > > Review-Url: https://codereview.webrtc.org/2845333002 > > > > Cr-Commit-Position: refs/heads/master@{#17929} > > > > Committed:aec49d2b49> > > > > > TBR=mflodman@webrtc.org,perkj@webrtc.org > > > # Not skipping CQ checks because original CL landed more than 1 days ago. > > > BUG=webrtc:5880 > > > > > > Review-Url: https://codereview.webrtc.org/2852303002 > > > Cr-Commit-Position: refs/heads/master@{#17974} > > > Committed:d71ebd70f6> > > > TBR=mflodman@webrtc.org,perkj@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > BUG=webrtc:5880 > > > > Review-Url: https://codereview.webrtc.org/2854883002 > > Cr-Commit-Position: refs/heads/master@{#17978} > > Committed:6e6a485a02> > TBR=mflodman@webrtc.org,perkj@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > > BUG=webrtc:5880 > > Review-Url: https://codereview.webrtc.org/2854873003 > Cr-Commit-Position: refs/heads/master@{#18006} > Committed:3870a071c4TBR=mflodman@webrtc.org,perkj@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5880 Review-Url: https://codereview.webrtc.org/2853383005 Cr-Commit-Position: refs/heads/master@{#18008}
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_
|