media: Always provide CdmContext when selecting decoder in DecoderStream

media: Always provide CdmContext when selecting decoder in DecoderStream

BUG=679095
Review-Url: https://codereview.chromium.org/2625333003
Cr-Commit-Position: refs/heads/master@{#443794}
Committed: https://chromium.googlesource.com/chromium/src/+/f953aeb70bcde5e3aeda9d9aefeff4ad209e3674

[xhwang, 2017-01-13 01:38:05]

The CQ bit was checked by xhwang@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-13 01:39:03]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-13 03:50:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-13 03:50:20]

Dry run: Try jobs failed on following builders:
  linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[xhwang, 2017-01-13 05:52:10]

The CQ bit was checked by xhwang@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-13 05:52:26]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-13 07:12:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-13 07:12:50]

Dry run: This issue passed the CQ dry run.

[xhwang, 2017-01-13 17:32:03]

xhwang@chromium.org changed reviewers:
+ jrummell@chromium.org

[xhwang, 2017-01-13 17:32:03]

PTAL!

[jrummell, 2017-01-13 21:22:21]

Just curious. Would base::AtomicFlag be better instead of lock + bool? I suspect
it does basically the same thing.

Other than that, lgtm.

[xhwang, 2017-01-14 04:24:58]

The CQ bit was checked by xhwang@chromium.org

[commit-bot: I haz the power, 2017-01-14 04:25:10]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-14 04:29:32]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-14 04:29:33]

Failed to apply patch for media/filters/decoder_stream.cc:
While running git apply --index -p1;
  error: patch failed: media/filters/decoder_stream.cc:429
  error: media/filters/decoder_stream.cc: patch does not apply

Patch:       media/filters/decoder_stream.cc
Index: media/filters/decoder_stream.cc
diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc
index
a177c67935e3f1e62293009bb8be4fcdfc710ea9..6e803547c493b3a51bf75f252dffae8bcba18324
100644
--- a/media/filters/decoder_stream.cc
+++ b/media/filters/decoder_stream.cc
@@ -52,6 +52,7 @@ DecoderStream<StreamType>::DecoderStream(
       media_log_(media_log),
       state_(STATE_UNINITIALIZED),
       stream_(NULL),
+      cdm_context_(nullptr),
       decoder_selector_(new DecoderSelector<StreamType>(task_runner,
                                                         std::move(decoders),
                                                         media_log)),
@@ -105,15 +106,16 @@ void DecoderStream<StreamType>::Initialize(
   DCHECK(init_cb_.is_null());
   DCHECK(!init_cb.is_null());
 
-  statistics_cb_ = statistics_cb;
+  stream_ = stream;
   init_cb_ = init_cb;
+  cdm_context_ = cdm_context;
+  statistics_cb_ = statistics_cb;
   waiting_for_decryption_key_cb_ = waiting_for_decryption_key_cb;
-  stream_ = stream;
 
   traits_.OnStreamReset(stream_);
 
   state_ = STATE_INITIALIZING;
-  SelectDecoder(cdm_context);
+  SelectDecoder();
 }
 
 template <DemuxerStream::Type StreamType>
@@ -246,9 +248,9 @@ base::TimeDelta DecoderStream<StreamType>::AverageDuration()
const {
 }
 
 template <DemuxerStream::Type StreamType>
-void DecoderStream<StreamType>::SelectDecoder(CdmContext* cdm_context) {
+void DecoderStream<StreamType>::SelectDecoder() {
   decoder_selector_->SelectDecoder(
-      &traits_, stream_, cdm_context,
+      &traits_, stream_, cdm_context_,
       base::Bind(&DecoderStream<StreamType>::OnDecoderSelected,
                  weak_factory_.GetWeakPtr()),
       base::Bind(&DecoderStream<StreamType>::OnDecodeOutputReady,
@@ -429,13 +431,7 @@ void DecoderStream<StreamType>::OnDecodeDone(int
buffer_size,
         fallback_weak_factory_.InvalidateWeakPtrs();
 
         state_ = STATE_REINITIALIZING_DECODER;
-        decoder_selector_->SelectDecoder(
-            &traits_, stream_, nullptr,
-            base::Bind(&DecoderStream<StreamType>::OnDecoderSelected,
-                       weak_factory_.GetWeakPtr()),
-            base::Bind(&DecoderStream<StreamType>::OnDecodeOutputReady,
-                       fallback_weak_factory_.GetWeakPtr()),
-            waiting_for_decryption_key_cb_);
+        SelectDecoder();
         return;
       }
       state_ = STATE_ERROR;
@@ -706,9 +702,7 @@ void DecoderStream<StreamType>::OnDecoderReinitialized(bool
success) {
     // Reinitialization failed. Try to fall back to one of the remaining
     // decoders. This will consume at least one decoder so doing it more than
     // once is safe.
-    // For simplicity, don't attempt to fall back to a decrypting decoder.
-    // Calling this with a null CdmContext ensures that one won't be selected.
-    SelectDecoder(nullptr);
+    SelectDecoder();
   } else {
     CompleteDecoderReinitialization(true);
   }

[xhwang, 2017-01-14 05:00:49]

rebase only

[xhwang, 2017-01-14 05:00:54]

The CQ bit was checked by xhwang@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-14 05:01:09]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[xhwang, 2017-01-14 05:02:12]

On 2017/01/13 21:22:21, jrummell wrote:
> Just curious. Would base::AtomicFlag be better instead of lock + bool? I
suspect
> it does basically the same thing.
> 
> Other than that, lgtm.

For the record, I am not super sure how to use base::AtomicFlag. It seems not
widely used and not used at all in media/ code. I'll stick with Lock for now and
we can iterate on this when I learn more about base::AtomicFlag.

[xhwang, 2017-01-14 05:36:39]

The CQ bit was unchecked by xhwang@chromium.org

[xhwang, 2017-01-14 05:36:40]

The CQ bit was checked by xhwang@chromium.org

[xhwang, 2017-01-14 05:36:40]

The patchset sent to the CQ was uploaded after l-g-t-m from
jrummell@chromium.org
Link to the patchset: https://codereview.chromium.org/2625333003/#ps40001
(title: "rebase only")

[commit-bot: I haz the power, 2017-01-14 05:36:45]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-14 06:53:13]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1484372200361790,
"parent_rev": "63ec3598c662f32715148c25faf99771c9d1cb6c", "commit_rev":
"f953aeb70bcde5e3aeda9d9aefeff4ad209e3674"}

[commit-bot: I haz the power, 2017-01-14 06:54:36]

Description was changed from

==========
media: Always provide CdmContext when selecting decoder in DecoderStream

BUG=679095
==========

to

==========
media: Always provide CdmContext when selecting decoder in DecoderStream

BUG=679095

Review-Url: https://codereview.chromium.org/2625333003
Cr-Commit-Position: refs/heads/master@{#443794}
Committed:
https://chromium.googlesource.com/chromium/src/+/f953aeb70bcde5e3aeda9d9aefef...
==========

[commit-bot: I haz the power, 2017-01-14 06:54:37]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/chromium/src/+/f953aeb70bcde5e3aeda9d9aefef...