OLD | NEW |
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 1840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1851 if (action != CA_UPDATE || video->has_codecs()) { | 1851 if (action != CA_UPDATE || video->has_codecs()) { |
1852 if (!media_channel()->SetRecvCodecs(video->codecs())) { | 1852 if (!media_channel()->SetRecvCodecs(video->codecs())) { |
1853 SafeSetError("Failed to set video receive codecs.", error_desc); | 1853 SafeSetError("Failed to set video receive codecs.", error_desc); |
1854 ret = false; | 1854 ret = false; |
1855 } | 1855 } |
1856 } | 1856 } |
1857 | 1857 |
1858 if (action != CA_UPDATE) { | 1858 if (action != CA_UPDATE) { |
1859 VideoOptions video_options; | 1859 VideoOptions video_options; |
1860 media_channel()->GetOptions(&video_options); | 1860 media_channel()->GetOptions(&video_options); |
1861 video_options.buffered_mode_latency.Set(video->buffered_mode_latency()); | |
1862 | |
1863 if (!media_channel()->SetOptions(video_options)) { | 1861 if (!media_channel()->SetOptions(video_options)) { |
1864 // Log an error on failure, but don't abort the call. | 1862 // Log an error on failure, but don't abort the call. |
1865 LOG(LS_ERROR) << "Failed to set video channel options"; | 1863 LOG(LS_ERROR) << "Failed to set video channel options"; |
1866 } | 1864 } |
1867 } | 1865 } |
1868 | 1866 |
1869 // If everything worked, see if we can start receiving. | 1867 // If everything worked, see if we can start receiving. |
1870 if (ret) { | 1868 if (ret) { |
1871 std::vector<VideoCodec>::const_iterator it = video->codecs().begin(); | 1869 std::vector<VideoCodec>::const_iterator it = video->codecs().begin(); |
1872 for (; it != video->codecs().end(); ++it) { | 1870 for (; it != video->codecs().end(); ++it) { |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1904 | 1902 |
1905 ret &= SetBaseRemoteContent_w(content, action, error_desc); | 1903 ret &= SetBaseRemoteContent_w(content, action, error_desc); |
1906 | 1904 |
1907 if (action != CA_UPDATE) { | 1905 if (action != CA_UPDATE) { |
1908 // Tweak our video processing settings, if needed. | 1906 // Tweak our video processing settings, if needed. |
1909 VideoOptions video_options; | 1907 VideoOptions video_options; |
1910 media_channel()->GetOptions(&video_options); | 1908 media_channel()->GetOptions(&video_options); |
1911 if (video->conference_mode()) { | 1909 if (video->conference_mode()) { |
1912 video_options.conference_mode.Set(true); | 1910 video_options.conference_mode.Set(true); |
1913 } | 1911 } |
1914 video_options.buffered_mode_latency.Set(video->buffered_mode_latency()); | |
1915 | 1912 |
1916 if (!media_channel()->SetOptions(video_options)) { | 1913 if (!media_channel()->SetOptions(video_options)) { |
1917 // Log an error on failure, but don't abort the call. | 1914 // Log an error on failure, but don't abort the call. |
1918 LOG(LS_ERROR) << "Failed to set video channel options"; | 1915 LOG(LS_ERROR) << "Failed to set video channel options"; |
1919 } | 1916 } |
1920 } | 1917 } |
1921 | 1918 |
1922 // If everything worked, see if we can start sending. | 1919 // If everything worked, see if we can start sending. |
1923 if (ret) { | 1920 if (ret) { |
1924 ChangeState(); | 1921 ChangeState(); |
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2479 return (data_channel_type_ == DCT_RTP); | 2476 return (data_channel_type_ == DCT_RTP); |
2480 } | 2477 } |
2481 | 2478 |
2482 void DataChannel::OnStreamClosedRemotely(uint32 sid) { | 2479 void DataChannel::OnStreamClosedRemotely(uint32 sid) { |
2483 rtc::TypedMessageData<uint32>* message = | 2480 rtc::TypedMessageData<uint32>* message = |
2484 new rtc::TypedMessageData<uint32>(sid); | 2481 new rtc::TypedMessageData<uint32>(sid); |
2485 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); | 2482 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); |
2486 } | 2483 } |
2487 | 2484 |
2488 } // namespace cricket | 2485 } // namespace cricket |
OLD | NEW |