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

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

Issue 712593003: Move key frame flag from StreamParserBuffer to DecoderBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 // 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 std::vector<uint8> side_data; 56 std::vector<uint8> side_data;
57 MakeSideData(id.begin(), id.end(), 57 MakeSideData(id.begin(), id.end(),
58 settings.begin(), settings.end(), 58 settings.begin(), settings.end(),
59 &side_data); 59 &side_data);
60 60
61 const uint8* const sd_buf = &side_data[0]; 61 const uint8* const sd_buf = &side_data[0];
62 const int sd_len = static_cast<int>(side_data.size()); 62 const int sd_len = static_cast<int>(side_data.size());
63 63
64 scoped_refptr<DecoderBuffer> buffer; 64 scoped_refptr<DecoderBuffer> buffer;
65 buffer = DecoderBuffer::CopyFrom(data_buf, data_len, sd_buf, sd_len); 65
66 // Assume all fake text buffers are keyframes.
67 buffer = DecoderBuffer::CopyFrom(data_buf, data_len, sd_buf, sd_len, true);
66 68
67 buffer->set_timestamp(start); 69 buffer->set_timestamp(start);
68 buffer->set_duration(duration); 70 buffer->set_duration(duration);
69 71
70 base::ResetAndReturn(&read_cb_).Run(kOk, buffer); 72 base::ResetAndReturn(&read_cb_).Run(kOk, buffer);
71 } 73 }
72 74
73 void FakeTextTrackStream::AbortPendingRead() { 75 void FakeTextTrackStream::AbortPendingRead() {
74 DCHECK(!read_cb_.is_null()); 76 DCHECK(!read_cb_.is_null());
75 base::ResetAndReturn(&read_cb_).Run(kAborted, NULL); 77 base::ResetAndReturn(&read_cb_).Run(kAborted, NULL);
76 } 78 }
77 79
78 void FakeTextTrackStream::SendEosNotification() { 80 void FakeTextTrackStream::SendEosNotification() {
79 DCHECK(!read_cb_.is_null()); 81 DCHECK(!read_cb_.is_null());
80 base::ResetAndReturn(&read_cb_).Run(kOk, DecoderBuffer::CreateEOSBuffer()); 82 base::ResetAndReturn(&read_cb_).Run(kOk, DecoderBuffer::CreateEOSBuffer());
81 } 83 }
82 84
83 void FakeTextTrackStream::Stop() { 85 void FakeTextTrackStream::Stop() {
84 stopping_ = true; 86 stopping_ = true;
85 if (!read_cb_.is_null()) 87 if (!read_cb_.is_null())
86 AbortPendingRead(); 88 AbortPendingRead();
87 } 89 }
88 90
89 } // namespace media 91 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698