Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(352)

Side by Side Diff: media/filters/chunk_demuxer.cc

Issue 10822026: Implement "Key Presence" step in "Encrypted Block Encounted" algorithm in EME. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/filters/chunk_demuxer.h" 5 #include "media/filters/chunk_demuxer.h"
6 6
7 #include <algorithm>
8 #include <deque>
9
7 #include "base/bind.h" 10 #include "base/bind.h"
8 #include "base/callback_helpers.h" 11 #include "base/callback_helpers.h"
9 #include "base/location.h" 12 #include "base/location.h"
10 #include "base/logging.h" 13 #include "base/logging.h"
11 #include "base/message_loop_proxy.h" 14 #include "base/message_loop_proxy.h"
12 #include "base/string_util.h" 15 #include "base/string_util.h"
13 #include "media/base/audio_decoder_config.h" 16 #include "media/base/audio_decoder_config.h"
14 #include "media/base/stream_parser_buffer.h" 17 #include "media/base/stream_parser_buffer.h"
15 #include "media/base/video_decoder_config.h" 18 #include "media/base/video_decoder_config.h"
16 #include "media/filters/chunk_demuxer_client.h" 19 #include "media/filters/chunk_demuxer_client.h"
(...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 (*itr)->SetTimestamp((*itr)->GetTimestamp() + timestamp_offset); 1092 (*itr)->SetTimestamp((*itr)->GetTimestamp() + timestamp_offset);
1090 } 1093 }
1091 } 1094 }
1092 1095
1093 bool ChunkDemuxer::IsValidId(const std::string& source_id) const { 1096 bool ChunkDemuxer::IsValidId(const std::string& source_id) const {
1094 return source_info_map_.count(source_id) > 0u && 1097 return source_info_map_.count(source_id) > 0u &&
1095 stream_parser_map_.count(source_id) > 0u; 1098 stream_parser_map_.count(source_id) > 0u;
1096 } 1099 }
1097 1100
1098 } // namespace media 1101 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698