Motown: Various fixes related to video playback support

services/media/factory_service/media_timeline_controller_impl.cc

 // Copyright 2016 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 "base/logging.h"
 #include "mojo/services/media/common/cpp/timeline.h"
 #include "services/media/factory_service/media_timeline_controller_impl.h"
 #include "services/media/framework_mojo/mojo_type_conversions.h"
 
 namespace mojo {
@@ skipping 104 matching lines @@
       pending_transition_.lock();
   if (pending_transition) {
     // A transition is pending - cancel it.
     pending_transition->Cancel();
   }
 
   // These will be recorded as part of the new TimelineFunction.
   int64_t new_reference_time;
   int64_t new_subject_time;
 
+  if (subject_time != kUnspecifiedTime) {
+    new_subject_time = subject_time;
+    end_of_stream_ = false;
+  }
+
   if (effective_subject_time != kUnspecifiedTime) {
     // Infer new_reference_time from effective_subject_time.
     new_reference_time =
         current_timeline_function_.ApplyInverse(effective_subject_time);
 
     // Figure out what the subject_time will be after this transition.
     if (subject_time == kUnspecifiedTime) {
       new_subject_time = effective_subject_time;
-    } else {
-      new_subject_time = subject_time;
     }
   } else {
     if (effective_reference_time == kUnspecifiedTime) {
       // Neither effective time was specified. Effective time is now.
       effective_reference_time = Timeline::local_now() + kDefaultLeadTime;
     }
 
     // new_reference_time is just effective_reference_time.
     new_reference_time = effective_reference_time;
 
     // Figure out what the subject_time will be after this transition.
     if (subject_time == kUnspecifiedTime) {
       new_subject_time = current_timeline_function_(effective_reference_time);
-    } else {
-      new_subject_time = subject_time;
     }
   }
 
   if (pending_transition) {
     // This transition cancels a previous one. Use effective_reference_time
     // rather than effective_subject_time, because we can't be sure what
     // effective_subject_time will mean to the sites.
     effective_reference_time = new_reference_time;
     effective_subject_time = kUnspecifiedTime;
 
     // We don't want the sites to have to infer the subject_time, because we
     // can't be sure what subject_time a site will infer.
     subject_time = new_subject_time;
   }
 
   // Recording the new pending transition.
   std::shared_ptr<TimelineTransition> transition =
       std::shared_ptr<TimelineTransition>(
           new TimelineTransition(new_reference_time, new_subject_time,
                                  reference_delta, subject_delta, callback));
 
   pending_transition_ = transition;
 
   // Initiate the transition for each site.
   for (const std::unique_ptr<SiteState>& site_state : site_states_) {
+    site_state->end_of_stream_ = false;
     site_state->consumer_->SetTimelineTransform(
         subject_time, reference_delta, subject_delta, effective_reference_time,
         effective_subject_time, transition->NewCallback());
   }
 
   // If and when this transition is complete, adopt the new TimelineFunction
   // and tell any status subscribers.
   transition->WhenCompleted([this, transition]() {
     current_timeline_function_ = transition->new_timeline_function();
     status_publisher_.SendUpdates();
@@ skipping 66 matching lines @@
       completed_callback_.Run();
       completed_callback_.reset();
     }
   });
 }
 
 MediaTimelineControllerImpl::TimelineTransition::~TimelineTransition() {}
 
 }  // namespace media
 }  // namespace mojo