MSE: Replace crossfade splicing overlap trimming.

media/base/test_helpers.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_BASE_TEST_HELPERS_H_
 #define MEDIA_BASE_TEST_HELPERS_H_
 
 #include <stddef.h>
 #include <memory>
 
@@ skipping 176 matching lines @@
 MATCHER_P(InitSegmentMissesExpectedTrack, missing_codec, "") {
   return CONTAINS_STRING(arg, "Initialization segment misses expected " +
                                   std::string(missing_codec) + " track.");
 }
 
 MATCHER_P2(UnexpectedTrack, track_type, id, "") {
   return CONTAINS_STRING(arg, std::string("Got unexpected ") + track_type +
                                   " track track_id=" + id);
 }
 
 MATCHER_P2(GeneratedSplice, duration_microseconds, time_microseconds, "") {

[wolenetz, 2016/10/28 23:08:19]

This was relocated here from tests in the interim. I don't think this is needed,
right?

[chcunningham, 2016/11/02 01:28:42]

Done. Nice catch

   return CONTAINS_STRING(arg, "Generated splice of overlap duration " +
                                   base::IntToString(duration_microseconds) +
                                   "us into new buffer at " +
                                   base::IntToString(time_microseconds) + "us.");
 }
 
 MATCHER_P2(SkippingSpliceAtOrBefore,
            new_microseconds,
            existing_microseconds,
            "") {
@@ skipping 27 matching lines @@
 
 MATCHER(WebMOutOfOrderTimecode, "") {
   return CONTAINS_STRING(
       arg, "Got a block with a timecode before the previous block.");
 }
 
 MATCHER(WebMClusterBeforeFirstInfo, "") {
   return CONTAINS_STRING(arg, "Found Cluster element before Info.");
 }
 
+MATCHER_P3(TrimmedSpliceOverlap,
+           splice_time_us,
+           overlapped_start_us,
+           trim_duration_us,
+           "") {
+  return CONTAINS_STRING(
+      arg, "Audio buffer splice at PTS=" + base::IntToString(splice_time_us) +
+               "us. Trimmed tail of overlapped buffer (PTS=" +
+               base::IntToString(overlapped_start_us) + "us) by " +
+               base::IntToString(trim_duration_us));
+}
+
 }  // namespace media
 
 #endif  // MEDIA_BASE_TEST_HELPERS_H_