media/formats/mpeg/mpeg_audio_stream_parser_base.cc - Issue 1564983003: MSE: Log a warning if muxed AV media segment has no A or has no V block

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 1564983003: MSE: Log a warning if muxed AV media segment has no A or has no V block (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« media/formats/mp4/mp4_stream_parser_unittest.cc ('K') | « media/formats/mpeg/mpeg_audio_stream_parser_base.h ('k') | media/formats/webm/webm_stream_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 4dc9df7982a55b185f2d16cf12a5fb757a436be8..1ca70a75965d01be4b36d8c69a5b3256ace196b5 100644

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

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

@@ -61,7 +61,7 @@ void MPEGAudioStreamParserBase::Init(

bool ignore_text_tracks,

const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,

const NewMediaSegmentCB& new_segment_cb,

- const base::Closure& end_of_segment_cb,

+ const EndMediaSegmentCB& end_of_segment_cb,

const scoped_refptr<MediaLog>& media_log) {

DVLOG(1) << __FUNCTION__;

DCHECK_EQ(state_, UNINITIALIZED);

@@ -411,7 +411,8 @@ bool MPEGAudioStreamParserBase::SendBuffers(BufferQueue* buffers,

if (end_of_segment) {

in_media_segment_ = false;

- end_of_segment_cb_.Run();

+ if (!end_of_segment_cb_.Run())

+ return false;

}

timestamp_helper_->SetBaseTimestamp(base::TimeDelta());