diff options
| author | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-24 02:26:14 +0000 |
|---|---|---|
| committer | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-24 02:26:14 +0000 |
| commit | 0226ef2a6be5eec0e7fbfa70deb74ab3c624fdeb (patch) | |
| tree | 24206eeaf121c19a6f18b2ec1655cdb82e6fb606 /content/renderer/pepper | |
| parent | 72660d99600c520ec658f0ee61469832f6cd3f21 (diff) | |
| download | chromium_src-0226ef2a6be5eec0e7fbfa70deb74ab3c624fdeb.zip chromium_src-0226ef2a6be5eec0e7fbfa70deb74ab3c624fdeb.tar.gz chromium_src-0226ef2a6be5eec0e7fbfa70deb74ab3c624fdeb.tar.bz2 | |
Encrypted media: avoid resetting video state on audio deinit
The video stream's natural_size_ is being reset unconditionally in
ContentDecryptorDelegate when the decoder is deinitialized, even when the deinit
is for the the audio stream. Fix this.
BUG=None
TEST=local build, run on desktop Linux
Review URL: https://codereview.chromium.org/208653009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/pepper')
| -rw-r--r-- | content/renderer/pepper/content_decryptor_delegate.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc index 4cb4ddf..27ff3c82 100644 --- a/content/renderer/pepper/content_decryptor_delegate.cc +++ b/content/renderer/pepper/content_decryptor_delegate.cc @@ -473,7 +473,8 @@ bool ContentDecryptorDelegate::DeinitializeDecoder( Decryptor::StreamType stream_type) { CancelDecode(stream_type); - natural_size_ = gfx::Size(); + if (stream_type == Decryptor::kVideo) + natural_size_ = gfx::Size(); // TODO(tomfinegan): Add decoder deinitialize request tracking, and get // stream type from media stack. |