media/mp4/mp4_stream_parser.cc - Issue 119203003: Drop DecryptConfig::data_offset_.

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/mp4/mp4_stream_parser.cc

Issue 119203003: Drop DecryptConfig::data_offset_. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 7 years 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: media/mp4/mp4_stream_parser.cc

diff --git a/media/mp4/mp4_stream_parser.cc b/media/mp4/mp4_stream_parser.cc

index db1b59b457250251dc3f2cdba17bb492402c7e96..62cc7512cb11f4834496db65fb8245ae49cf0c9b 100644

--- a/media/mp4/mp4_stream_parser.cc

+++ b/media/mp4/mp4_stream_parser.cc

@@ -493,7 +493,6 @@ bool MP4StreamParser::EnqueueSample(BufferQueue* audio_buffers,

decrypt_config.reset(new DecryptConfig(

decrypt_config->key_id(),

decrypt_config->iv(),

- decrypt_config->data_offset(),

subsamples));

}

// else, use the existing config.

@@ -502,7 +501,7 @@ bool MP4StreamParser::EnqueueSample(BufferQueue* audio_buffers,

// The media pipeline requires a DecryptConfig with an empty |iv|.

// TODO(ddorwin): Refactor so we do not need a fake key ID ("1");

decrypt_config.reset(

- new DecryptConfig("1", "", 0, std::vector<SubsampleEntry>()));

+ new DecryptConfig("1", "", std::vector<SubsampleEntry>()));

}

scoped_refptr<StreamParserBuffer> stream_buf =