WebRtcBrowserTest with VP8 and VP9. WebRtcTestBase::NegotiateCall specifying video codec.

chrome/test/data/webrtc/peerconnection.js

 /**
  * Copyright 2014 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /**
  * The one and only peer connection in this page.
  * @private
  */
@@ skipping 26 matching lines @@
   gPeerConnection = createPeerConnection_();
   returnToTest('ok-peerconnection-created');
 }
 
 /**
  * Asks this page to create a local offer.
  *
  * Returns a string on the format ok-(JSON encoded session description).
  *
  * @param {!Object} constraints Any createOffer constraints.
+ * @param {!String} videoCodec If not null, promotes the specified codec to be

[phoglund_chromium, 2016/02/01 14:20:44]

Remove the !, which means that the parameter is mandatory.

[hbos_chromium, 2016/02/02 14:07:19]

Oh so that's what it means... :) done.

+ * the default video codec, e.g. the first one in the list on the 'm=video' SDP
+ * offer line. |videoCodec| is the case-sensitive codec name, e.g. 'VP8'.
  */
-function createLocalOffer(constraints) {
+function createLocalOffer(constraints, videoCodec = null) {
   peerConnection_().createOffer(
       function(localOffer) {
         success_('createOffer');
+
         setLocalDescription(peerConnection, localOffer);
+        if (videoCodec !== null)
+          localOffer.sdp = setSdpDefaultVideoCodec(localOffer.sdp, videoCodec);
 
         returnToTest('ok-' + JSON.stringify(localOffer));
       },
       function(error) { failure_('createOffer', error); },
       constraints);
 }
 
 /**
  * Asks this page to accept an offer and generate an answer.
  *
  * Returns a string on the format ok-(JSON encoded session description).
  *
  * @param {!string} sessionDescJson A JSON-encoded session description of type
  *     'offer'.
  * @param {!Object} constraints Any createAnswer constraints.
+ * @param {!string} videoCodec If not null, verifies that the specified codec

[phoglund_chromium, 2016/02/01 14:20:44]

Call this expectedVideoCodec

[phoglund_chromium, 2016/02/01 14:20:44]

Same here

[hbos_chromium, 2016/02/02 14:07:19]

Done.

+ * is the default video codec, e.g. the first one in the list on the 'm=video'
+ * SDP answer line. If this is not the case, |failure_| occurs. |videoCodec| is
+ * the case-sensitive codec name, e.g. 'VP8', or null not to perform any
+ * verification.
  */
-function receiveOfferFromPeer(sessionDescJson, constraints) {
+function receiveOfferFromPeer(sessionDescJson, constraints, videoCodec = null) {
   offer = parseJson_(sessionDescJson);
   if (!offer.type)
     failTest('Got invalid session description from peer: ' + sessionDescJson);
   if (offer.type != 'offer')
     failTest('Expected to receive offer from peer, got ' + offer.type);
 
   var sessionDescription = new RTCSessionDescription(offer);
   peerConnection_().setRemoteDescription(
       sessionDescription,
       function() { success_('setRemoteDescription'); },
       function(error) { failure_('setRemoteDescription', error); });
 
   peerConnection_().createAnswer(
       function(answer) {
         success_('createAnswer');
+
         setLocalDescription(peerConnection, answer);
+        if (videoCodec !== null) {

[phoglund_chromium, 2016/02/01 14:20:44]

Break this out into a new function verifyDefaultVideoCodecIs(sdp,
expectedVideoCodec) which you call from the C++ code. I think this function is
starting to do too much, and we may as well call this from C++. You'll have to
do some JSON parsing but that's alright I think.

[hbos_chromium, 2016/02/02 14:07:19]

Done.

+          var defaultVideoCodec = getSdpDefaultVideoCodec(answer.sdp);
+          if (defaultVideoCodec === null) {
+            failure_('createAnswer',

[phoglund_chromium, 2016/02/01 14:20:44]

Should be failTest. Also note failTest takes one argument and not two.

[hbos_chromium, 2016/02/02 14:07:19]

failure_ is defined in this file.

+                     'Could not determine default video codec.');
+          }
+          if (videoCodec !== defaultVideoCodec) {
+            failure_('createAnswer',

[phoglund_chromium, 2016/02/01 14:20:44]

Same here

+                     'Expected default video codec ' + videoCodec +
+                     ', got ' + defaultVideoCodec + '.');
+          }
+        }
+
         returnToTest('ok-' + JSON.stringify(answer));
       },
       function(error) { failure_('createAnswer', error); },
       constraints);
 }
 
 /**
  * Asks this page to accept an answer generated by the peer in response to a
  * previous offer by this page
  *
@@ skipping 199 matching lines @@
 function parseJson_(json) {
   // Escape since the \r\n in the SDP tend to get unescaped.
   jsonWithEscapedLineBreaks = json.replace(/\r\n/g, '\\r\\n');
   try {
     return JSON.parse(jsonWithEscapedLineBreaks);
   } catch (exception) {
     failTest('Failed to parse JSON: ' + jsonWithEscapedLineBreaks + ', got ' +
              exception);
   }
 }