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

Issue 1785613011: Revert of Remove candidates when doing continual gathering (Closed)

Created:
4 years, 9 months ago by tommi
Modified:
4 years, 9 months ago
CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com
Base URL:
https://chromium.googlesource.com/external/webrtc@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Revert of Remove candidates when doing continual gathering (patchset #15 id:560001 of https://codereview.webrtc.org/1648813004/ ) Reason for revert: Breaks the build. Suggest we reland with a default implementation of the new method, update Chrome, land a change that changes |{}| -> |= 0;| Here's the error: FAILED: /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/content/renderer/media/webrtc/test_support_content.mock_peer_connection_dependency_factory.o.d -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DCHROMIUM_BUILD -DCR_CLANG_REVISION=262839-1 -DUSE_LIBJPEG_TURBO=1 -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 -DUSE_PROPRIETARY_CODECS -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_TOPCHROME_MD=1 -DDCHECK_ALWAYS_ON=1 -DFIELDTRIAL_TESTING_ENABLED -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PDF=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DUSE_BROWSER_SPELLCHECKER=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DSK_SUPPORT_GPU=1 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DUNIT_TEST -DGTEST_HAS_RTTI=0 -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DFEATURE_ENABLE_SSL -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DOSX -DWEBRTC_MAC -DWEBRTC_POSIX -DXML_STATIC -DWEBRTC_CHROMIUM_BUILD -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_FORTIFY_SOURCE=2 -Igen -I../.. -I../../third_party/khronos -I../../gpu -I../../skia/config -Igen/angle -I../../third_party/WebKit/Source -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf -I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/include/utils/mac -I../../skia/ext -I../../testing/gmock/include -I../../testing/gtest/include -I../../third_party/icu/source/i18n -I../../third_party/icu/source/common -Igen/ui/resources -Igen/protoc_out -I../../third_party/protobuf -I../../third_party/protobuf/src -I../../third_party/WebKit -I../../ipc -I../../third_party/opus/src/include -I../../third_party/WebKit -I../../third_party/npapi -I../../third_party/npapi/bindings -I../../third_party/libpng -I../../third_party/zlib -I../../third_party/libwebp -I../../third_party/ots/include -I../../third_party/qcms/src -I../../third_party/iccjpeg -I../../third_party/libjpeg_turbo -I../../v8/include -I../../third_party/webrtc_overrides -I../../third_party/libjingle/overrides -I../../third_party/libjingle/source -I../../third_party -I../../third_party/expat/files/lib -I../../third_party/libvpx/source/libvpx -isysroot /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -O2 -gdwarf-2 -fvisibility=hidden -Werror -mmacosx-version-min=10.6 -arch x86_64 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-selector-type-mismatch -Wpartial-availability -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-deprecated-register -Wno-inconsistent-missing-override -Wno-shift-negative-value -std=c++11 -stdlib=libc++ -fno-rtti -fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -Xclang -load -Xclang /b/build/slave/Mac_Builder/build/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-templates -Xclang -plugin-arg-find-bad-constructs -Xclang follow-macro-expansion -fcolor-diagnostics -fno-strict-aliasing -c ../../content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc -o obj/content/renderer/media/webrtc/test_support_content.mock_peer_connection_dependency_factory.o ../../content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc:404:14: error: allocating an object of abstract class type 'content::MockSessionDescription' return new MockSessionDescription(type, sdp); ^ ../../third_party/webrtc/api/jsep.h:100:18: note: unimplemented pure virtual method 'RemoveCandidates' in 'MockSessionDescription' virtual size_t RemoveCandidates( ^ 1 error generated. ninja: build stopped: subcommand failed. Original issue's description: > When doing candidate re-gathering in the same generation, Remove the existing local candidate on the same network > and signaling the remote side to remove its remote candidate by setting the candidate priority to 0. > > BUG= > > Committed: https://crrev.com/84430da6817ce69c53bfad088be5c9df8b420f01 > Cr-Commit-Position: refs/heads/master@{#11958} TBR=pthatcher@webrtc.org,deadbeef@webrtc.org,glaznev@webrtc.org,honghaiz@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Committed: https://crrev.com/6f59a4fc4f2eb8fad0fcb759fe254019ee263bf2 Cr-Commit-Position: refs/heads/master@{#11960}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+99 lines, -716 lines) Patch
M webrtc/api/androidtests/src/org/webrtc/PeerConnectionTest.java View 1 chunk +0 lines, -3 lines 0 comments Download
M webrtc/api/java/jni/peerconnection_jni.cc View 4 chunks +2 lines, -73 lines 0 comments Download
M webrtc/api/java/src/org/webrtc/PeerConnection.java View 3 chunks +0 lines, -9 lines 0 comments Download
M webrtc/api/jsep.h View 2 chunks +1 line, -6 lines 0 comments Download
M webrtc/api/jsepicecandidate.h View 1 chunk +0 lines, -3 lines 0 comments Download
M webrtc/api/jsepicecandidate.cc View 1 chunk +0 lines, -13 lines 0 comments Download
M webrtc/api/jsepsessiondescription.h View 3 chunks +0 lines, -4 lines 0 comments Download
M webrtc/api/jsepsessiondescription.cc View 2 chunks +0 lines, -26 lines 0 comments Download
M webrtc/api/jsepsessiondescription_unittest.cc View 3 chunks +3 lines, -12 lines 0 comments Download
M webrtc/api/peerconnection.h View 2 chunks +0 lines, -4 lines 0 comments Download
M webrtc/api/peerconnection.cc View 2 chunks +0 lines, -12 lines 0 comments Download
M webrtc/api/peerconnectioninterface.h View 2 chunks +0 lines, -12 lines 0 comments Download
M webrtc/api/peerconnectionproxy.h View 1 chunk +0 lines, -3 lines 0 comments Download
M webrtc/api/webrtcsdp.h View 3 chunks +1 line, -22 lines 0 comments Download
M webrtc/api/webrtcsdp.cc View 5 chunks +6 lines, -25 lines 0 comments Download
M webrtc/api/webrtcsession.h View 4 chunks +1 line, -11 lines 0 comments Download
M webrtc/api/webrtcsession.cc View 6 chunks +8 lines, -57 lines 0 comments Download
M webrtc/api/webrtcsession_unittest.cc View 7 chunks +11 lines, -71 lines 0 comments Download
M webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCClient.java View 2 chunks +0 lines, -10 lines 0 comments Download
M webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java View 2 chunks +2 lines, -27 lines 0 comments Download
M webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java View 3 chunks +0 lines, -30 lines 0 comments Download
M webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java View 4 chunks +5 lines, -56 lines 0 comments Download
M webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java View 1 chunk +0 lines, -5 lines 0 comments Download
M webrtc/p2p/base/candidate.h View 4 chunks +4 lines, -18 lines 0 comments Download
M webrtc/p2p/base/dtlstransportchannel.h View 2 chunks +0 lines, -5 lines 0 comments Download
M webrtc/p2p/base/dtlstransportchannel.cc View 2 chunks +0 lines, -9 lines 0 comments Download
M webrtc/p2p/base/faketransportcontroller.h View 1 chunk +0 lines, -3 lines 0 comments Download
M webrtc/p2p/base/p2ptransportchannel.h View 1 chunk +0 lines, -1 line 0 comments Download
M webrtc/p2p/base/p2ptransportchannel.cc View 2 chunks +1 line, -18 lines 0 comments Download
M webrtc/p2p/base/p2ptransportchannel_unittest.cc View 8 chunks +39 lines, -68 lines 0 comments Download
M webrtc/p2p/base/transport.h View 2 chunks +5 lines, -7 lines 0 comments Download
M webrtc/p2p/base/transport.cc View 2 chunks +10 lines, -36 lines 0 comments Download
M webrtc/p2p/base/transportchannelimpl.h View 1 chunk +0 lines, -3 lines 0 comments Download
M webrtc/p2p/base/transportcontroller.h View 6 chunks +0 lines, -9 lines 0 comments Download
M webrtc/p2p/base/transportcontroller.cc View 4 chunks +0 lines, -45 lines 0 comments Download

Messages

Total messages: 6 (2 generated)
tommi
Created Revert of Remove candidates when doing continual gathering
4 years, 9 months ago (2016-03-11 22:04:55 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1785613011/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1785613011/1
4 years, 9 months ago (2016-03-11 22:04:59 UTC) #2
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 9 months ago (2016-03-11 22:05:12 UTC) #4
commit-bot: I haz the power
4 years, 9 months ago (2016-03-11 22:05:21 UTC) #6
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/6f59a4fc4f2eb8fad0fcb759fe254019ee263bf2
Cr-Commit-Position: refs/heads/master@{#11960}

Powered by Google App Engine
This is Rietveld 408576698