content/renderer/media/android/media_source_delegate.h - Issue 23545029: EME: Handle NO_KEY and resume playback after key is added.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/android/media_source_delegate.h

Issue 23545029: EME: Handle NO_KEY and resume playback after key is added. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase only Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/renderer/media/android/media_source_delegate.h

diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h

index 5ddc021628b2af533809b4e029f4d77b6f78d341..134553efa18a4f47880b97189459756846819848 100644

--- a/content/renderer/media/android/media_source_delegate.h

+++ b/content/renderer/media/android/media_source_delegate.h

@@ -5,6 +5,9 @@

#ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_

#define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_

+#include <string>

+#include <vector>

#include "base/callback.h"

#include "base/memory/ref_counted.h"

#include "base/memory/scoped_ptr.h"

@@ -233,8 +236,10 @@ class MediaSourceDelegate : public media::DemuxerHost {

base::TimeDelta last_seek_time_;

unsigned last_seek_request_id_;

+#if defined(GOOGLE_TV)

bool key_added_;

std::string key_system_;

+#endif // defined(GOOGLE_TV)

size_t access_unit_size_;