diff options
| author | Ben Murdoch <benm@google.com> | 2014-11-22 01:28:32 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-11-22 01:28:32 +0000 |
| commit | e4256316f8b5e8d1ec0df1f7762771622a53fa63 (patch) | |
| tree | 9d8282f7a323fad191129fddbcf5601903fa161c /content/common/gpu/media/dxva_video_decode_accelerator.cc | |
| parent | 165c68f9802332588874b0a207d7f49d03009ddf (diff) | |
| download | chromium_org-e4256316f8b5e8d1ec0df1f7762771622a53fa63.tar.gz | |
Merge from Chromium at DEPS revision 39.0.2171.90
This commit was generated by merge_to_master.py.
Change-Id: I1bb301dcfe74249d8b66fb60ba577e9095c86b8d
Diffstat (limited to 'content/common/gpu/media/dxva_video_decode_accelerator.cc')
| -rw-r--r-- | content/common/gpu/media/dxva_video_decode_accelerator.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.cc b/content/common/gpu/media/dxva_video_decode_accelerator.cc index d0e98b7457..530358e155 100644 --- a/content/common/gpu/media/dxva_video_decode_accelerator.cc +++ b/content/common/gpu/media/dxva_video_decode_accelerator.cc @@ -323,7 +323,7 @@ bool DXVAVideoDecodeAccelerator::DXVAPictureBuffer:: glBindTexture(GL_TEXTURE_2D, picture_buffer_.texture_id()); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); base::win::ScopedComPtr<IDirect3DSurface9> d3d_surface; hr = decoding_texture_->GetSurfaceLevel(0, d3d_surface.Receive()); @@ -362,7 +362,7 @@ bool DXVAVideoDecodeAccelerator::DXVAPictureBuffer:: egl_display, decoding_surface_, EGL_BACK_BUFFER); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glBindTexture(GL_TEXTURE_2D, current_texture); return true; } @@ -456,10 +456,9 @@ bool DXVAVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile, // TODO(ananta) // H264PROFILE_HIGH video decoding is janky at times. Needs more - // investigation. + // investigation. http://crbug.com/426707 if (profile != media::H264PROFILE_BASELINE && - profile != media::H264PROFILE_MAIN && - profile != media::H264PROFILE_HIGH) { + profile != media::H264PROFILE_MAIN) { RETURN_AND_NOTIFY_ON_FAILURE(false, "Unsupported h264 profile", PLATFORM_FAILURE, false); } |