OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chromecast/browser/media/media_pipeline_host.h" | 5 #include "chromecast/browser/media/media_pipeline_host.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 | 43 |
44 MediaPipelineHost::MediaPipelineHost() { | 44 MediaPipelineHost::MediaPipelineHost() { |
45 thread_checker_.DetachFromThread(); | 45 thread_checker_.DetachFromThread(); |
46 } | 46 } |
47 | 47 |
48 MediaPipelineHost::~MediaPipelineHost() { | 48 MediaPipelineHost::~MediaPipelineHost() { |
49 DCHECK(thread_checker_.CalledOnValidThread()); | 49 DCHECK(thread_checker_.CalledOnValidThread()); |
50 | 50 |
51 for (MediaTrackMap::iterator it = media_track_map_.begin(); | 51 for (MediaTrackMap::iterator it = media_track_map_.begin(); |
52 it != media_track_map_.end(); ++it) { | 52 it != media_track_map_.end(); ++it) { |
53 scoped_ptr<MediaTrackHost> media_track(it->second); | 53 std::unique_ptr<MediaTrackHost> media_track(it->second); |
54 } | 54 } |
55 media_track_map_.clear(); | 55 media_track_map_.clear(); |
56 } | 56 } |
57 | 57 |
58 void MediaPipelineHost::Initialize( | 58 void MediaPipelineHost::Initialize( |
59 LoadType load_type, | 59 LoadType load_type, |
60 const MediaPipelineClient& client, | 60 const MediaPipelineClient& client, |
61 const CreateMediaPipelineBackendCB& create_backend_cb) { | 61 const CreateMediaPipelineBackendCB& create_backend_cb) { |
62 DCHECK(thread_checker_.CalledOnValidThread()); | 62 DCHECK(thread_checker_.CalledOnValidThread()); |
63 media_pipeline_.reset(new MediaPipelineImpl()); | 63 media_pipeline_.reset(new MediaPipelineImpl()); |
64 task_runner_.reset(new TaskRunnerImpl()); | 64 task_runner_.reset(new TaskRunnerImpl()); |
65 MediaPipelineDeviceParams::MediaSyncType sync_type = | 65 MediaPipelineDeviceParams::MediaSyncType sync_type = |
66 (load_type == kLoadTypeMediaStream) | 66 (load_type == kLoadTypeMediaStream) |
67 ? MediaPipelineDeviceParams::kModeIgnorePts | 67 ? MediaPipelineDeviceParams::kModeIgnorePts |
68 : MediaPipelineDeviceParams::kModeSyncPts; | 68 : MediaPipelineDeviceParams::kModeSyncPts; |
69 MediaPipelineDeviceParams default_parameters(sync_type, task_runner_.get()); | 69 MediaPipelineDeviceParams default_parameters(sync_type, task_runner_.get()); |
70 | 70 |
71 media_pipeline_->SetClient(client); | 71 media_pipeline_->SetClient(client); |
72 media_pipeline_->Initialize(load_type, | 72 media_pipeline_->Initialize(load_type, |
73 create_backend_cb.Run(default_parameters)); | 73 create_backend_cb.Run(default_parameters)); |
74 } | 74 } |
75 | 75 |
76 void MediaPipelineHost::SetAvPipe( | 76 void MediaPipelineHost::SetAvPipe( |
77 TrackId track_id, | 77 TrackId track_id, |
78 scoped_ptr<base::SharedMemory> shared_mem, | 78 std::unique_ptr<base::SharedMemory> shared_mem, |
79 const base::Closure& pipe_read_activity_cb, | 79 const base::Closure& pipe_read_activity_cb, |
80 const base::Closure& av_pipe_set_cb) { | 80 const base::Closure& av_pipe_set_cb) { |
81 DCHECK(thread_checker_.CalledOnValidThread()); | 81 DCHECK(thread_checker_.CalledOnValidThread()); |
82 CHECK(track_id == kAudioTrackId || track_id == kVideoTrackId); | 82 CHECK(track_id == kAudioTrackId || track_id == kVideoTrackId); |
83 | 83 |
84 size_t shared_mem_size = shared_mem->requested_size(); | 84 size_t shared_mem_size = shared_mem->requested_size(); |
85 scoped_ptr<MediaMemoryChunk> shared_memory_chunk( | 85 std::unique_ptr<MediaMemoryChunk> shared_memory_chunk( |
86 new SharedMemoryChunk(std::move(shared_mem), shared_mem_size)); | 86 new SharedMemoryChunk(std::move(shared_mem), shared_mem_size)); |
87 scoped_ptr<MediaMessageFifo> media_message_fifo( | 87 std::unique_ptr<MediaMessageFifo> media_message_fifo( |
88 new MediaMessageFifo(std::move(shared_memory_chunk), shared_mem_size)); | 88 new MediaMessageFifo(std::move(shared_memory_chunk), shared_mem_size)); |
89 media_message_fifo->ObserveReadActivity(pipe_read_activity_cb); | 89 media_message_fifo->ObserveReadActivity(pipe_read_activity_cb); |
90 scoped_ptr<CodedFrameProviderHost> frame_provider_host( | 90 std::unique_ptr<CodedFrameProviderHost> frame_provider_host( |
91 new CodedFrameProviderHost(std::move(media_message_fifo))); | 91 new CodedFrameProviderHost(std::move(media_message_fifo))); |
92 | 92 |
93 MediaTrackMap::iterator it = media_track_map_.find(track_id); | 93 MediaTrackMap::iterator it = media_track_map_.find(track_id); |
94 MediaTrackHost* media_track_host; | 94 MediaTrackHost* media_track_host; |
95 if (it == media_track_map_.end()) { | 95 if (it == media_track_map_.end()) { |
96 media_track_host = new MediaTrackHost(); | 96 media_track_host = new MediaTrackHost(); |
97 media_track_map_.insert( | 97 media_track_map_.insert( |
98 std::pair<TrackId, MediaTrackHost*>(track_id, media_track_host)); | 98 std::pair<TrackId, MediaTrackHost*>(track_id, media_track_host)); |
99 } else { | 99 } else { |
100 media_track_host = it->second; | 100 media_track_host = it->second; |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 if (it == media_track_map_.end()) | 170 if (it == media_track_map_.end()) |
171 return; | 171 return; |
172 | 172 |
173 MediaTrackHost* media_track_host = it->second; | 173 MediaTrackHost* media_track_host = it->second; |
174 if (!media_track_host->pipe_write_cb.is_null()) | 174 if (!media_track_host->pipe_write_cb.is_null()) |
175 media_track_host->pipe_write_cb.Run(); | 175 media_track_host->pipe_write_cb.Run(); |
176 } | 176 } |
177 | 177 |
178 } // namespace media | 178 } // namespace media |
179 } // namespace chromecast | 179 } // namespace chromecast |
OLD | NEW |