diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-16 20:24:01 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-16 20:24:01 +0000 |
| commit | 7ee85d62a62726b2e86dc78efb8e89df6c44643e (patch) | |
| tree | 33e8ffc970d3142143136060c50baac511d1b93b /content | |
| parent | 11db6c2a71141a3fe28d8bc9080b7b341ce7563a (diff) | |
| download | chromium_src-7ee85d62a62726b2e86dc78efb8e89df6c44643e.zip chromium_src-7ee85d62a62726b2e86dc78efb8e89df6c44643e.tar.gz chromium_src-7ee85d62a62726b2e86dc78efb8e89df6c44643e.tar.bz2 | |
Pepper: Change PPB_VideoDecoder::Reset behavior so plugin always manages textures.
Reset now will allow plugin to call RecyclePicture. The plugin must recycle any
texture it receives now. This makes plugin code simpler, since it can treat all
textures it receives in the same way (no special Reset handling).
Also fix a bug where Reset didn't return textures to the hardware decoder, which
already has this behavior.
BUG=281689
Review URL: https://codereview.chromium.org/390213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/pepper/pepper_video_decoder_host.cc | 2 | ||||
| -rw-r--r-- | content/renderer/pepper/video_decoder_shim.cc | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/content/renderer/pepper/pepper_video_decoder_host.cc b/content/renderer/pepper/pepper_video_decoder_host.cc index f15cd58..4fc2d2c 100644 --- a/content/renderer/pepper/pepper_video_decoder_host.cc +++ b/content/renderer/pepper/pepper_video_decoder_host.cc @@ -269,8 +269,6 @@ int32_t PepperVideoDecoderHost::OnHostMsgRecyclePicture( if (!initialized_) return PP_ERROR_FAILED; DCHECK(decoder_); - if (reset_reply_context_.is_valid()) - return PP_ERROR_FAILED; decoder_->ReusePictureBuffer(texture_id); return PP_OK; diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc index afd7f57..50a6398 100644 --- a/content/renderer/pepper/video_decoder_shim.cc +++ b/content/renderer/pepper/video_decoder_shim.cc @@ -556,12 +556,6 @@ void VideoDecoderShim::OnResetComplete() { // Dismiss any old textures now. while (!textures_to_dismiss_.empty()) DismissTexture(*textures_to_dismiss_.begin()); - // Make all textures available. - for (TextureIdMap::const_iterator it = texture_id_map_.begin(); - it != texture_id_map_.end(); - ++it) { - available_textures_.insert(it->first); - } state_ = DECODING; host_->NotifyResetDone(); |