generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove WEBRTC_TRACE use in common_video/

Browse Source 
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
This commit is contained in:
pbos@webrtc.org 2014-04-07 07:29:18 +00:00
parent 09b0c10eed
commit 0fefb1041c
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
webrtc/common_video/texture_video_frame.cc
View File

@ -12,14 +12,6 @@
#include <assert.h> #include <assert.h>
#include "webrtc/system_wrappers/interface/trace.h"
#define NOTREACHED() \
do { \
WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, -1, "Not reached"); \
assert(false); \
} while (0)
namespace webrtc { namespace webrtc {
TextureVideoFrame::TextureVideoFrame(NativeHandle* handle, TextureVideoFrame::TextureVideoFrame(NativeHandle* handle,
@ -41,7 +33,7 @@ int TextureVideoFrame::CreateEmptyFrame(int width,
int stride_y, int stride_y,
int stride_u, int stride_u,
int stride_v) { int stride_v) {
NOTREACHED(); assert(false); // Should not be called.
return -1; return -1;
} }
@ -56,46 +48,46 @@ int TextureVideoFrame::CreateFrame(int size_y,
int stride_y, int stride_y,
int stride_u, int stride_u,
int stride_v) { int stride_v) {
NOTREACHED(); assert(false); // Should not be called.
return -1; return -1;
} }
int TextureVideoFrame::CopyFrame(const I420VideoFrame& videoFrame) { int TextureVideoFrame::CopyFrame(const I420VideoFrame& videoFrame) {
NOTREACHED(); assert(false); // Should not be called.
return -1; return -1;
} }
void TextureVideoFrame::SwapFrame(I420VideoFrame* videoFrame) { void TextureVideoFrame::SwapFrame(I420VideoFrame* videoFrame) {
NOTREACHED(); assert(false); // Should not be called.
} }
uint8_t* TextureVideoFrame::buffer(PlaneType type) { uint8_t* TextureVideoFrame::buffer(PlaneType type) {
NOTREACHED(); assert(false); // Should not be called.
return NULL; return NULL;
} }
const uint8_t* TextureVideoFrame::buffer(PlaneType type) const { const uint8_t* TextureVideoFrame::buffer(PlaneType type) const {
NOTREACHED(); assert(false); // Should not be called.
return NULL; return NULL;
} }
int TextureVideoFrame::allocated_size(PlaneType type) const { int TextureVideoFrame::allocated_size(PlaneType type) const {
NOTREACHED(); assert(false); // Should not be called.
return -1; return -1;
} }
int TextureVideoFrame::stride(PlaneType type) const { int TextureVideoFrame::stride(PlaneType type) const {
NOTREACHED(); assert(false); // Should not be called.
return -1; return -1;
} }
bool TextureVideoFrame::IsZeroSize() const { bool TextureVideoFrame::IsZeroSize() const {
NOTREACHED(); assert(false); // Should not be called.
return true; return true;
} }
void TextureVideoFrame::ResetSize() { void TextureVideoFrame::ResetSize() {
NOTREACHED(); assert(false); // Should not be called.
} }
void* TextureVideoFrame::native_handle() const { return handle_.get(); } void* TextureVideoFrame::native_handle() const { return handle_.get(); }