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

Side by Side Diff: talk/session/media/mediasession.h

Issue 1416673006: Convert internal representation of Srtp cryptos from string to int. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Add back an old function name to prevent build break in chromium. Created 5 years, 1 month 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 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 const ContentInfo* GetFirstAudioContent(const SessionDescription* sdesc); 540 const ContentInfo* GetFirstAudioContent(const SessionDescription* sdesc);
541 const ContentInfo* GetFirstVideoContent(const SessionDescription* sdesc); 541 const ContentInfo* GetFirstVideoContent(const SessionDescription* sdesc);
542 const ContentInfo* GetFirstDataContent(const SessionDescription* sdesc); 542 const ContentInfo* GetFirstDataContent(const SessionDescription* sdesc);
543 const AudioContentDescription* GetFirstAudioContentDescription( 543 const AudioContentDescription* GetFirstAudioContentDescription(
544 const SessionDescription* sdesc); 544 const SessionDescription* sdesc);
545 const VideoContentDescription* GetFirstVideoContentDescription( 545 const VideoContentDescription* GetFirstVideoContentDescription(
546 const SessionDescription* sdesc); 546 const SessionDescription* sdesc);
547 const DataContentDescription* GetFirstDataContentDescription( 547 const DataContentDescription* GetFirstDataContentDescription(
548 const SessionDescription* sdesc); 548 const SessionDescription* sdesc);
549 549
550 void GetSupportedAudioCryptoSuites(std::vector<std::string>* crypto_suites); 550 void GetSupportedAudioCryptoSuiteNames(std::vector<std::string>* crypto_suites);
551 void GetSupportedVideoCryptoSuites(std::vector<std::string>* crypto_suites); 551 void GetSupportedVideoCryptoSuiteNames(std::vector<std::string>* crypto_suites);
552 void GetSupportedDataCryptoSuites(std::vector<std::string>* crypto_suites); 552 void GetSupportedDataCryptoSuiteNames(std::vector<std::string>* crypto_suites);
553 void GetDefaultSrtpCryptoSuiteNames(std::vector<std::string>* crypto_suites); 553 void GetDefaultSrtpCryptoSuiteNames(std::vector<std::string>* crypto_suites);
554 void GetSupportedAudioCryptoSuites(std::vector<int>* crypto_suites);
555 void GetSupportedVideoCryptoSuites(std::vector<int>* crypto_suites);
556 void GetSupportedDataCryptoSuites(std::vector<int>* crypto_suites);
557 void GetDefaultSrtpCryptoSuites(std::vector<int>* crypto_suites);
pthatcher1 2015/11/11 19:59:40 And should these be changed from crypto_suites to
guoweis_webrtc 2015/11/17 01:21:16 Done.
558
554 } // namespace cricket 559 } // namespace cricket
555 560
556 #endif // TALK_SESSION_MEDIA_MEDIASESSION_H_ 561 #endif // TALK_SESSION_MEDIA_MEDIASESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698