diff options
| author | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 22:01:21 +0000 |
|---|---|---|
| committer | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 22:01:21 +0000 |
| commit | d418203614fe5aacf0f2e03fe21644218c1e4f10 (patch) | |
| tree | 86ce1fc632d7c258f677fabbfa435491afdf1083 /cc/resource_provider.cc | |
| parent | 309ad6ae56d328c58867bed9567d2045cfa49673 (diff) | |
| download | chromium_src-d418203614fe5aacf0f2e03fe21644218c1e4f10.zip chromium_src-d418203614fe5aacf0f2e03fe21644218c1e4f10.tar.gz chromium_src-d418203614fe5aacf0f2e03fe21644218c1e4f10.tar.bz2 | |
Plumb through cropped output size for VideoFrame
The video playback path needs to be able to handle cropped video frames,
e.g. for HW decoders that output to macroblock-rounded buffer sizes.
* Composite only the visible subrect from WebVideoFrame in
cc::VideoLayerImpl
* Remove some extraneous cropping logic from cc::VideoLayerImpl now that
we have exact cropping info.
* media::VideoFrame replaces "data_size_" member with "coded_size_", and
adds a "visible_rect_" gfx::Rect to indicate the sub-rect of the
entire frame that should be visible (after cropping)
* Associated changes to various decoder/capture pipelines to plumb this
through.
TEST=build, run on x86, ARM
BUG=155416,140509,chrome-os-partner:15230
Change-Id: I284bc893959db427bc9ae677aed8b07292d228ae
Review URL: https://chromiumcodereview.appspot.com/11269017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resource_provider.cc')
| -rw-r--r-- | cc/resource_provider.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc index ec88bb7..3c134ef 100644 --- a/cc/resource_provider.cc +++ b/cc/resource_provider.cc @@ -283,6 +283,7 @@ void ResourceProvider::setPixels(ResourceId id, const uint8_t* image, const gfx: } if (resource->pixels) { + DCHECK(resource->format == GL_RGBA); SkBitmap srcFull; srcFull.setConfig(SkBitmap::kARGB_8888_Config, imageRect.width(), imageRect.height()); srcFull.setPixels(const_cast<uint8_t*>(image)); |