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

Side by Side Diff: media/base/fake_text_track_stream.cc

Issue 363813002: Update to Pipeline Metadata and Decoder Stream for Orientation Data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed unneeded variable Created 6 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/fake_text_track_stream.h" 5 #include "media/base/fake_text_track_stream.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "media/base/decoder_buffer.h" 9 #include "media/base/decoder_buffer.h"
10 #include "media/filters/webvtt_util.h" 10 #include "media/filters/webvtt_util.h"
(...skipping 20 matching lines...) Expand all
31 &FakeTextTrackStream::AbortPendingRead, base::Unretained(this))); 31 &FakeTextTrackStream::AbortPendingRead, base::Unretained(this)));
32 } 32 }
33 } 33 }
34 34
35 DemuxerStream::Type FakeTextTrackStream::type() { 35 DemuxerStream::Type FakeTextTrackStream::type() {
36 return DemuxerStream::TEXT; 36 return DemuxerStream::TEXT;
37 } 37 }
38 38
39 bool FakeTextTrackStream::SupportsConfigChanges() { return false; } 39 bool FakeTextTrackStream::SupportsConfigChanges() { return false; }
40 40
41 VideoRotation FakeTextTrackStream::video_rotation() {
42 return VIDEO_ROTATION_0;
43 }
44
41 void FakeTextTrackStream::SatisfyPendingRead( 45 void FakeTextTrackStream::SatisfyPendingRead(
42 const base::TimeDelta& start, 46 const base::TimeDelta& start,
43 const base::TimeDelta& duration, 47 const base::TimeDelta& duration,
44 const std::string& id, 48 const std::string& id,
45 const std::string& content, 49 const std::string& content,
46 const std::string& settings) { 50 const std::string& settings) {
47 DCHECK(!read_cb_.is_null()); 51 DCHECK(!read_cb_.is_null());
48 52
49 const uint8* const data_buf = reinterpret_cast<const uint8*>(content.data()); 53 const uint8* const data_buf = reinterpret_cast<const uint8*>(content.data());
50 const int data_len = static_cast<int>(content.size()); 54 const int data_len = static_cast<int>(content.size());
(...skipping 25 matching lines...) Expand all
76 base::ResetAndReturn(&read_cb_).Run(kOk, DecoderBuffer::CreateEOSBuffer()); 80 base::ResetAndReturn(&read_cb_).Run(kOk, DecoderBuffer::CreateEOSBuffer());
77 } 81 }
78 82
79 void FakeTextTrackStream::Stop() { 83 void FakeTextTrackStream::Stop() {
80 stopping_ = true; 84 stopping_ = true;
81 if (!read_cb_.is_null()) 85 if (!read_cb_.is_null())
82 AbortPendingRead(); 86 AbortPendingRead();
83 } 87 }
84 88
85 } // namespace media 89 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698