summaryrefslogtreecommitdiffstats
path: root/cc/resources
diff options
context:
space:
mode:
authorrileya@chromium.org <rileya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 05:32:29 +0000
committerrileya@chromium.org <rileya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 05:32:29 +0000
commit876937d2934cbd46110d9847bfb121b10cc51c95 (patch)
tree9c91480b2775307c2d42b4c5fda68a142872ccd5 /cc/resources
parentfd47e1bcecd99252a9ec27858f6420905ba06f46 (diff)
downloadchromium_src-876937d2934cbd46110d9847bfb121b10cc51c95.zip
chromium_src-876937d2934cbd46110d9847bfb121b10cc51c95.tar.gz
chromium_src-876937d2934cbd46110d9847bfb121b10cc51c95.tar.bz2
Remove EMPTY from VideoFrame::Format.
It was being used to indicate end-of-stream, which was sort of an abuse of the format enum. Instead, we now have a CreateEOSFrame(), rather than CreateEmptyFrame(), and an |end_of_stream_| member. BUG=313827 TBR=danakj Review URL: https://codereview.chromium.org/57403003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resources')
-rw-r--r--cc/resources/video_resource_updater.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc
index b53becf..56601de 100644
--- a/cc/resources/video_resource_updater.cc
+++ b/cc/resources/video_resource_updater.cc
@@ -77,7 +77,6 @@ bool VideoResourceUpdater::VerifyFrame(
// Unacceptable inputs. ¯\(°_o)/¯
case media::VideoFrame::UNKNOWN:
- case media::VideoFrame::EMPTY:
case media::VideoFrame::I420:
break;
}
@@ -104,7 +103,6 @@ static gfx::Size SoftwarePlaneDimension(
return gfx::ToFlooredSize(gfx::ScaleSize(coded_size, 0.5f, 1.f));
case media::VideoFrame::UNKNOWN:
- case media::VideoFrame::EMPTY:
case media::VideoFrame::I420:
case media::VideoFrame::NATIVE_TEXTURE:
#if defined(GOOGLE_TV)