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

Side by Side Diff: content/common/media/media_player_messages_android.h

Issue 136343002: Remove Chrome for TV code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 6 years, 11 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // IPC messages for android media player. 5 // IPC messages for android media player.
6 // Multiply-included message file, hence no include guard. 6 // Multiply-included message file, hence no include guard.
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 24 matching lines...) Expand all
35 IPC_STRUCT_TRAITS_MEMBER(audio_sampling_rate) 35 IPC_STRUCT_TRAITS_MEMBER(audio_sampling_rate)
36 IPC_STRUCT_TRAITS_MEMBER(is_audio_encrypted) 36 IPC_STRUCT_TRAITS_MEMBER(is_audio_encrypted)
37 IPC_STRUCT_TRAITS_MEMBER(audio_extra_data) 37 IPC_STRUCT_TRAITS_MEMBER(audio_extra_data)
38 38
39 IPC_STRUCT_TRAITS_MEMBER(video_codec) 39 IPC_STRUCT_TRAITS_MEMBER(video_codec)
40 IPC_STRUCT_TRAITS_MEMBER(video_size) 40 IPC_STRUCT_TRAITS_MEMBER(video_size)
41 IPC_STRUCT_TRAITS_MEMBER(is_video_encrypted) 41 IPC_STRUCT_TRAITS_MEMBER(is_video_encrypted)
42 IPC_STRUCT_TRAITS_MEMBER(video_extra_data) 42 IPC_STRUCT_TRAITS_MEMBER(video_extra_data)
43 43
44 IPC_STRUCT_TRAITS_MEMBER(duration_ms) 44 IPC_STRUCT_TRAITS_MEMBER(duration_ms)
45 #if defined(GOOGLE_TV)
46 IPC_STRUCT_TRAITS_MEMBER(key_system)
47 #endif // defined(GOOGLE_TV)
48 IPC_STRUCT_TRAITS_END() 45 IPC_STRUCT_TRAITS_END()
49 46
50 IPC_STRUCT_TRAITS_BEGIN(media::DemuxerData) 47 IPC_STRUCT_TRAITS_BEGIN(media::DemuxerData)
51 IPC_STRUCT_TRAITS_MEMBER(type) 48 IPC_STRUCT_TRAITS_MEMBER(type)
52 IPC_STRUCT_TRAITS_MEMBER(access_units) 49 IPC_STRUCT_TRAITS_MEMBER(access_units)
53 IPC_STRUCT_TRAITS_END() 50 IPC_STRUCT_TRAITS_END()
54 51
55 IPC_STRUCT_TRAITS_BEGIN(media::AccessUnit) 52 IPC_STRUCT_TRAITS_BEGIN(media::AccessUnit)
56 IPC_STRUCT_TRAITS_MEMBER(status) 53 IPC_STRUCT_TRAITS_MEMBER(status)
57 IPC_STRUCT_TRAITS_MEMBER(end_of_stream) 54 IPC_STRUCT_TRAITS_MEMBER(end_of_stream)
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 320
324 IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionClosed, 321 IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionClosed,
325 int /* media_keys_id */, 322 int /* media_keys_id */,
326 uint32_t /* session_id */) 323 uint32_t /* session_id */)
327 324
328 IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionError, 325 IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionError,
329 int /* media_keys_id */, 326 int /* media_keys_id */,
330 uint32_t /* session_id */, 327 uint32_t /* session_id */,
331 media::MediaKeys::KeyError /* error_code */, 328 media::MediaKeys::KeyError /* error_code */,
332 int /* system_code */) 329 int /* system_code */)
OLDNEW
« no previous file with comments | « content/child/runtime_features.cc ('k') | content/common/media/media_player_messages_enums_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698