| Index: webkit/media/webvideoframe_impl.cc
|
| diff --git a/webkit/media/webvideoframe_impl.cc b/webkit/media/webvideoframe_impl.cc
|
| index 5a5b182eeeef5b5420eae2854b06dc074ddb32aa..93970f0275df4af5721ed94843381f3cfae54150 100644
|
| --- a/webkit/media/webvideoframe_impl.cc
|
| +++ b/webkit/media/webvideoframe_impl.cc
|
| @@ -43,6 +43,8 @@ COMPILE_ASSERT_MATCHING_ENUM(FormatYV16, YV16);
|
| COMPILE_ASSERT_MATCHING_ENUM(FormatNV12, NV12);
|
| COMPILE_ASSERT_MATCHING_ENUM(FormatEmpty, EMPTY);
|
| COMPILE_ASSERT_MATCHING_ENUM(FormatASCII, ASCII);
|
| +COMPILE_ASSERT_MATCHING_ENUM(FormatI420, I420);
|
| +COMPILE_ASSERT_MATCHING_ENUM(FormatNativeTexture, NATIVE_TEXTURE);
|
|
|
| WebVideoFrame::Format WebVideoFrameImpl::format() const {
|
| if (video_frame_.get())
|
| @@ -75,9 +77,15 @@ int WebVideoFrameImpl::stride(unsigned plane) const {
|
| }
|
|
|
| const void* WebVideoFrameImpl::data(unsigned plane) const {
|
| - if (video_frame_.get())
|
| - return static_cast<const void*>(video_frame_->data(plane));
|
| - return NULL;
|
| + if (!video_frame_.get() || format() == FormatNativeTexture)
|
| + return NULL;
|
| + return static_cast<const void*>(video_frame_->data(plane));
|
| +}
|
| +
|
| +unsigned WebVideoFrameImpl::textureId() const {
|
| + if (!video_frame_.get() || format() != FormatNativeTexture)
|
| + return 0;
|
| + return video_frame_->texture_id();
|
| }
|
|
|
| } // namespace webkit_media
|
|
|