Chromium Code Reviews| 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/bind.h" | 11 #include "base/bind.h" |
| 11 #include "base/callback.h" | 12 #include "base/callback.h" |
| 12 #include "base/callback_helpers.h" | 13 #include "base/callback_helpers.h" |
| 13 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 14 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 15 #include "base/message_loop.h" | 16 #include "base/message_loop.h" |
| 16 #include "base/stl_util.h" | 17 #include "base/stl_util.h" |
| 17 #include "base/string_util.h" | 18 #include "base/string_util.h" |
| 18 #include "base/task_runner_util.h" | 19 #include "base/task_runner_util.h" |
| 19 #include "base/time.h" | 20 #include "base/time.h" |
| 20 #include "media/base/audio_decoder_config.h" | 21 #include "media/base/audio_decoder_config.h" |
| 21 #include "media/base/bind_to_loop.h" | 22 #include "media/base/bind_to_loop.h" |
| 22 #include "media/base/decoder_buffer.h" | 23 #include "media/base/decoder_buffer.h" |
| 24 #include "media/base/decrypt_config.h" | |
| 23 #include "media/base/limits.h" | 25 #include "media/base/limits.h" |
| 24 #include "media/base/media_switches.h" | 26 #include "media/base/media_switches.h" |
| 25 #include "media/base/video_decoder_config.h" | 27 #include "media/base/video_decoder_config.h" |
| 26 #include "media/ffmpeg/ffmpeg_common.h" | 28 #include "media/ffmpeg/ffmpeg_common.h" |
| 27 #include "media/filters/ffmpeg_glue.h" | 29 #include "media/filters/ffmpeg_glue.h" |
| 28 #include "media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h" | 30 #include "media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h" |
| 31 #include "media/webm/webm_crypto_helpers.h" | |
| 29 | 32 |
| 30 namespace media { | 33 namespace media { |
| 31 | 34 |
| 32 // | 35 // |
| 33 // FFmpegDemuxerStream | 36 // FFmpegDemuxerStream |
| 34 // | 37 // |
| 35 FFmpegDemuxerStream::FFmpegDemuxerStream( | 38 FFmpegDemuxerStream::FFmpegDemuxerStream( |
| 36 FFmpegDemuxer* demuxer, | 39 FFmpegDemuxer* demuxer, |
| 37 AVStream* stream) | 40 AVStream* stream) |
| 38 : demuxer_(demuxer), | 41 : demuxer_(demuxer), |
| 39 message_loop_(base::MessageLoopProxy::current()), | 42 message_loop_(base::MessageLoopProxy::current()), |
| 40 stream_(stream), | 43 stream_(stream), |
| 41 type_(UNKNOWN), | 44 type_(UNKNOWN), |
| 42 stopped_(false), | 45 stopped_(false), |
| 43 end_of_stream_(false), | 46 end_of_stream_(false), |
| 44 last_packet_timestamp_(kNoTimestamp()), | 47 last_packet_timestamp_(kNoTimestamp()), |
| 45 bitstream_converter_enabled_(false) { | 48 bitstream_converter_enabled_(false) { |
| 46 DCHECK(demuxer_); | 49 DCHECK(demuxer_); |
| 47 | 50 |
| 48 // Determine our media format. | 51 // Determine our media format. |
| 49 switch (stream->codec->codec_type) { | 52 switch (stream->codec->codec_type) { |
| 50 case AVMEDIA_TYPE_AUDIO: | 53 case AVMEDIA_TYPE_AUDIO: |
| 51 type_ = AUDIO; | 54 type_ = AUDIO; |
| 52 AVCodecContextToAudioDecoderConfig(stream->codec, &audio_config_); | 55 AVStreamToAudioDecoderConfig(stream, &audio_config_); |
| 53 break; | 56 break; |
| 54 case AVMEDIA_TYPE_VIDEO: | 57 case AVMEDIA_TYPE_VIDEO: |
| 55 type_ = VIDEO; | 58 type_ = VIDEO; |
| 56 AVStreamToVideoDecoderConfig(stream, &video_config_); | 59 AVStreamToVideoDecoderConfig(stream, &video_config_); |
| 57 break; | 60 break; |
| 58 default: | 61 default: |
| 59 NOTREACHED(); | 62 NOTREACHED(); |
| 60 break; | 63 break; |
| 61 } | 64 } |
| 62 | 65 |
| 63 // Calculate the duration. | 66 // Calculate the duration. |
| 64 duration_ = ConvertStreamTimestamp(stream->time_base, stream->duration); | 67 duration_ = ConvertStreamTimestamp(stream->time_base, stream->duration); |
| 65 | 68 |
| 66 if (stream_->codec->codec_id == CODEC_ID_H264) { | 69 if (stream_->codec->codec_id == CODEC_ID_H264) { |
| 67 bitstream_converter_.reset( | 70 bitstream_converter_.reset( |
| 68 new FFmpegH264ToAnnexBBitstreamConverter(stream_->codec)); | 71 new FFmpegH264ToAnnexBBitstreamConverter(stream_->codec)); |
| 69 } | 72 } |
| 73 | |
| 74 if (audio_config_.is_encrypted() || video_config_.is_encrypted()) { | |
|
ddorwin
2013/03/10 21:29:39
Shouldn't we only check the one for this stream ty
fgalligan1
2013/03/12 00:42:42
Done. But I think having the two configs in demuxe
ddorwin
2013/03/12 04:40:06
Agreed. Not sure what the best solution is. We can
| |
| 75 AVDictionaryEntry *key = av_dict_get(stream->metadata, "enc_key_id", NULL, | |
| 76 0); | |
| 77 if (!key || !key->value) | |
|
ddorwin
2013/03/10 21:29:39
DCHECK too?
fgalligan1
2013/03/12 00:42:42
Done.
| |
| 78 return; | |
| 79 base::StringPiece base64_key_id(key->value); | |
| 80 std::string enc_key_id; | |
| 81 base::Base64Decode(base64_key_id, &enc_key_id); | |
| 82 if (enc_key_id.empty()) | |
| 83 return; | |
| 84 | |
| 85 if (stream_->codec->codec_id == CODEC_ID_VORBIS) { | |
|
ddorwin
2013/03/10 21:29:39
I don't think codec matters. If we read enc_key_id
fgalligan1
2013/03/12 00:42:42
The code I added to FFmpeg is not WebM specific. I
ddorwin
2013/03/12 04:40:06
In what cases would we do the wrong thing? Matrosk
| |
| 86 audio_encryption_key_id_.assign(enc_key_id); | |
| 87 demuxer_->FireNeedKey(kWebMEncryptInitDataType, enc_key_id); | |
| 88 } else if (stream_->codec->codec_id == CODEC_ID_VP8) { | |
| 89 video_encryption_key_id_.assign(enc_key_id); | |
| 90 demuxer_->FireNeedKey(kWebMEncryptInitDataType, enc_key_id); | |
| 91 } | |
| 92 } | |
| 70 } | 93 } |
| 71 | 94 |
| 72 void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { | 95 void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { |
| 73 DCHECK(message_loop_->BelongsToCurrentThread()); | 96 DCHECK(message_loop_->BelongsToCurrentThread()); |
| 74 | 97 |
| 75 if (stopped_ || end_of_stream_) { | 98 if (stopped_ || end_of_stream_) { |
| 76 NOTREACHED() << "Attempted to enqueue packet on a stopped stream"; | 99 NOTREACHED() << "Attempted to enqueue packet on a stopped stream"; |
| 77 return; | 100 return; |
| 78 } | 101 } |
| 79 | 102 |
| 80 // Convert the packet if there is a bitstream filter. | 103 // Convert the packet if there is a bitstream filter. |
| 81 if (packet->data && bitstream_converter_enabled_ && | 104 if (packet->data && bitstream_converter_enabled_ && |
| 82 !bitstream_converter_->ConvertPacket(packet.get())) { | 105 !bitstream_converter_->ConvertPacket(packet.get())) { |
| 83 LOG(ERROR) << "Format conversion failed."; | 106 LOG(ERROR) << "Format conversion failed."; |
| 84 } | 107 } |
| 85 | 108 |
| 86 // If a packet is returned by FFmpeg's av_parser_parse2() the packet will | 109 // If a packet is returned by FFmpeg's av_parser_parse2() the packet will |
| 87 // reference inner memory of FFmpeg. As such we should transfer the packet | 110 // reference inner memory of FFmpeg. As such we should transfer the packet |
| 88 // into memory we control. | 111 // into memory we control. |
| 89 scoped_refptr<DecoderBuffer> buffer; | 112 scoped_refptr<DecoderBuffer> buffer; |
| 90 buffer = DecoderBuffer::CopyFrom(packet->data, packet->size); | 113 buffer = DecoderBuffer::CopyFrom(packet->data, packet->size); |
| 114 | |
| 115 if (type() == DemuxerStream::AUDIO && audio_config_.is_encrypted() && | |
|
ddorwin
2013/03/10 21:29:39
I think we can collapse this to:
if (type() == Dem
fgalligan1
2013/03/12 00:42:42
Done.
| |
| 116 stream_->codec->codec_id == CODEC_ID_VORBIS) { | |
|
ddorwin
2013/03/10 21:29:39
Checking codecs doesn't scale. I think we may need
fgalligan1
2013/03/12 00:42:42
I removed the checks.
| |
| 117 buffer->SetDecryptConfig(WebMCreateDecryptConfig( | |
| 118 packet->data, packet->size, | |
| 119 reinterpret_cast<const uint8*>(audio_encryption_key_id_.data()), | |
| 120 audio_encryption_key_id_.size())); | |
| 121 } else if (type() == DemuxerStream::VIDEO && video_config_.is_encrypted() && | |
| 122 stream_->codec->codec_id == CODEC_ID_VP8) { | |
| 123 buffer->SetDecryptConfig(WebMCreateDecryptConfig( | |
| 124 packet->data, packet->size, | |
| 125 reinterpret_cast<const uint8*>(video_encryption_key_id_.data()), | |
| 126 video_encryption_key_id_.size())); | |
| 127 } | |
| 128 | |
| 91 buffer->SetTimestamp(ConvertStreamTimestamp( | 129 buffer->SetTimestamp(ConvertStreamTimestamp( |
| 92 stream_->time_base, packet->pts)); | 130 stream_->time_base, packet->pts)); |
| 93 buffer->SetDuration(ConvertStreamTimestamp( | 131 buffer->SetDuration(ConvertStreamTimestamp( |
| 94 stream_->time_base, packet->duration)); | 132 stream_->time_base, packet->duration)); |
| 95 if (buffer->GetTimestamp() != kNoTimestamp() && | 133 if (buffer->GetTimestamp() != kNoTimestamp() && |
| 96 last_packet_timestamp_ != kNoTimestamp() && | 134 last_packet_timestamp_ != kNoTimestamp() && |
| 97 last_packet_timestamp_ < buffer->GetTimestamp()) { | 135 last_packet_timestamp_ < buffer->GetTimestamp()) { |
| 98 buffered_ranges_.Add(last_packet_timestamp_, buffer->GetTimestamp()); | 136 buffered_ranges_.Add(last_packet_timestamp_, buffer->GetTimestamp()); |
| 99 demuxer_->NotifyBufferingChanged(); | 137 demuxer_->NotifyBufferingChanged(); |
| 100 } | 138 } |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 224 return kNoTimestamp(); | 262 return kNoTimestamp(); |
| 225 | 263 |
| 226 return ConvertFromTimeBase(time_base, timestamp); | 264 return ConvertFromTimeBase(time_base, timestamp); |
| 227 } | 265 } |
| 228 | 266 |
| 229 // | 267 // |
| 230 // FFmpegDemuxer | 268 // FFmpegDemuxer |
| 231 // | 269 // |
| 232 FFmpegDemuxer::FFmpegDemuxer( | 270 FFmpegDemuxer::FFmpegDemuxer( |
| 233 const scoped_refptr<base::MessageLoopProxy>& message_loop, | 271 const scoped_refptr<base::MessageLoopProxy>& message_loop, |
| 234 const scoped_refptr<DataSource>& data_source) | 272 const scoped_refptr<DataSource>& data_source, |
| 273 const FFmpegNeedKeyCB& need_key_cb) | |
| 235 : host_(NULL), | 274 : host_(NULL), |
| 236 message_loop_(message_loop), | 275 message_loop_(message_loop), |
| 237 blocking_thread_("FFmpegDemuxer"), | 276 blocking_thread_("FFmpegDemuxer"), |
| 238 pending_read_(false), | 277 pending_read_(false), |
| 239 pending_seek_(false), | 278 pending_seek_(false), |
| 240 data_source_(data_source), | 279 data_source_(data_source), |
| 241 bitrate_(0), | 280 bitrate_(0), |
| 242 start_time_(kNoTimestamp()), | 281 start_time_(kNoTimestamp()), |
| 243 audio_disabled_(false), | 282 audio_disabled_(false), |
| 244 duration_known_(false), | 283 duration_known_(false), |
| 245 url_protocol_(data_source, BindToLoop(message_loop_, base::Bind( | 284 url_protocol_(data_source, BindToLoop(message_loop_, base::Bind( |
| 246 &FFmpegDemuxer::OnDataSourceError, base::Unretained(this)))) { | 285 &FFmpegDemuxer::OnDataSourceError, base::Unretained(this)))), |
| 286 need_key_cb_(need_key_cb) { | |
| 247 DCHECK(message_loop_); | 287 DCHECK(message_loop_); |
| 248 DCHECK(data_source_); | 288 DCHECK(data_source_); |
| 249 } | 289 } |
| 250 | 290 |
| 251 FFmpegDemuxer::~FFmpegDemuxer() {} | 291 FFmpegDemuxer::~FFmpegDemuxer() {} |
| 252 | 292 |
| 253 void FFmpegDemuxer::Stop(const base::Closure& callback) { | 293 void FFmpegDemuxer::Stop(const base::Closure& callback) { |
| 254 DCHECK(message_loop_->BelongsToCurrentThread()); | 294 DCHECK(message_loop_->BelongsToCurrentThread()); |
| 255 url_protocol_.Abort(); | 295 url_protocol_.Abort(); |
| 256 data_source_->Stop(BindToCurrentLoop(base::Bind( | 296 data_source_->Stop(BindToCurrentLoop(base::Bind( |
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 654 StreamVector::iterator iter; | 694 StreamVector::iterator iter; |
| 655 for (iter = streams_.begin(); iter != streams_.end(); ++iter) { | 695 for (iter = streams_.begin(); iter != streams_.end(); ++iter) { |
| 656 if (!*iter || | 696 if (!*iter || |
| 657 (audio_disabled_ && (*iter)->type() == DemuxerStream::AUDIO)) { | 697 (audio_disabled_ && (*iter)->type() == DemuxerStream::AUDIO)) { |
| 658 continue; | 698 continue; |
| 659 } | 699 } |
| 660 (*iter)->SetEndOfStream(); | 700 (*iter)->SetEndOfStream(); |
| 661 } | 701 } |
| 662 } | 702 } |
| 663 | 703 |
| 704 void FFmpegDemuxer::FireNeedKey(const std::string& init_data_type, | |
| 705 const std::string& encryption_key_id) { | |
| 706 int key_id_size = encryption_key_id.size(); | |
| 707 scoped_array<uint8> key_id_local(new uint8[key_id_size]); | |
| 708 memcpy(key_id_local.get(), encryption_key_id.data(), key_id_size); | |
| 709 need_key_cb_.Run(init_data_type, key_id_local.Pass(), key_id_size); | |
| 710 } | |
| 711 | |
| 664 void FFmpegDemuxer::NotifyCapacityAvailable() { | 712 void FFmpegDemuxer::NotifyCapacityAvailable() { |
| 665 DCHECK(message_loop_->BelongsToCurrentThread()); | 713 DCHECK(message_loop_->BelongsToCurrentThread()); |
| 666 ReadFrameIfNeeded(); | 714 ReadFrameIfNeeded(); |
| 667 } | 715 } |
| 668 | 716 |
| 669 void FFmpegDemuxer::NotifyBufferingChanged() { | 717 void FFmpegDemuxer::NotifyBufferingChanged() { |
| 670 DCHECK(message_loop_->BelongsToCurrentThread()); | 718 DCHECK(message_loop_->BelongsToCurrentThread()); |
| 671 Ranges<base::TimeDelta> buffered; | 719 Ranges<base::TimeDelta> buffered; |
| 672 scoped_refptr<FFmpegDemuxerStream> audio = | 720 scoped_refptr<FFmpegDemuxerStream> audio = |
| 673 audio_disabled_ ? NULL : GetFFmpegStream(DemuxerStream::AUDIO); | 721 audio_disabled_ ? NULL : GetFFmpegStream(DemuxerStream::AUDIO); |
| 674 scoped_refptr<FFmpegDemuxerStream> video = | 722 scoped_refptr<FFmpegDemuxerStream> video = |
| 675 GetFFmpegStream(DemuxerStream::VIDEO); | 723 GetFFmpegStream(DemuxerStream::VIDEO); |
| 676 if (audio && video) { | 724 if (audio && video) { |
| 677 buffered = audio->GetBufferedRanges().IntersectionWith( | 725 buffered = audio->GetBufferedRanges().IntersectionWith( |
| 678 video->GetBufferedRanges()); | 726 video->GetBufferedRanges()); |
| 679 } else if (audio) { | 727 } else if (audio) { |
| 680 buffered = audio->GetBufferedRanges(); | 728 buffered = audio->GetBufferedRanges(); |
| 681 } else if (video) { | 729 } else if (video) { |
| 682 buffered = video->GetBufferedRanges(); | 730 buffered = video->GetBufferedRanges(); |
| 683 } | 731 } |
| 684 for (size_t i = 0; i < buffered.size(); ++i) | 732 for (size_t i = 0; i < buffered.size(); ++i) |
| 685 host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i)); | 733 host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i)); |
| 686 } | 734 } |
| 687 | 735 |
| 688 void FFmpegDemuxer::OnDataSourceError() { | 736 void FFmpegDemuxer::OnDataSourceError() { |
| 689 host_->OnDemuxerError(PIPELINE_ERROR_READ); | 737 host_->OnDemuxerError(PIPELINE_ERROR_READ); |
| 690 } | 738 } |
| 691 | 739 |
| 692 } // namespace media | 740 } // namespace media |
| OLD | NEW |