media/base/mock_filters.h - Issue 2050043002: Generate and assign media track ids in demuxers.

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/base/mock_filters.h

Issue 2050043002: Generate and assign media track ids in demuxers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-streamparser-trackid

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

Index: media/base/mock_filters.h

diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h

index 78d18a5924847bf7188a7b91597fd4a749d401ae..51837260eb28415338e7f5035b534dd1ec231762 100644

--- a/media/base/mock_filters.h

+++ b/media/base/mock_filters.h

@@ -19,6 +19,7 @@

#include "media/base/decoder_buffer.h"

#include "media/base/decryptor.h"

#include "media/base/demuxer.h"

+#include "media/base/media_track.h"

#include "media/base/pipeline.h"

#include "media/base/pipeline_status.h"

#include "media/base/renderer.h"

@@ -122,6 +123,8 @@ class MockDemuxer : public Demuxer {

MOCK_CONST_METHOD0(GetStartTime, base::TimeDelta());

MOCK_CONST_METHOD0(GetTimelineOffset, base::Time());

MOCK_CONST_METHOD0(GetMemoryUsage, int64_t());

+ MOCK_CONST_METHOD1(GetDemuxerStreamByTrackId,

+ const DemuxerStream*(MediaTrack::TrackId));

private:

DISALLOW_COPY_AND_ASSIGN(MockDemuxer);

« media/base/media_tracks.cc ('K') | « media/base/media_tracks.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | media/blink/websourcebuffer_impl.cc » ('J')