| OLD | NEW |
| 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/ffmpeg_demuxer.h" | 5 #include "media/filters/ffmpeg_demuxer.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 if (!key || !key->value) | 163 if (!key || !key->value) |
| 164 return; | 164 return; |
| 165 base::StringPiece base64_key_id(key->value); | 165 base::StringPiece base64_key_id(key->value); |
| 166 std::string enc_key_id; | 166 std::string enc_key_id; |
| 167 base::Base64Decode(base64_key_id, &enc_key_id); | 167 base::Base64Decode(base64_key_id, &enc_key_id); |
| 168 DCHECK(!enc_key_id.empty()); | 168 DCHECK(!enc_key_id.empty()); |
| 169 if (enc_key_id.empty()) | 169 if (enc_key_id.empty()) |
| 170 return; | 170 return; |
| 171 | 171 |
| 172 encryption_key_id_.assign(enc_key_id); | 172 encryption_key_id_.assign(enc_key_id); |
| 173 demuxer_->FireNeedKey(kWebMEncryptInitDataType, enc_key_id); | 173 demuxer_->FireNeedKey(kWebMInitDataType, enc_key_id); |
| 174 } | 174 } |
| 175 } | 175 } |
| 176 | 176 |
| 177 void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { | 177 void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { |
| 178 DCHECK(task_runner_->BelongsToCurrentThread()); | 178 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 179 | 179 |
| 180 if (!demuxer_ || end_of_stream_) { | 180 if (!demuxer_ || end_of_stream_) { |
| 181 NOTREACHED() << "Attempted to enqueue packet on a stopped stream"; | 181 NOTREACHED() << "Attempted to enqueue packet on a stopped stream"; |
| 182 return; | 182 return; |
| 183 } | 183 } |
| (...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1248 } | 1248 } |
| 1249 for (size_t i = 0; i < buffered.size(); ++i) | 1249 for (size_t i = 0; i < buffered.size(); ++i) |
| 1250 host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i)); | 1250 host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i)); |
| 1251 } | 1251 } |
| 1252 | 1252 |
| 1253 void FFmpegDemuxer::OnDataSourceError() { | 1253 void FFmpegDemuxer::OnDataSourceError() { |
| 1254 host_->OnDemuxerError(PIPELINE_ERROR_READ); | 1254 host_->OnDemuxerError(PIPELINE_ERROR_READ); |
| 1255 } | 1255 } |
| 1256 | 1256 |
| 1257 } // namespace media | 1257 } // namespace media |
| OLD | NEW |