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

Side by Side Diff: content/renderer/media/android/media_player_renderer_client.h

Issue 2556983002: Fix SetStreamTextureSize crash (Closed)
Patch Set: Addressed comments Created 4 years 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 | « no previous file | content/renderer/media/android/media_player_renderer_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_CLIENT_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_CLIENT_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_CLIENT_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_CLIENT_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 void OnWaitingForDecryptionKey() override; 64 void OnWaitingForDecryptionKey() override;
65 void OnVideoNaturalSizeChange(const gfx::Size& size) override; 65 void OnVideoNaturalSizeChange(const gfx::Size& size) override;
66 void OnVideoOpacityChange(bool opaque) override; 66 void OnVideoOpacityChange(bool opaque) override;
67 void OnDurationChange(base::TimeDelta duration) override; 67 void OnDurationChange(base::TimeDelta duration) override;
68 68
69 // Called on |compositor_task_runner_| whenever |stream_texture_wrapper_| has 69 // Called on |compositor_task_runner_| whenever |stream_texture_wrapper_| has
70 // a new frame. 70 // a new frame.
71 void OnFrameAvailable(); 71 void OnFrameAvailable();
72 72
73 private: 73 private:
74 void InitializeRemoteRenderer( 74 void OnStreamTextureWrapperInitialized(
75 media::DemuxerStreamProvider* demuxer_stream_provider); 75 media::DemuxerStreamProvider* demuxer_stream_provider,
76 void CompleteInitialization(media::PipelineStatus status); 76 bool success);
77 void OnRemoteRendererInitialized(media::PipelineStatus status);
77 78
78 void OnScopedSurfaceRequested(const base::UnguessableToken& request_token); 79 void OnScopedSurfaceRequested(const base::UnguessableToken& request_token);
79 80
80 // Used to forward calls to the MediaPlayerRenderer living in the Browser. 81 // Used to forward calls to the MediaPlayerRenderer living in the Browser.
81 std::unique_ptr<media::MojoRenderer> mojo_renderer_; 82 std::unique_ptr<media::MojoRenderer> mojo_renderer_;
82 83
83 // Owns the StreamTexture whose surface is used by MediaPlayerRenderer. 84 // Owns the StreamTexture whose surface is used by MediaPlayerRenderer.
84 // Provides the VideoFrames to |sink_|. 85 // Provides the VideoFrames to |sink_|.
85 media::ScopedStreamTextureWrapper stream_texture_wrapper_; 86 media::ScopedStreamTextureWrapper stream_texture_wrapper_;
86 87
(...skipping 11 matching lines...) Expand all
98 99
99 // NOTE: Weak pointers must be invalidated before all other member variables. 100 // NOTE: Weak pointers must be invalidated before all other member variables.
100 base::WeakPtrFactory<MediaPlayerRendererClient> weak_factory_; 101 base::WeakPtrFactory<MediaPlayerRendererClient> weak_factory_;
101 102
102 DISALLOW_COPY_AND_ASSIGN(MediaPlayerRendererClient); 103 DISALLOW_COPY_AND_ASSIGN(MediaPlayerRendererClient);
103 }; 104 };
104 105
105 } // namespace content 106 } // namespace content
106 107
107 #endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_CLIENT_H_ 108 #endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/android/media_player_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698