diff options
| author | wolenetz <wolenetz@chromium.org> | 2016-01-13 12:07:39 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-13 20:08:40 +0000 |
| commit | adbad9931e51a05cd5f39377663e08c0f94e493d (patch) | |
| tree | 4f3594420330f87a00b9b4cfe5ace671e9cd2498 /media/formats | |
| parent | e04f04a8b14cafa5222f581110165b7a5e8de06f (diff) | |
| download | chromium_src-adbad9931e51a05cd5f39377663e08c0f94e493d.zip chromium_src-adbad9931e51a05cd5f39377663e08c0f94e493d.tar.gz chromium_src-adbad9931e51a05cd5f39377663e08c0f94e493d.tar.bz2 | |
MSE: Consistently sequence initial StreamParser EncryptedMediaInitDataCB
Comparing webm_stream_parser.cc and mp4_stream_parser.cc, the former
emits the initial EncyrptedMediaInitDataCB prior to the first NewConfigCB, while
the latter has reverse sequence.
This change makes the ordering consistent across these two parsers.
R=xhwang@chromium.org
Review URL: https://codereview.chromium.org/1583733002
Cr-Commit-Position: refs/heads/master@{#369252}
Diffstat (limited to 'media/formats')
| -rw-r--r-- | media/formats/mp4/mp4_stream_parser.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/formats/mp4/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc index 966d250..a850444 100644 --- a/media/formats/mp4/mp4_stream_parser.cc +++ b/media/formats/mp4/mp4_stream_parser.cc @@ -349,6 +349,9 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) { } } + if (!moov_->pssh.empty()) + OnEncryptedMediaInitData(moov_->pssh); + RCHECK(config_cb_.Run(audio_config, video_config, TextTrackConfigMap())); StreamParser::InitParameters params(kInfiniteDuration()); @@ -376,9 +379,6 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) { if (!init_cb_.is_null()) base::ResetAndReturn(&init_cb_).Run(params); - if (!moov_->pssh.empty()) - OnEncryptedMediaInitData(moov_->pssh); - return true; } |