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

Side by Side Diff: third_party/WebKit/public/platform/WebMediaStreamTrack.h

Issue 2623263003: Update MediaStreamTrack content-hint values. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 public: 57 public:
58 TrackData() {} 58 TrackData() {}
59 virtual ~TrackData() {} 59 virtual ~TrackData() {}
60 virtual void getSettings(Settings&) = 0; 60 virtual void getSettings(Settings&) = 0;
61 }; 61 };
62 62
63 enum class ContentHintType { 63 enum class ContentHintType {
64 None, 64 None,
65 AudioSpeech, 65 AudioSpeech,
66 AudioMusic, 66 AudioMusic,
67 VideoFluid, 67 VideoMotion,
68 VideoDetailed 68 VideoDetail
69 }; 69 };
70 70
71 WebMediaStreamTrack() {} 71 WebMediaStreamTrack() {}
72 WebMediaStreamTrack(const WebMediaStreamTrack& other) { assign(other); } 72 WebMediaStreamTrack(const WebMediaStreamTrack& other) { assign(other); }
73 ~WebMediaStreamTrack() { reset(); } 73 ~WebMediaStreamTrack() { reset(); }
74 74
75 WebMediaStreamTrack& operator=(const WebMediaStreamTrack& other) { 75 WebMediaStreamTrack& operator=(const WebMediaStreamTrack& other) {
76 assign(other); 76 assign(other);
77 return *this; 77 return *this;
78 } 78 }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 BLINK_PLATFORM_EXPORT operator MediaStreamComponent*() const; 111 BLINK_PLATFORM_EXPORT operator MediaStreamComponent*() const;
112 #endif 112 #endif
113 113
114 private: 114 private:
115 WebPrivatePtr<MediaStreamComponent> m_private; 115 WebPrivatePtr<MediaStreamComponent> m_private;
116 }; 116 };
117 117
118 } // namespace blink 118 } // namespace blink
119 119
120 #endif // WebMediaStreamTrack_h 120 #endif // WebMediaStreamTrack_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698