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

Unified Diff: content/renderer/media/gpu/rtc_video_decoder.cc

Issue 2382113002: Use clearer names for the PictureBuffer texture id members (Closed)
Patch Set: Added comments Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/pepper/video_decoder_shim.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/gpu/rtc_video_decoder.cc
diff --git a/content/renderer/media/gpu/rtc_video_decoder.cc b/content/renderer/media/gpu/rtc_video_decoder.cc
index 47aae3eee3646c58c554b1d42920a3190bd869db..1c1ef796fb8fc1545e4a797ff5587a54de7bd2b6 100644
--- a/content/renderer/media/gpu/rtc_video_decoder.cc
+++ b/content/renderer/media/gpu/rtc_video_decoder.cc
@@ -383,7 +383,7 @@ void RTCVideoDecoder::DismissPictureBuffer(int32_t id) {
if (!picture_buffers_at_display_.count(id)) {
// We can delete the texture immediately as it's not being displayed.
- factories_->DeleteTexture(buffer_to_dismiss.texture_ids()[0]);
+ factories_->DeleteTexture(buffer_to_dismiss.client_texture_ids()[0]);
return;
}
// Not destroying a texture in display in |picture_buffers_at_display_|.
@@ -424,7 +424,7 @@ void RTCVideoDecoder::PictureReady(const media::Picture& picture) {
}
bool inserted = picture_buffers_at_display_
.insert(std::make_pair(picture.picture_buffer_id(),
- pb.texture_ids()[0]))
+ pb.client_texture_ids()[0]))
.second;
DCHECK(inserted);
@@ -470,7 +470,8 @@ scoped_refptr<media::VideoFrame> RTCVideoDecoder::CreateVideoFrame(
pixel_format, holders,
media::BindToCurrentLoop(base::Bind(
&RTCVideoDecoder::ReleaseMailbox, weak_factory_.GetWeakPtr(),
- factories_, picture.picture_buffer_id(), pb.texture_ids()[0])),
+ factories_, picture.picture_buffer_id(),
+ pb.client_texture_ids()[0])),
pb.size(), visible_rect, visible_rect.size(), timestamp_ms);
if (frame && picture.allow_overlay()) {
frame->metadata()->SetBoolean(media::VideoFrameMetadata::ALLOW_OVERLAY,
@@ -760,7 +761,8 @@ void RTCVideoDecoder::DestroyTextures() {
assigned_picture_buffers_.erase(picture_buffer_at_display.first);
for (const auto& assigned_picture_buffer : assigned_picture_buffers_)
- factories_->DeleteTexture(assigned_picture_buffer.second.texture_ids()[0]);
+ factories_->DeleteTexture(
+ assigned_picture_buffer.second.client_texture_ids()[0]);
assigned_picture_buffers_.clear();
}
« no previous file with comments | « no previous file | content/renderer/pepper/video_decoder_shim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698