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

Issue 126843003: Revert of Cast:Adding cast_transport_config and cleaning up (Closed)

Created:
6 years, 11 months ago by bajones
Modified:
6 years, 11 months ago
CC:
chromium-reviews, hclam+watch_chromium.org, mikhal+watch_chromium.org, hguihot+watch_chromium.org, jasonroberts+watch_google.com, pwestin+watch_google.com, feature-media-reviews_chromium.org, hubbe+watch_chromium.org, miu+watch_chromium.org
Visibility:
Public.

Description

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+441 lines, -596 lines) Patch
M chrome/renderer/media/cast_rtp_stream.cc View 3 chunks +3 lines, -4 lines 0 comments Download
M chrome/renderer/media/cast_session_delegate.cc View 2 chunks +1 line, -3 lines 0 comments Download
M media/cast/audio_receiver/audio_decoder.cc View 4 chunks +4 lines, -4 lines 0 comments Download
M media/cast/audio_receiver/audio_decoder_unittest.cc View 4 chunks +4 lines, -4 lines 0 comments Download
M media/cast/audio_receiver/audio_receiver.h View 3 chunks +6 lines, -7 lines 0 comments Download
M media/cast/audio_receiver/audio_receiver.cc View 4 chunks +4 lines, -6 lines 0 comments Download
M media/cast/audio_receiver/audio_receiver_unittest.cc View 6 chunks +8 lines, -9 lines 0 comments Download
M media/cast/audio_sender/audio_encoder.h View 1 chunk +1 line, -1 line 0 comments Download
M media/cast/audio_sender/audio_encoder.cc View 7 chunks +10 lines, -11 lines 0 comments Download
M media/cast/audio_sender/audio_encoder_unittest.cc View 6 chunks +8 lines, -8 lines 0 comments Download
M media/cast/audio_sender/audio_sender.h View 3 chunks +8 lines, -9 lines 0 comments Download
M media/cast/audio_sender/audio_sender.cc View 6 chunks +10 lines, -11 lines 0 comments Download
M media/cast/audio_sender/audio_sender_unittest.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M media/cast/cast_config.h View 7 chunks +42 lines, -8 lines 0 comments Download
M media/cast/cast_config.cc View 1 chunk +11 lines, -0 lines 0 comments Download
M media/cast/cast_defines.h View 1 chunk +1 line, -1 line 0 comments Download
M media/cast/cast_environment.h View 4 chunks +3 lines, -7 lines 0 comments Download
M media/cast/cast_environment.cc View 4 chunks +0 lines, -6 lines 0 comments Download
M media/cast/cast_receiver.h View 3 chunks +3 lines, -3 lines 0 comments Download
M media/cast/cast_receiver_impl.h View 2 chunks +2 lines, -2 lines 0 comments Download
M media/cast/cast_receiver_impl.cc View 3 chunks +3 lines, -5 lines 0 comments Download
M media/cast/cast_sender.h View 2 chunks +4 lines, -5 lines 0 comments Download
M media/cast/cast_sender_impl.h View 1 chunk +2 lines, -2 lines 0 comments Download
M media/cast/cast_sender_impl.cc View 4 chunks +6 lines, -9 lines 0 comments Download
M media/cast/framer/frame_buffer.h View 1 chunk +2 lines, -2 lines 0 comments Download
M media/cast/framer/frame_buffer.cc View 2 chunks +4 lines, -6 lines 0 comments Download
M media/cast/framer/frame_buffer_unittest.cc View 4 chunks +4 lines, -4 lines 0 comments Download
M media/cast/framer/framer.h View 1 chunk +2 lines, -2 lines 0 comments Download
M media/cast/framer/framer.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M media/cast/framer/framer_unittest.cc View 13 chunks +13 lines, -13 lines 0 comments Download
M media/cast/rtcp/rtcp.cc View 1 chunk +1 line, -2 lines 0 comments Download
M media/cast/rtcp/rtcp_receiver_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M media/cast/rtcp/rtcp_sender.cc View 20 chunks +37 lines, -37 lines 0 comments Download
M media/cast/rtcp/rtcp_sender_unittest.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M media/cast/rtcp/rtcp_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M media/cast/rtcp/rtcp_utility.h View 1 chunk +14 lines, -0 lines 0 comments Download
M media/cast/rtcp/rtcp_utility.cc View 5 chunks +12 lines, -14 lines 0 comments Download
M media/cast/rtcp/test_rtcp_packet_builder.h View 2 chunks +2 lines, -2 lines 0 comments Download
M media/cast/rtcp/test_rtcp_packet_builder.cc View 1 chunk +1 line, -1 line 0 comments Download
M media/cast/rtp_receiver/rtp_parser/rtp_parser.h View 1 chunk +2 lines, -2 lines 0 comments Download
M media/cast/test/encode_decode_test.cc View 2 chunks +2 lines, -3 lines 0 comments Download
M media/cast/test/end2end_unittest.cc View 20 chunks +25 lines, -22 lines 0 comments Download
M media/cast/test/receiver.cc View 4 chunks +3 lines, -4 lines 0 comments Download
M media/cast/test/sender.cc View 4 chunks +3 lines, -5 lines 0 comments Download
M media/cast/transport/cast_transport.gyp View 1 chunk +0 lines, -2 lines 0 comments Download
D media/cast/transport/cast_transport_config.h View 1 chunk +0 lines, -101 lines 0 comments Download
D media/cast/transport/cast_transport_config.cc View 1 chunk +0 lines, -41 lines 0 comments Download
M media/cast/transport/cast_transport_defines.h View 1 chunk +0 lines, -32 lines 0 comments Download
M media/cast/transport/cast_transport_sender.h View 3 chunks +27 lines, -34 lines 0 comments Download
M media/cast/transport/pacing/paced_sender.h View 3 chunks +5 lines, -8 lines 0 comments Download
M media/cast/transport/pacing/paced_sender.cc View 4 chunks +24 lines, -9 lines 0 comments Download
M media/cast/transport/pacing/paced_sender_unittest.cc View 2 chunks +5 lines, -2 lines 0 comments Download
M media/cast/transport/rtcp/rtcp_builder.cc View 9 chunks +13 lines, -19 lines 0 comments Download
M media/cast/transport/rtcp/rtcp_builder_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M media/cast/transport/rtp_sender/packet_storage/packet_storage.h View 1 chunk +1 line, -2 lines 0 comments Download
M media/cast/transport/rtp_sender/packet_storage/packet_storage.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc View 1 chunk +1 line, -1 line 0 comments Download
M media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc View 1 chunk +1 line, -0 lines 0 comments Download
M media/cast/transport/rtp_sender/rtp_sender.h View 2 chunks +2 lines, -1 line 0 comments Download
M media/cast/transport/rtp_sender/rtp_sender.cc View 2 chunks +8 lines, -4 lines 0 comments Download
M media/cast/transport/transport/transport.h View 2 chunks +5 lines, -5 lines 0 comments Download
M media/cast/video_receiver/codecs/vp8/vp8_decoder.h View 1 chunk +1 line, -1 line 0 comments Download
M media/cast/video_receiver/codecs/vp8/vp8_decoder.cc View 1 chunk +1 line, -1 line 0 comments Download
M media/cast/video_receiver/video_decoder.h View 1 chunk +2 lines, -2 lines 0 comments Download
M media/cast/video_receiver/video_decoder.cc View 2 chunks +6 lines, -7 lines 0 comments Download
M media/cast/video_receiver/video_decoder_unittest.cc View 2 chunks +4 lines, -4 lines 0 comments Download
M media/cast/video_receiver/video_receiver.h View 3 chunks +8 lines, -9 lines 0 comments Download
M media/cast/video_receiver/video_receiver.cc View 7 chunks +7 lines, -10 lines 0 comments Download
M media/cast/video_receiver/video_receiver_unittest.cc View 2 chunks +4 lines, -4 lines 0 comments Download
M media/cast/video_sender/codecs/vp8/vp8_encoder.h View 1 chunk +1 line, -1 line 0 comments Download
M media/cast/video_sender/codecs/vp8/vp8_encoder.cc View 3 chunks +2 lines, -3 lines 0 comments Download
M media/cast/video_sender/external_video_encoder.cc View 4 chunks +4 lines, -6 lines 0 comments Download
M media/cast/video_sender/external_video_encoder_unittest.cc View 3 chunks +4 lines, -5 lines 0 comments Download
M media/cast/video_sender/video_encoder.h View 1 chunk +1 line, -1 line 0 comments Download
M media/cast/video_sender/video_encoder_impl.h View 1 chunk +1 line, -1 line 0 comments Download
M media/cast/video_sender/video_encoder_impl.cc View 3 chunks +3 lines, -4 lines 0 comments Download
M media/cast/video_sender/video_encoder_impl_unittest.cc View 3 chunks +4 lines, -5 lines 0 comments Download
M media/cast/video_sender/video_sender.h View 1 chunk +4 lines, -4 lines 0 comments Download
M media/cast/video_sender/video_sender.cc View 3 chunks +7 lines, -9 lines 0 comments Download
M media/cast/video_sender/video_sender_unittest.cc View 2 chunks +3 lines, -3 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
bajones
Created Revert of Cast:Adding cast_transport_config and cleaning up
6 years, 11 months ago (2014-01-08 21:31:42 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/bajones@chromium.org/126843003/1
6 years, 11 months ago (2014-01-08 21:39:46 UTC) #2
commit-bot: I haz the power
6 years, 11 months ago (2014-01-08 21:40:12 UTC) #3
Failed to apply patch for chrome/renderer/media/cast_rtp_stream.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/renderer/media/cast_rtp_stream.cc
  Hunk #1 FAILED at 15.
  Hunk #2 FAILED at 80.
  Hunk #3 FAILED at 104.
  3 out of 3 hunks FAILED -- saving rejects to file
chrome/renderer/media/cast_rtp_stream.cc.rej

Patch:       chrome/renderer/media/cast_rtp_stream.cc
Index: chrome/renderer/media/cast_rtp_stream.cc
diff --git a/chrome/renderer/media/cast_rtp_stream.cc
b/chrome/renderer/media/cast_rtp_stream.cc
index
66ac92a6d58c787a534c6ce4815f6af9c38261bf..3f5f8d344e21f84b5a6c659d344fbb9b53c4b843
100644
--- a/chrome/renderer/media/cast_rtp_stream.cc
+++ b/chrome/renderer/media/cast_rtp_stream.cc
@@ -15,7 +15,6 @@
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_sender.h"
-#include "media/cast/transport/cast_transport_config.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 
 using media::cast::AudioSenderConfig;
@@ -80,9 +79,9 @@
   config->bitrate = payload_params.max_bitrate;
   config->aes_key = payload_params.aes_key;
   config->aes_iv_mask = payload_params.aes_iv_mask;
-  config->codec = media::cast::transport::kPcm16;
+  config->codec = media::cast::kPcm16;
   if (payload_params.codec_name == kCodecNameOpus)
-    config->codec = media::cast::transport::kOpus;
+    config->codec = media::cast::kOpus;
   else
     return false;
   return true;
@@ -104,7 +103,7 @@
   config->aes_key = payload_params.aes_key;
   config->aes_iv_mask = payload_params.aes_iv_mask;
   if (payload_params.codec_name == kCodecNameVp8)
-    config->codec = media::cast::transport::kVp8;
+    config->codec = media::cast::kVp8;
   else
     return false;
   return true;

Powered by Google App Engine
This is Rietveld 408576698