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

Side by Side Diff: content/renderer/media/android/renderer_media_session_manager.cc

Issue 2015433003: Implement MediaMetadata artwork in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed nits Created 4 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "content/renderer/media/android/renderer_media_session_manager.h" 5 #include "content/renderer/media/android/renderer_media_session_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/common/media/media_metadata_sanitizer.h"
8 #include "content/common/media/media_session_messages_android.h" 9 #include "content/common/media/media_session_messages_android.h"
9 #include "content/public/common/media_metadata.h" 10 #include "content/public/common/media_metadata.h"
10 #include "content/public/renderer/render_thread.h" 11 #include "content/public/renderer/render_thread.h"
11 #include "content/renderer/media/android/webmediasession_android.h" 12 #include "content/renderer/media/android/webmediasession_android.h"
12 13
13 namespace content { 14 namespace content {
14 15
15 RendererMediaSessionManager::RendererMediaSessionManager( 16 RendererMediaSessionManager::RendererMediaSessionManager(
16 RenderFrame* render_frame) 17 RenderFrame* render_frame)
17 : RenderFrameObserver(render_frame), 18 : RenderFrameObserver(render_frame),
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 int session_id, 59 int session_id,
59 std::unique_ptr<blink::WebMediaSessionDeactivateCallback> callback) { 60 std::unique_ptr<blink::WebMediaSessionDeactivateCallback> callback) {
60 int request_id = pending_deactivation_requests_.Add(callback.release()); 61 int request_id = pending_deactivation_requests_.Add(callback.release());
61 Send( 62 Send(
62 new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id)); 63 new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id));
63 } 64 }
64 65
65 void RendererMediaSessionManager::SetMetadata( 66 void RendererMediaSessionManager::SetMetadata(
66 int session_id, 67 int session_id,
67 const MediaMetadata& metadata) { 68 const MediaMetadata& metadata) {
68 // Apply some sanity checks on the MediaMetadata before sending over IPC.
69 MediaMetadata ipc_metadata;
70 ipc_metadata.title =
71 metadata.title.substr(0, MediaMetadata::kMaxIPCStringLength);
72 ipc_metadata.artist =
73 metadata.artist.substr(0, MediaMetadata::kMaxIPCStringLength);
74 ipc_metadata.album =
75 metadata.album.substr(0, MediaMetadata::kMaxIPCStringLength);
76 69
77 Send(new MediaSessionHostMsg_SetMetadata(routing_id(), 70 // TODO(zqzhang): print a console warning when metadata is dirty. See
78 session_id, 71 // https://crbug.com/625244.
79 ipc_metadata)); 72 Send(new MediaSessionHostMsg_SetMetadata(
73 routing_id(), session_id,
74 MediaMetadataSanitizer::CheckSanity(metadata) ?
75 metadata : MediaMetadataSanitizer::Sanitize(metadata)));
80 } 76 }
81 77
82 void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) { 78 void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) {
83 DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id; 79 DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id;
84 blink::WebMediaSessionActivateCallback* callback = 80 blink::WebMediaSessionActivateCallback* callback =
85 pending_activation_requests_.Lookup(request_id); 81 pending_activation_requests_.Lookup(request_id);
86 if (success) { 82 if (success) {
87 callback->onSuccess(); 83 callback->onSuccess();
88 } else { 84 } else {
89 callback->onError( 85 callback->onError(
90 blink::WebMediaSessionError(blink::WebMediaSessionError::Activate)); 86 blink::WebMediaSessionError(blink::WebMediaSessionError::Activate));
91 } 87 }
92 pending_activation_requests_.Remove(request_id); 88 pending_activation_requests_.Remove(request_id);
93 } 89 }
94 90
95 void RendererMediaSessionManager::OnDidDeactivate(int request_id) { 91 void RendererMediaSessionManager::OnDidDeactivate(int request_id) {
96 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id; 92 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id;
97 pending_deactivation_requests_.Lookup(request_id)->onSuccess(); 93 pending_deactivation_requests_.Lookup(request_id)->onSuccess();
98 pending_deactivation_requests_.Remove(request_id); 94 pending_deactivation_requests_.Remove(request_id);
99 } 95 }
100 96
101 } // namespace content 97 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/media_metadata.cc ('k') | content/renderer/media/android/webmediasession_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698