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

Side by Side Diff: media/base/android/media_source_player.cc

Issue 339613002: Revert of Support casting for embedded YT videos (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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
« no previous file with comments | « media/base/android/media_source_player.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "media/base/android/media_source_player.h" 5 #include "media/base/android/media_source_player.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 10 matching lines...) Expand all
21 #include "media/base/android/video_decoder_job.h" 21 #include "media/base/android/video_decoder_job.h"
22 22
23 23
24 namespace media { 24 namespace media {
25 25
26 MediaSourcePlayer::MediaSourcePlayer( 26 MediaSourcePlayer::MediaSourcePlayer(
27 int player_id, 27 int player_id,
28 MediaPlayerManager* manager, 28 MediaPlayerManager* manager,
29 const RequestMediaResourcesCB& request_media_resources_cb, 29 const RequestMediaResourcesCB& request_media_resources_cb,
30 const ReleaseMediaResourcesCB& release_media_resources_cb, 30 const ReleaseMediaResourcesCB& release_media_resources_cb,
31 scoped_ptr<DemuxerAndroid> demuxer, 31 scoped_ptr<DemuxerAndroid> demuxer)
32 const GURL& frame_url)
33 : MediaPlayerAndroid(player_id, 32 : MediaPlayerAndroid(player_id,
34 manager, 33 manager,
35 request_media_resources_cb, 34 request_media_resources_cb,
36 release_media_resources_cb, 35 release_media_resources_cb),
37 frame_url),
38 demuxer_(demuxer.Pass()), 36 demuxer_(demuxer.Pass()),
39 pending_event_(NO_EVENT_PENDING), 37 pending_event_(NO_EVENT_PENDING),
40 playing_(false), 38 playing_(false),
41 clock_(&default_tick_clock_), 39 clock_(&default_tick_clock_),
42 doing_browser_seek_(false), 40 doing_browser_seek_(false),
43 pending_seek_(false), 41 pending_seek_(false),
44 drm_bridge_(NULL), 42 drm_bridge_(NULL),
45 cdm_registration_id_(0), 43 cdm_registration_id_(0),
46 is_waiting_for_key_(false), 44 is_waiting_for_key_(false),
47 is_waiting_for_audio_decoder_(false), 45 is_waiting_for_audio_decoder_(false),
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 // release MediaDrm when the video is paused, or when the device goes to 749 // release MediaDrm when the video is paused, or when the device goes to
752 // sleep (see http://crbug.com/272421). 750 // sleep (see http://crbug.com/272421).
753 NOTREACHED() << "CDM detachment not supported."; 751 NOTREACHED() << "CDM detachment not supported.";
754 DCHECK(drm_bridge_); 752 DCHECK(drm_bridge_);
755 audio_decoder_job_->SetDrmBridge(NULL); 753 audio_decoder_job_->SetDrmBridge(NULL);
756 video_decoder_job_->SetDrmBridge(NULL); 754 video_decoder_job_->SetDrmBridge(NULL);
757 drm_bridge_ = NULL; 755 drm_bridge_ = NULL;
758 } 756 }
759 757
760 } // namespace media 758 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_source_player.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698