Fix VideoLayerImpl upload of YUV->RGBA converted frames.

Fix VideoLayerImpl upload of YUV->RGBA converted frames.

Fixes issues introduced by r189506.

This CL has already been LGTM'ed by danakj@ on
https://chromiumcodereview.appspot.com/12998003/.  Resubmitting as a new issue
due to CQ having gotten into a bad state.

BUG=chromium:167417
BUG=chromium-os:38376
TEST=local build, unittests
TBR=danakj

Change-Id: Ic1ed42e897a7c89b574a653ca7a7ef3fa5395375


Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190106

[sheu, 2013-03-22 20:11:17]

danakj@: no action necessary from you here, but you were auto-added to reviewers
anyways :-)

[danakj, 2013-03-22 20:12:26]

ok, well lgtm


On Fri, Mar 22, 2013 at 4:11 PM, <sheu@chromium.org> wrote:

> Reviewers: danakj,
>
> Message:
> danakj@: no action necessary from you here, but you were auto-added to
> reviewers
> anyways :-)
>
> Description:
> Fix VideoLayerImpl upload of YUV->RGBA converted frames.
>
> Fixes issues introduced by r189506.
>
> This CL has already been LGTM'ed by danakj@ on
>
https://chromiumcodereview.**appspot.com/12998003/<https://chromiumcodereview....
>  Resubmitting as a new issue
> due to CQ having gotten into a bad state.
>
> BUG=chromium:167417
> BUG=chromium-os:38376
> TEST=local build, unittests
> TBR=danakj
>
> Change-Id: Ic1ed42e897a7c89b574a653ca7a7e**f3fa5395375
>
>
> Please review this at
https://codereview.chromium.**org/12634034/<https://codereview.chromium.org/1...
>
> SVN Base:
https://chromium.googlesource.**com/chromium/src@git-svn<https://chromium.goo...
>
> Affected files:
>   M cc/layers/video_layer_impl.h
>   M cc/layers/video_layer_impl.cc
>
>
> Index: cc/layers/video_layer_impl.cc
> diff --git a/cc/layers/video_layer_impl.**cc b/cc/layers/video_layer_impl.
> **cc
> index fbef0a5bc855939c21c3868c289e52**e3ce261586..**
> 5efbd49b995ec0370c8b6f720d77d2**2e023b5864 100644
> --- a/cc/layers/video_layer_impl.**cc
> +++ b/cc/layers/video_layer_impl.**cc
> @@ -366,19 +366,18 @@ void
VideoLayerImpl::FramePlane::**FreeData(ResourceProvider*
> resource_provider) {
>  }
>
>  // Convert media::VideoFrame::Format to OpenGL enum values.
> -static GLenum ConvertVFCFormatToGLenum(const media::VideoFrame& frame) {
> -  switch (frame.format()) {
> +static GLenum ConvertVFCFormatToGLenum(const media::VideoFrame::Format
> format) {
> +  switch (format) {
>      case media::VideoFrame::YV12:
>      case media::VideoFrame::YV16:
>        return GL_LUMINANCE;
> +    case media::VideoFrame::RGB32:
> +      return GL_RGBA;
>      case media::VideoFrame::NATIVE_**TEXTURE:
> -      return frame.texture_target();
>  #if defined(GOOGLE_TV)
>      case media::VideoFrame::HOLE:
> -      return GL_INVALID_VALUE;
>  #endif
>      case media::VideoFrame::INVALID:
> -    case media::VideoFrame::RGB32:
>      case media::VideoFrame::EMPTY:
>      case media::VideoFrame::I420:
>        NOTREACHED();
> @@ -387,23 +386,13 @@ static GLenum ConvertVFCFormatToGLenum(const
> media::VideoFrame& frame) {
>    return GL_INVALID_VALUE;
>  }
>
> -size_t VideoLayerImpl::NumPlanes() const {
> -  if (!frame_)
> -    return 0;
> -
> -  if (convert_yuv_)
> -    return 1;
> -
> -  return media::VideoFrame::NumPlanes(**frame_->format());
> -}
> -
>  bool VideoLayerImpl::**SetupFramePlanes(**ResourceProvider*
> resource_provider) {
> -  const size_t plane_count = NumPlanes();
> +  const size_t plane_count = media::VideoFrame::NumPlanes(**format_);
>    if (!plane_count)
>      return true;
>
>    const int max_texture_size = resource_provider->max_**texture_size();
> -  const GLenum pixel_format = ConvertVFCFormatToGLenum(***frame_);
> +  const GLenum pixel_format = ConvertVFCFormatToGLenum(**format_);
>    for (size_t plane_index = 0; plane_index < plane_count; ++plane_index) {
>      VideoLayerImpl::FramePlane* plane = &frame_planes_[plane_index];
>
> @@ -464,7 +453,8 @@ void
VideoLayerImpl::**FreeFramePlanes(**ResourceProvider*
> resource_provider) {
>  }
>
>  void VideoLayerImpl::**FreeUnusedFramePlanes(**ResourceProvider*
> resource_provider) {
> -  size_t first_unused_plane = NumPlanes();
> +  size_t first_unused_plane = (frame_ ? media::VideoFrame::NumPlanes(**
> format_)
> +                                      : 0);
>    for (size_t i = first_unused_plane; i < media::VideoFrame::kMaxPlanes;
> ++i)
>      frame_planes_[i].FreeData(**resource_provider);
>  }
> Index: cc/layers/video_layer_impl.h
> diff --git a/cc/layers/video_layer_impl.h b/cc/layers/video_layer_impl.h
> index dfa08213872b88ba5d493a0fb5e0a0**7c33e9dd9f..**
> da1c53f51b99b9d9b06161ada8eb10**8c8b95b0c7 100644
> --- a/cc/layers/video_layer_impl.h
> +++ b/cc/layers/video_layer_impl.h
> @@ -66,7 +66,6 @@ class CC_EXPORT VideoLayerImpl : public LayerImpl {
>    bool SetupFramePlanes(**ResourceProvider* resource_provider);
>    void FreeFramePlanes(**ResourceProvider* resource_provider);
>    void FreeUnusedFramePlanes(**ResourceProvider* resource_provider);
> -  size_t NumPlanes() const;
>
>    scoped_refptr<**VideoFrameProviderClientImpl> provider_client_impl_;
>
>
>
>

[commit-bot: I haz the power, 2013-03-22 20:35:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sheu@chromium.org/12634034/1

[commit-bot: I haz the power, 2013-03-23 15:13:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sheu@chromium.org/12634034/1

[commit-bot: I haz the power, 2013-03-23 23:09:01]

Change committed as 190106