media/formats/mpeg/mpeg_audio_stream_parser_base.cc - Issue 1786733004: Revert of media config: expand is_encrypted to a struct.

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/formats/mpeg/mpeg_audio_stream_parser_base.cc

Issue 1786733004: Revert of media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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/formats/mpeg/mpeg_audio_stream_parser_base.cc

diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc

index 47dd2f6e4cba827fb45626df6b037302a62a867e..202849527de0b103fbde90942ce626de3f68d404 100644

--- a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc

+++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc

@@ -8,7 +8,6 @@

#include "base/callback_helpers.h"

#include "base/message_loop/message_loop.h"

#include "media/base/media_tracks.h"

-#include "media/base/media_util.h"

#include "media/base/stream_parser_buffer.h"

#include "media/base/text_track_config.h"

#include "media/base/timestamp_constants.h"

@@ -206,9 +205,14 @@

}

if (!config_.IsValidConfig()) {

- config_.Initialize(audio_codec_, kSampleFormatF32, channel_layout,

- sample_rate, std::vector<uint8_t>(), Unencrypted(),

- base::TimeDelta(), codec_delay_);

+ config_.Initialize(audio_codec_,

+ kSampleFormatF32,

+ channel_layout,

+ sample_rate,

+ std::vector<uint8_t>(),

+ false,

+ base::TimeDelta(),

+ codec_delay_);

base::TimeDelta base_timestamp;

if (timestamp_helper_)

« no previous file with comments | « media/formats/mp4/mp4_stream_parser.cc ('k') | media/formats/webm/webm_audio_client.h » ('j') | no next file with comments »