Change NeedKeyCB to use std::vector.

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/ffmpeg_demuxer.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/base64.h"
@@ skipping 269 matching lines @@
 
   return ConvertFromTimeBase(time_base, timestamp);
 }
 
 //
 // FFmpegDemuxer
 //
 FFmpegDemuxer::FFmpegDemuxer(
     const scoped_refptr<base::MessageLoopProxy>& message_loop,
     DataSource* data_source,
-    const FFmpegNeedKeyCB& need_key_cb,
+    const NeedKeyCB& need_key_cb,
     const scoped_refptr<MediaLog>& media_log)
     : host_(NULL),
       message_loop_(message_loop),
       weak_factory_(this),
       blocking_thread_("FFmpegDemuxer"),
       pending_read_(false),
       pending_seek_(false),
       data_source_(data_source),
       media_log_(media_log),
       bitrate_(0),
@@ skipping 504 matching lines @@
     if (!*iter ||
         (audio_disabled_ && (*iter)->type() == DemuxerStream::AUDIO)) {
       continue;
     }
     (*iter)->SetEndOfStream();
   }
 }
 
 void FFmpegDemuxer::FireNeedKey(const std::string& init_data_type,
                                 const std::string& encryption_key_id) {
-  int key_id_size = encryption_key_id.size();
-  scoped_ptr<uint8[]> key_id_local(new uint8[key_id_size]);
-  memcpy(key_id_local.get(), encryption_key_id.data(), key_id_size);
-  need_key_cb_.Run(init_data_type, key_id_local.Pass(), key_id_size);
+  size_t key_id_size = encryption_key_id.size();
+  std::vector<uint8> key_id_local(key_id_size);
+  if (key_id_size)
+    memcpy(&key_id_local[0], encryption_key_id.data(), key_id_size);

[xhwang, 2013/08/23 17:24:37]

How about:

std::vector<uint8> key_id_local(encryption_key_id.begin(),
encryption_key_id.end());

It's probably not as efficient as mempcy, but seems cleaner, and key_id is
usually short anyways.

[acolwell GONE FROM CHROMIUM, 2013/08/23 19:55:28]

Done. I didn't realize this would work. :)

+  need_key_cb_.Run(init_data_type, key_id_local);
 }
 
 void FFmpegDemuxer::NotifyCapacityAvailable() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   ReadFrameIfNeeded();
 }
 
 void FFmpegDemuxer::NotifyBufferingChanged() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   Ranges<base::TimeDelta> buffered;
@@ skipping 10 matching lines @@
   }
   for (size_t i = 0; i < buffered.size(); ++i)
     host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i));
 }
 
 void FFmpegDemuxer::OnDataSourceError() {
   host_->OnDemuxerError(PIPELINE_ERROR_READ);
 }
 
 }  // namespace media