Passed is_encrypted parameter to the VDA initialization.

media/video/video_decode_accelerator.h

 // 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.
 
 #ifndef MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
 #define MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 35 matching lines @@
     // Encoded input is unreadable.
     UNREADABLE_INPUT,
     // A failure occurred at the browser layer or one of its dependencies.
     // Examples of such failures include GPU hardware failures, GPU driver
     // failures, GPU library failures, browser programming errors, and so on.
     PLATFORM_FAILURE,
     // Largest used enum. This should be adjusted when new errors are added.
     LARGEST_ERROR_ENUM,
   };
 
+  // Parameters required for the Initialize().

[Pawel Osciak, 2015/12/01 07:16:07]

Please document all parameters.

[Tima Vaisburd, 2015/12/02 02:25:07]

Done.

+  struct MEDIA_EXPORT InitParams {

[xhwang, 2015/12/01 07:15:02]

We use VideoDecoderConfig to initialize VideoDecoders. In theory, we can just
pass that to VDA::Initialize() as well. But in practice it seems the VDA only
needs a subset of VideoDecoderConfig. So this approach is fine. But to make it
more consistent with VideoDecoder, can we do the following in this CL?

s/InitParams/Config
s/params/config

[Pawel Osciak, 2015/12/01 07:16:07]

Perhaps s/InitParam/StreamParameters/ or StreamConfig?

[Tima Vaisburd, 2015/12/02 02:25:07]

Chose StreamParameters to distinguish from VideoDecoderConfig which is now an
argument to one of StreamParameters constructors.

[Tima Vaisburd, 2015/12/02 02:25:07]

Did s/InitParams/StreamParameters/

+    InitParams(VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN,
+               bool is_encrypted = false);

[xhwang, 2015/12/01 07:15:02]

no default parameters per style guide

[Pawel Osciak, 2015/12/01 07:16:07]

Default parameters are generally not allowed by coding style, please see
https://www.chromium.org/developers/coding-style.

[Tima Vaisburd, 2015/12/02 02:25:07]

Done.

[Tima Vaisburd, 2015/12/02 02:25:07]

Done.

+    VideoCodecProfile profile;
+    bool is_encrypted;

[xhwang, 2015/12/01 07:15:02]

You can use Non-Static Class Member Initializers here, e.g. 

bool is_encrypted = false;

[Tima Vaisburd, 2015/12/02 02:25:07]

Since we have several constructors now I thought it would be clearer to have the
initialization solely in constructors.

+  };
+
   // Interface for collaborating with picture interface to provide memory for
   // output picture and blitting them. These callbacks will not be made unless
   // Initialize() has returned successfully.
   // This interface is extended by the various layers that relay messages back
   // to the plugin, through the PPP_VideoDecoder_Dev interface the plugin
   // implements.
   class MEDIA_EXPORT Client {
    public:
     // SetCdm completion callback to indicate whether the CDM is successfully
     // attached to the decoder. The default implementation is a no-op since most
@@ skipping 38 matching lines @@
   // decoder construction.  This call is synchronous and returns true iff
   // initialization is successful.
   //
   // For encrpyted video, the decoder needs a CDM to be able to decode encrypted
   // buffers. SetCdm() should be called after Initialize() to set such a CDM.
   // Client::NotifyCdmAttached() will then be called to indicate whether the CDM
   // is successfully attached to the decoder. Only when a CDM is successfully
   // attached can we start to decode.
   //
   // Parameters:
-  //  |profile| is the video stream's format profile.
+  //  |params| are the initialization parameters.
   //  |client| is the client of this video decoder. Does not take ownership of
   //  |client| which must be valid until Destroy() is called.
-  virtual bool Initialize(VideoCodecProfile profile, Client* client) = 0;
+  virtual bool Initialize(const InitParams& params, Client* client) = 0;

[Pawel Osciak, 2015/12/01 07:16:07]

Would it be possible to just indicate encrypted stream by calling SetCdm()? If
we don't call SetCdm() before Decode(), that would indicate a regular
unencrypted stream...

[Tima Vaisburd, 2015/12/02 02:25:07]

On Android the Initialize() call might come before SetCdm(). For unencrypted
streams I need to configure MediaCodec inside Initialize(), and for the
encrypted streams I need to postpone this configuration till MediaCrypto object
is created, which happens after SetCdm(). In other words, in the Initialize() I
need to know, it seems, whether SetCdm() will be called or not. This is the
reason I pass the is_encrypted flag.

 
   // Sets a CDM to be used by the decoder to decode encrypted buffers.
   // Client::NotifyCdmAttached() will then be called to indicate whether the CDM
   // is successfully attached to the decoder. The default implementation is a
   // no-op since most VDAs don't support encrypted video.
   virtual void SetCdm(int cdm_id);
 
   // Decodes given bitstream buffer that contains at most one frame.  Once
   // decoder is done with processing |bitstream_buffer| it will call
   // NotifyEndOfBitstreamBuffer() with the bitstream buffer id.
@@ skipping 68 matching lines @@
 // Specialize std::default_delete so that scoped_ptr<VideoDecodeAccelerator>
 // uses "Destroy()" instead of trying to use the destructor.
 template <>
 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> {
   void operator()(media::VideoDecodeAccelerator* vda) const;
 };
 
 }  // namespace std
 
 #endif  // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_