Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(750)

Unified Diff: media/base/video_frame.cc

Issue 148553003: Clean up histogram'd media enum max values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix naming collision Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/video_frame.h ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_frame.cc
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index 7e654319c52c9964250023eb8ea2ea83bff85802..b3458a5954992b542094c217e46011d77576f7b5 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -63,8 +63,6 @@ std::string VideoFrame::FormatToString(VideoFrame::Format format) {
return "YV12A";
case VideoFrame::YV12J:
return "YV12J";
- case VideoFrame::HISTOGRAM_MAX:
- return "HISTOGRAM_MAX";
}
NOTREACHED() << "Invalid videoframe format provided: " << format;
return "";
@@ -260,7 +258,6 @@ size_t VideoFrame::NumPlanes(Format format) {
case VideoFrame::YV12A:
return 4;
case VideoFrame::UNKNOWN:
- case VideoFrame::HISTOGRAM_MAX:
break;
}
NOTREACHED() << "Unsupported video frame format: " << format;
@@ -326,7 +323,6 @@ size_t VideoFrame::PlaneAllocationSize(Format format,
}
case VideoFrame::UNKNOWN:
case VideoFrame::NATIVE_TEXTURE:
- case VideoFrame::HISTOGRAM_MAX:
#if defined(VIDEO_HOLE)
case VideoFrame::HOLE:
#endif // defined(VIDEO_HOLE)
« no previous file with comments | « media/base/video_frame.h ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698