OLD | NEW |
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 "webkit/renderer/media/webmediasourceclient_impl.h" | 5 #include "content/renderer/media/webmediasourceclient_impl.h" |
6 | 6 |
7 #include "base/guid.h" | 7 #include "base/guid.h" |
| 8 #include "content/renderer/media/websourcebuffer_impl.h" |
8 #include "media/filters/chunk_demuxer.h" | 9 #include "media/filters/chunk_demuxer.h" |
9 #include "third_party/WebKit/public/platform/WebCString.h" | 10 #include "third_party/WebKit/public/platform/WebCString.h" |
10 #include "third_party/WebKit/public/platform/WebString.h" | 11 #include "third_party/WebKit/public/platform/WebString.h" |
11 #include "webkit/renderer/media/websourcebuffer_impl.h" | |
12 | 12 |
13 using ::WebKit::WebString; | 13 using ::WebKit::WebString; |
14 using ::WebKit::WebMediaSourceClient; | 14 using ::WebKit::WebMediaSourceClient; |
15 | 15 |
16 namespace webkit_media { | 16 namespace content { |
17 | 17 |
18 #define COMPILE_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \ | 18 #define COMPILE_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \ |
19 COMPILE_ASSERT(static_cast<int>(WebMediaSourceClient::webkit_name) == \ | 19 COMPILE_ASSERT(static_cast<int>(WebMediaSourceClient::webkit_name) == \ |
20 static_cast<int>(media::ChunkDemuxer::chromium_name), \ | 20 static_cast<int>(media::ChunkDemuxer::chromium_name), \ |
21 mismatching_status_enums) | 21 mismatching_status_enums) |
22 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusOk, kOk); | 22 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusOk, kOk); |
23 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusNotSupported, kNotSupported); | 23 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusNotSupported, kNotSupported); |
24 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusReachedIdLimit, kReachedIdLimit); | 24 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusReachedIdLimit, kReachedIdLimit); |
25 #undef COMPILE_ASSERT_MATCHING_STATUS_ENUM | 25 #undef COMPILE_ASSERT_MATCHING_STATUS_ENUM |
26 | 26 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 case WebMediaSourceClient::EndOfStreamStatusDecodeError: | 73 case WebMediaSourceClient::EndOfStreamStatusDecodeError: |
74 pipeline_status = media::PIPELINE_ERROR_DECODE; | 74 pipeline_status = media::PIPELINE_ERROR_DECODE; |
75 break; | 75 break; |
76 default: | 76 default: |
77 NOTIMPLEMENTED(); | 77 NOTIMPLEMENTED(); |
78 } | 78 } |
79 | 79 |
80 demuxer_->EndOfStream(pipeline_status); | 80 demuxer_->EndOfStream(pipeline_status); |
81 } | 81 } |
82 | 82 |
83 } // namespace webkit_media | 83 } // namespace content |
OLD | NEW |