diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 01:04:33 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 01:04:33 +0000 |
| commit | 37141711d11b09cef8405c4c2384549dad316fe9 (patch) | |
| tree | 82c6e743cb9b011d5e600069ebb42e4098b1ec81 /media/mp4 | |
| parent | 8f92ac14a5a83d336f97317a7292394f187d5c16 (diff) | |
| download | chromium_src-37141711d11b09cef8405c4c2384549dad316fe9.zip chromium_src-37141711d11b09cef8405c4c2384549dad316fe9.tar.gz chromium_src-37141711d11b09cef8405c4c2384549dad316fe9.tar.bz2 | |
Support encrypted audio stream in demuxer.
BUG=123421
TEST=updated media_unittest
Review URL: https://chromiumcodereview.appspot.com/11088047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/mp4')
| -rw-r--r-- | media/mp4/mp4_stream_parser.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/mp4/mp4_stream_parser.cc b/media/mp4/mp4_stream_parser.cc index fc141b5..c600537 100644 --- a/media/mp4/mp4_stream_parser.cc +++ b/media/mp4/mp4_stream_parser.cc @@ -199,10 +199,11 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) { return false; } + bool is_encrypted = entry.sinf.info.track_encryption.is_encrypted; audio_config.Initialize(kCodecAAC, entry.samplesize, aac.channel_layout(), aac.GetOutputSamplesPerSecond(has_sbr_), - NULL, 0, false); + NULL, 0, is_encrypted, false); has_audio_ = true; audio_track_id_ = track->header.track_id; } |