Index: media/cast/sender/vp8_encoder.cc |
diff --git a/media/cast/video_sender/codecs/vp8/vp8_encoder.cc b/media/cast/sender/vp8_encoder.cc |
similarity index 97% |
rename from media/cast/video_sender/codecs/vp8/vp8_encoder.cc |
rename to media/cast/sender/vp8_encoder.cc |
index c7374babd19bc791d4dd7edd42aba851af8ccb52..bf07c1ceae1ffe66ed0bb513b619714c66cbf592 100644 |
--- a/media/cast/video_sender/codecs/vp8/vp8_encoder.cc |
+++ b/media/cast/sender/vp8_encoder.cc |
@@ -1,17 +1,15 @@ |
// Copyright 2013 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. |
-// |
-// TODO (pwestin): add a link to the design document describing the generic |
-// protocol and the VP8 specific details. |
-#include "media/cast/video_sender/codecs/vp8/vp8_encoder.h" |
+ |
+#include "media/cast/sender/vp8_encoder.h" |
#include <vector> |
#include "base/logging.h" |
#include "media/base/video_frame.h" |
#include "media/cast/cast_defines.h" |
-#include "media/cast/transport/cast_transport_config.h" |
+#include "media/cast/net/cast_transport_config.h" |
#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" |
namespace media { |
@@ -135,7 +133,7 @@ void Vp8Encoder::InitEncode(int number_of_encode_threads) { |
} |
bool Vp8Encoder::Encode(const scoped_refptr<media::VideoFrame>& video_frame, |
- transport::EncodedFrame* encoded_image) { |
+ EncodedFrame* encoded_image) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
// Image in vpx_image_t format. |
// Input image is const. VP8's raw image is not defined as const. |
@@ -216,10 +214,10 @@ bool Vp8Encoder::Encode(const scoped_refptr<media::VideoFrame>& video_frame, |
// Populate the encoded frame. |
encoded_image->frame_id = ++last_encoded_frame_id_; |
if (is_key_frame) { |
- encoded_image->dependency = transport::EncodedFrame::KEY; |
+ encoded_image->dependency = EncodedFrame::KEY; |
encoded_image->referenced_frame_id = encoded_image->frame_id; |
} else { |
- encoded_image->dependency = transport::EncodedFrame::DEPENDENT; |
+ encoded_image->dependency = EncodedFrame::DEPENDENT; |
encoded_image->referenced_frame_id = latest_frame_id_to_reference; |
} |