From 0fefb1041ccc4d50eabdd09530967218f656b9bb Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Mon, 7 Apr 2014 07:29:18 +0000 Subject: [PATCH] Remove WEBRTC_TRACE use in common_video/ Replaces a NOTREACHED() macro with inline assert(false). BUG=3153 R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/11079004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5849 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/common_video/texture_video_frame.cc | 28 ++++++++-------------- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/webrtc/common_video/texture_video_frame.cc b/webrtc/common_video/texture_video_frame.cc index ea53dc25cf..2dd6cadbe4 100644 --- a/webrtc/common_video/texture_video_frame.cc +++ b/webrtc/common_video/texture_video_frame.cc @@ -12,14 +12,6 @@ #include -#include "webrtc/system_wrappers/interface/trace.h" - -#define NOTREACHED() \ - do { \ - WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, -1, "Not reached"); \ - assert(false); \ - } while (0) - namespace webrtc { TextureVideoFrame::TextureVideoFrame(NativeHandle* handle, @@ -41,7 +33,7 @@ int TextureVideoFrame::CreateEmptyFrame(int width, int stride_y, int stride_u, int stride_v) { - NOTREACHED(); + assert(false); // Should not be called. return -1; } @@ -56,46 +48,46 @@ int TextureVideoFrame::CreateFrame(int size_y, int stride_y, int stride_u, int stride_v) { - NOTREACHED(); + assert(false); // Should not be called. return -1; } int TextureVideoFrame::CopyFrame(const I420VideoFrame& videoFrame) { - NOTREACHED(); + assert(false); // Should not be called. return -1; } void TextureVideoFrame::SwapFrame(I420VideoFrame* videoFrame) { - NOTREACHED(); + assert(false); // Should not be called. } uint8_t* TextureVideoFrame::buffer(PlaneType type) { - NOTREACHED(); + assert(false); // Should not be called. return NULL; } const uint8_t* TextureVideoFrame::buffer(PlaneType type) const { - NOTREACHED(); + assert(false); // Should not be called. return NULL; } int TextureVideoFrame::allocated_size(PlaneType type) const { - NOTREACHED(); + assert(false); // Should not be called. return -1; } int TextureVideoFrame::stride(PlaneType type) const { - NOTREACHED(); + assert(false); // Should not be called. return -1; } bool TextureVideoFrame::IsZeroSize() const { - NOTREACHED(); + assert(false); // Should not be called. return true; } void TextureVideoFrame::ResetSize() { - NOTREACHED(); + assert(false); // Should not be called. } void* TextureVideoFrame::native_handle() const { return handle_.get(); }