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

Side by Side Diff: content/renderer/media/android/media_source_delegate.cc

Issue 496103002: Fix the ownership of media_log_ in WebMediaPlayerAndroid (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 6 years, 4 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 | Annotate | Revision Log
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 "content/renderer/media/android/media_source_delegate.h" 5 #include "content/renderer/media/android/media_source_delegate.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 static void LogMediaSourceError(const scoped_refptr<media::MediaLog>& media_log, 43 static void LogMediaSourceError(const scoped_refptr<media::MediaLog>& media_log,
44 const std::string& error) { 44 const std::string& error) {
45 media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error)); 45 media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error));
46 } 46 }
47 47
48 MediaSourceDelegate::MediaSourceDelegate( 48 MediaSourceDelegate::MediaSourceDelegate(
49 RendererDemuxerAndroid* demuxer_client, 49 RendererDemuxerAndroid* demuxer_client,
50 int demuxer_client_id, 50 int demuxer_client_id,
51 const scoped_refptr<base::MessageLoopProxy>& media_loop, 51 const scoped_refptr<base::MessageLoopProxy>& media_loop,
52 media::MediaLog* media_log) 52 const scoped_refptr<media::MediaLog> media_log)
53 : demuxer_client_(demuxer_client), 53 : demuxer_client_(demuxer_client),
54 demuxer_client_id_(demuxer_client_id), 54 demuxer_client_id_(demuxer_client_id),
55 media_log_(media_log), 55 media_log_(media_log),
56 is_demuxer_ready_(false), 56 is_demuxer_ready_(false),
57 audio_stream_(NULL), 57 audio_stream_(NULL),
58 video_stream_(NULL), 58 video_stream_(NULL),
59 seeking_(false), 59 seeking_(false),
60 is_video_encrypted_(false), 60 is_video_encrypted_(false),
61 doing_browser_seek_(false), 61 doing_browser_seek_(false),
62 browser_seek_time_(media::kNoTimestamp()), 62 browser_seek_time_(media::kNoTimestamp()),
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 configs->video_size = config.natural_size(); 756 configs->video_size = config.natural_size();
757 configs->is_video_encrypted = config.is_encrypted(); 757 configs->is_video_encrypted = config.is_encrypted();
758 configs->video_extra_data = std::vector<uint8>( 758 configs->video_extra_data = std::vector<uint8>(
759 config.extra_data(), config.extra_data() + config.extra_data_size()); 759 config.extra_data(), config.extra_data() + config.extra_data_size());
760 return true; 760 return true;
761 } 761 }
762 return false; 762 return false;
763 } 763 }
764 764
765 } // namespace content 765 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/media_source_delegate.h ('k') | content/renderer/media/android/webmediaplayer_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698