media/blink/websourcebuffer_impl.h - Issue 1735803002: Implemented passing media track info from ffmpeg into blink

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: media/blink/websourcebuffer_impl.h

Issue 1735803002: Implemented passing media track info from ffmpeg into blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/blink/websourcebuffer_impl.cc » ('j') | third_party/WebKit/LayoutTests/media/avtrack/audio-track-properties.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/blink/websourcebuffer_impl.h

diff --git a/media/blink/websourcebuffer_impl.h b/media/blink/websourcebuffer_impl.h

index 9111fd27513c81624f43b1ecba2cca40b1059930..b9b44049d97cb8e8239823f92bb236b2f4f66567 100644

--- a/media/blink/websourcebuffer_impl.h

+++ b/media/blink/websourcebuffer_impl.h

@@ -11,11 +11,13 @@

#include "base/compiler_specific.h"

#include "base/macros.h"

+#include "base/memory/scoped_ptr.h"

#include "base/time/time.h"

#include "third_party/WebKit/public/platform/WebSourceBuffer.h"

namespace media {

class ChunkDemuxer;

+class MediaTracks;

class WebSourceBufferImpl : public blink::WebSourceBuffer {

public:

@@ -42,7 +44,7 @@ class WebSourceBufferImpl : public blink::WebSourceBuffer {

private:

// Demuxer callback handler to process an initialization segment received

// during an append() call.

- void InitSegmentReceived();

+ void InitSegmentReceived(scoped_ptr<MediaTracks> tracks);

std::string id_;

ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl.