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

Side by Side Diff: chrome/renderer/media/cast_rtp_stream.cc

Issue 1907973003: media: Move audio_parameters and audio_point to media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/media/cast_rtp_stream.h" 5 #include "chrome/renderer/media/cast_rtp_stream.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
(...skipping 13 matching lines...) Expand all
24 #include "base/timer/timer.h" 24 #include "base/timer/timer.h"
25 #include "base/trace_event/trace_event.h" 25 #include "base/trace_event/trace_event.h"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "chrome/renderer/media/cast_session.h" 27 #include "chrome/renderer/media/cast_session.h"
28 #include "chrome/renderer/media/cast_udp_transport.h" 28 #include "chrome/renderer/media/cast_udp_transport.h"
29 #include "content/public/renderer/media_stream_audio_sink.h" 29 #include "content/public/renderer/media_stream_audio_sink.h"
30 #include "content/public/renderer/media_stream_utils.h" 30 #include "content/public/renderer/media_stream_utils.h"
31 #include "content/public/renderer/media_stream_video_sink.h" 31 #include "content/public/renderer/media_stream_video_sink.h"
32 #include "content/public/renderer/render_thread.h" 32 #include "content/public/renderer/render_thread.h"
33 #include "content/public/renderer/video_encode_accelerator.h" 33 #include "content/public/renderer/video_encode_accelerator.h"
34 #include "media/audio/audio_parameters.h"
35 #include "media/base/audio_bus.h" 34 #include "media/base/audio_bus.h"
36 #include "media/base/audio_converter.h" 35 #include "media/base/audio_converter.h"
36 #include "media/base/audio_parameters.h"
37 #include "media/base/bind_to_current_loop.h" 37 #include "media/base/bind_to_current_loop.h"
38 #include "media/base/limits.h" 38 #include "media/base/limits.h"
39 #include "media/base/video_frame.h" 39 #include "media/base/video_frame.h"
40 #include "media/base/video_util.h" 40 #include "media/base/video_util.h"
41 #include "media/cast/cast_config.h" 41 #include "media/cast/cast_config.h"
42 #include "media/cast/cast_sender.h" 42 #include "media/cast/cast_sender.h"
43 #include "media/cast/net/cast_transport_config.h" 43 #include "media/cast/net/cast_transport_config.h"
44 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 44 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
45 #include "ui/gfx/geometry/size.h" 45 #include "ui/gfx/geometry/size.h"
46 46
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 DCHECK(content::RenderThread::Get()); 734 DCHECK(content::RenderThread::Get());
735 DVLOG(1) << "CastRtpStream::DidEncounterError(" << message << ") = " 735 DVLOG(1) << "CastRtpStream::DidEncounterError(" << message << ") = "
736 << (IsAudio() ? "audio" : "video"); 736 << (IsAudio() ? "audio" : "video");
737 // Save the WeakPtr first because the error callback might delete this object. 737 // Save the WeakPtr first because the error callback might delete this object.
738 base::WeakPtr<CastRtpStream> ptr = weak_factory_.GetWeakPtr(); 738 base::WeakPtr<CastRtpStream> ptr = weak_factory_.GetWeakPtr();
739 error_callback_.Run(message); 739 error_callback_.Run(message);
740 base::ThreadTaskRunnerHandle::Get()->PostTask( 740 base::ThreadTaskRunnerHandle::Get()->PostTask(
741 FROM_HERE, 741 FROM_HERE,
742 base::Bind(&CastRtpStream::Stop, ptr)); 742 base::Bind(&CastRtpStream::Stop, ptr));
743 } 743 }
OLDNEW
« no previous file with comments | « chrome/renderer/media/cast_receiver_audio_valve.cc ('k') | chromecast/media/audio/cast_audio_output_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698