Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Side by Side Diff: third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: More fixes - things build fine at this point. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 // According to MSE specification 684 // According to MSE specification
685 // (https://w3c.github.io/media-source/#sourcebuffer-init-segment-received) 685 // (https://w3c.github.io/media-source/#sourcebuffer-init-segment-received)
686 // step 3.1: 686 // step 3.1:
687 // > If more than one track for a single type are present (ie 2 audio tracks), 687 // > If more than one track for a single type are present (ie 2 audio tracks),
688 // then the Track IDs match the ones in the first initialization segment. 688 // then the Track IDs match the ones in the first initialization segment.
689 // I.e. we only need to search by TrackID if there is more than one track, 689 // I.e. we only need to search by TrackID if there is more than one track,
690 // otherwise we can assume that the only track of the given type is the same 690 // otherwise we can assume that the only track of the given type is the same
691 // one that we had in previous init segments. 691 // one that we had in previous init segments.
692 if (trackList.length() == 1) 692 if (trackList.length() == 1)
693 return trackList.anonymousIndexedGetter(0); 693 return trackList.anonymousIndexedGetter(0);
694 /* DO NOT SUBMIT - merge conflict marker.
695 * Please spell |getTrackById|, not |GetTrackById| below. */
694 return trackList.getTrackById(id); 696 return trackList.getTrackById(id);
695 } 697 }
696 698
697 const TrackDefault* SourceBuffer::getTrackDefault( 699 const TrackDefault* SourceBuffer::getTrackDefault(
698 const AtomicString& trackType, 700 const AtomicString& trackType,
699 const AtomicString& byteStreamTrackID) const { 701 const AtomicString& byteStreamTrackID) const {
700 // This is a helper for implementation of default track label and default 702 // This is a helper for implementation of default track label and default
701 // track language algorithms. 703 // track language algorithms.
702 // defaultTrackLabel spec: 704 // defaultTrackLabel spec:
703 // https://w3c.github.io/media-source/#sourcebuffer-default-track-label 705 // https://w3c.github.io/media-source/#sourcebuffer-default-track-label
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
1298 visitor->trace(m_asyncEventQueue); 1300 visitor->trace(m_asyncEventQueue);
1299 visitor->trace(m_appendBufferAsyncPartRunner); 1301 visitor->trace(m_appendBufferAsyncPartRunner);
1300 visitor->trace(m_removeAsyncPartRunner); 1302 visitor->trace(m_removeAsyncPartRunner);
1301 visitor->trace(m_audioTracks); 1303 visitor->trace(m_audioTracks);
1302 visitor->trace(m_videoTracks); 1304 visitor->trace(m_videoTracks);
1303 EventTargetWithInlineData::trace(visitor); 1305 EventTargetWithInlineData::trace(visitor);
1304 SuspendableObject::trace(visitor); 1306 SuspendableObject::trace(visitor);
1305 } 1307 }
1306 1308
1307 } // namespace blink 1309 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698