Pass DecryptConfig parameters over IPC and use it in AVDA.

media/filters/gpu_video_decoder.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/gpu_video_decoder.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 193 matching lines @@
     assigned_picture_buffers_.erase(it->first);
   }
   DestroyPictureBuffers(&assigned_picture_buffers_);
 }
 
 void GpuVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
                              const DecodeCB& decode_cb) {
   DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
   DCHECK(pending_reset_cb_.is_null());
 
+  DVLOG(3) << __FUNCTION__ << " " << buffer->AsHumanReadableString();
+
   DecodeCB bound_decode_cb = BindToCurrentLoop(decode_cb);
 
   if (state_ == kError || !vda_) {
     bound_decode_cb.Run(kDecodeError);
     return;
   }
 
   switch (state_) {
     case kDecoderDrained:
       state_ = kNormal;
@@ skipping 21 matching lines @@
     bound_decode_cb.Run(kDecodeError);
     return;
   }
 
   memcpy(shm_buffer->shm->memory(), buffer->data(), size);
   // AndroidVideoDecodeAccelerator needs the timestamp to output frames in
   // presentation order.
   BitstreamBuffer bitstream_buffer(next_bitstream_buffer_id_,
                                    shm_buffer->shm->handle(), size,
                                    buffer->timestamp());
+
+  if (buffer->decrypt_config())
+    bitstream_buffer.SetDecryptConfig(*buffer->decrypt_config());
+
   // Mask against 30 bits, to avoid (undefined) wraparound on signed integer.
   next_bitstream_buffer_id_ = (next_bitstream_buffer_id_ + 1) & 0x3FFFFFFF;
   DCHECK(!ContainsKey(bitstream_buffers_in_decoder_, bitstream_buffer.id()));
   bitstream_buffers_in_decoder_.insert(std::make_pair(
       bitstream_buffer.id(),
       PendingDecoderBuffer(shm_buffer.release(), buffer, decode_cb)));
   DCHECK_LE(static_cast<int>(bitstream_buffers_in_decoder_.size()),
             kMaxInFlightDecodes);
   RecordBufferData(bitstream_buffer, *buffer.get());
 
@@ skipping 335 matching lines @@
   }
   return false;
 }
 
 void GpuVideoDecoder::DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent()
     const {
   DCHECK(factories_->GetTaskRunner()->BelongsToCurrentThread());
 }
 
 }  // namespace media