Landings for Stack Containing D224712

Failed to land

Landing requested on , by pehrsons@gmail.com.

Revisions: D224697 diff 930760 D224698 diff 930761 D224699 diff 930762 D224700 diff 930764 D224701 diff 930765 D224702 diff 930766 D224703 diff 930767 D224704 diff 930768 D224705 diff 930769 D224706 diff 930770 D224707 diff 930771 D224708 diff 930772 D224709 diff 930773 D224710 diff 930774 D224711 diff 930775 D224712 diff 930776

While applying revision D224701 to mozilla-central, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from mozilla-central and re-submitting.)

  • toolkit/content/aboutLogging.js @ eb589ffb8777f5f75891db17af2ab7ff6223c5b0
  • --- aboutLogging.js
    +++ aboutLogging.js
    ...
    
    --- aboutLogging.js
    +++ aboutLogging.js
    @@ -121,11 +121,11 @@
         },
         profilerPreset: "media",
       },
       webrtc: {
         modules:
    -      "jsep:5,sdp:5,signaling:5,mtransport:5,nicer:5,RTCRtpReceiver:5,RTCRtpSender:5,RTCDMTFSender:5,VideoFrameConverter:5,WebrtcTCPSocket:5,CamerasChild:5,CamerasParent:5,VideoEngine:5,ShmemPool:5,TabShare:5,MediaChild:5,MediaParent:5,MediaManager:5,MediaTrackGraph:5,cubeb:5,MediaStream:5,MediaStreamTrack:5,DriftCompensator:5,ForwardInputTrack:5,MediaRecorder:5,MediaEncoder:5,TrackEncoder:5,VP8TrackEncoder:5,Muxer:5,GetUserMedia:5,MediaPipeline:5,WebAudioAPI:5,webrtc_trace:5,RTCRtpTransceiver:5,ForwardedInputTrack:5,HTMLMediaElement:5,HTMLMediaElementEvents:5",
    +      "jsep:5,sdp:5,signaling:5,mtransport:5,nicer:5,RTCRtpReceiver:5,RTCRtpSender:5,RTCDMTFSender:5,WebrtcTCPSocket:5,CamerasChild:5,CamerasParent:5,VideoEngine:5,ShmemPool:5,TabShare:5,MediaChild:5,MediaParent:5,MediaManager:5,MediaTrackGraph:5,cubeb:5,MediaStream:5,MediaStreamTrack:5,DriftCompensator:5,ForwardInputTrack:5,MediaRecorder:5,MediaEncoder:5,TrackEncoder:5,VP8TrackEncoder:5,Muxer:5,GetUserMedia:5,MediaPipeline:5,WebAudioAPI:5,webrtc_trace:5,RTCRtpTransceiver:5,ForwardedInputTrack:5,HTMLMediaElement:5,HTMLMediaElementEvents:5",
         l10nIds: {
           label: "about-logging-preset-webrtc-label",
           description: "about-logging-preset-webrtc-description",
         },
         profilerPreset: "media",
    
  • docs/contributing/debugging/debugging_webrtc_calls.rst @ eb589ffb8777f5f75891db17af2ab7ff6223c5b0
  • --- debugging_webrtc_calls.rst
    +++ debugging_webrtc_calls.rst
    ...
    
    --- debugging_webrtc_calls.rst
    +++ debugging_webrtc_calls.rst
    @@ -355,11 +355,11 @@
     
     Alternatively one can set the following environment variable:
     
     .. code:: sh
     
    -   MOZ_LOG="jsep:5,sdp:5,signaling:5,mtransport:5,nicer:5,RTCRtpReceiver:5,RTCRtpSender:5,RTCDMTFSender:5,VideoFrameConverter:5,WebrtcTCPSocket:5,CamerasChild:5,CamerasParent:5,VideoEngine:5,ShmemPool:5,TabShare:5,MediaChild:5,MediaParent:5,MediaManager:5,MediaTrackGraph:5,cubeb:5,MediaStream:5,MediaStreamTrack:5,DriftCompensator:5,ForwardInputTrack:5,MediaRecorder:5,MediaEncoder:5,TrackEncoder:5,VP8TrackEncoder:5,Muxer:5,GetUserMedia:5,MediaPipeline:5,PeerConnectionImpl:5,WebAudioAPI:5,webrtc_trace:5,RTCRtpTransceiver:5,ForwardedInputTrack:5,HTMLMediaElement:5,HTMLMediaElementEvents:5"
    +   MOZ_LOG="jsep:5,sdp:5,signaling:5,mtransport:5,nicer:5,RTCRtpReceiver:5,RTCRtpSender:5,RTCDMTFSender:5,WebrtcTCPSocket:5,CamerasChild:5,CamerasParent:5,VideoEngine:5,ShmemPool:5,TabShare:5,MediaChild:5,MediaParent:5,MediaManager:5,MediaTrackGraph:5,cubeb:5,MediaStream:5,MediaStreamTrack:5,DriftCompensator:5,ForwardInputTrack:5,MediaRecorder:5,MediaEncoder:5,TrackEncoder:5,VP8TrackEncoder:5,Muxer:5,GetUserMedia:5,MediaPipeline:5,PeerConnectionImpl:5,WebAudioAPI:5,webrtc_trace:5,RTCRtpTransceiver:5,ForwardedInputTrack:5,HTMLMediaElement:5,HTMLMediaElementEvents:5"
     
     .. _standard-logging-modules:
     
     Standard Logging Modules
     ~~~~~~~~~~~~~~~~~~~~~~~~
    
Raw error output:
Problem while applying patch in revision 224701:

hg error in cmd: hg import --no-commit -s 95 /tmp/tmp92rjuqvj: applying /tmp/tmp92rjuqvj

patching file toolkit/content/aboutLogging.js
Hunk #1 FAILED at 120
1 out of 1 hunks FAILED -- saving rejects to file toolkit/content/aboutLogging.js.rej
patching file docs/contributing/debugging/debugging_webrtc_calls.rst
Hunk #1 FAILED at 354
1 out of 2 hunks FAILED -- saving rejects to file docs/contributing/debugging/debugging_webrtc_calls.rst.rej
abort: patch failed to apply

Stack containing revision D224712

Land Bug Status Revision Reviewers
1834233
Blocked
Repository is not supported by Lando.
Closed
D224712: Bug 1834233 - Allow 1us rounding error and multiple duplication periods in VideoFrameConverterTest.Duplication. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1833550
Blocked
Repository is not supported by Lando.
Closed
D224711: Bug 1833550 - Allow 1us rounding error and improve determinism in VideoFrameConverterTest.IgnoreOldFrames. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1833550
Blocked
Repository is not supported by Lando.
Closed
D224710: Bug 1833550 - Allow 1us rounding error and multiple duplication periods in VideoFrameConverterTest.SameFrameTimerRacingWithPacing. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1828980
Blocked
Repository is not supported by Lando.
Closed
D224709: Bug 1828980 - Allow 1us rounding error, multiple duplication periods and improve determinism in VideoFrameConverterTest.BlackOnDisableDuplicated. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1833551
Blocked
Repository is not supported by Lando.
Closed
D224708: Bug 1833551 - Allow 1us rounding error and multiple duplication periods in VideoFrameConverterTest.BlackOnDisableCreated. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1743291
Blocked
Repository is not supported by Lando.
Closed
D224707: Bug 1743291 - Don't let time go backwards when activating or enabling VideoFrameConverter. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1920942
Blocked
Repository is not supported by Lando.
Closed
D224706: Bug 1920942 - Allow 1us rounding error in VideoFrameConverterTest.TimestampPropagation. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1920942
Blocked
Repository is not supported by Lando.
Closed
D224705: Bug 1920942 - Disable VideoFrameConverter frame dropping for testing. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1920942
Blocked
Repository is not supported by Lando.
Closed
D224704: Bug 1920942 - In TestVideoFrameConverter turn IsFrameBlack into a matcher. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1920942
Blocked
Repository is not supported by Lando.
Closed
D224703: Bug 1920942 - Make TestVideoFrameConverter run faster with shorter duplication intervals. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1920942
Blocked
Repository is not supported by Lando.
Closed
D224702: Bug 1920942 - Improve VideoFrameConverterTest.NoConversionsWhileInactive. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1920942
Blocked
Repository is not supported by Lando.
Closed
D224701: Bug 1920942 - Update VideoFrameConverter logging. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1920942
Blocked
Repository is not supported by Lando.
Closed
D224700: Bug 1920942 - Make Pacer's duplication interval mutable. r?#webrtc-reviewers
  • @webrtc-reviewers accepted a prior diff
  • @ng accepted a prior diff
1920942
Blocked
Repository is not supported by Lando.
Closed
D224699: Bug 1920942 - In TakeN(MediaEventSourceImpl&) do not spin the event loop. r?jmaher!
  • @jmaher accepted a prior diff
1920942
Blocked
Repository is not supported by Lando.
Closed
D224698: Bug 1920942 - Make WaitFor(MediaEventSourceImpl&) work with any number of event params. r?jmaher!
  • @jmaher accepted a prior diff
1920942
Blocked
Repository is not supported by Lando.
Closed
D224697: Bug 1920942 - In WaitFor.h make functions work with both exclusive and non-exclusive event sources. r?jmaher!
  • @jmaher accepted a prior diff