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

Side by Side Diff: content/common/gpu/media/android_video_decode_accelerator.cc

Issue 319323002: Revert of Merge VideoDecodeAcceleratorImpl with VideoDecodeAccelerator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | Annotate | Revision Log
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 "content/common/gpu/media/android_video_decode_accelerator.h" 5 #include "content/common/gpu/media/android_video_decode_accelerator.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 io_timer_.Stop(); 507 io_timer_.Stop();
508 media_codec_->Stop(); 508 media_codec_->Stop();
509 } 509 }
510 if (surface_texture_id_) 510 if (surface_texture_id_)
511 glDeleteTextures(1, &surface_texture_id_); 511 glDeleteTextures(1, &surface_texture_id_);
512 if (copier_) 512 if (copier_)
513 copier_->Destroy(); 513 copier_->Destroy();
514 delete this; 514 delete this;
515 } 515 }
516 516
517 bool AndroidVideoDecodeAccelerator::CanDecodeOnIOThread() {
518 return false;
519 }
520
521 void AndroidVideoDecodeAccelerator::RequestPictureBuffers() { 517 void AndroidVideoDecodeAccelerator::RequestPictureBuffers() {
522 client_->ProvidePictureBuffers(kNumPictureBuffers, size_, GL_TEXTURE_2D); 518 client_->ProvidePictureBuffers(kNumPictureBuffers, size_, GL_TEXTURE_2D);
523 } 519 }
524 520
525 void AndroidVideoDecodeAccelerator::NotifyPictureReady( 521 void AndroidVideoDecodeAccelerator::NotifyPictureReady(
526 const media::Picture& picture) { 522 const media::Picture& picture) {
527 client_->PictureReady(picture); 523 client_->PictureReady(picture);
528 } 524 }
529 525
530 void AndroidVideoDecodeAccelerator::NotifyEndOfBitstreamBuffer( 526 void AndroidVideoDecodeAccelerator::NotifyEndOfBitstreamBuffer(
531 int input_buffer_id) { 527 int input_buffer_id) {
532 client_->NotifyEndOfBitstreamBuffer(input_buffer_id); 528 client_->NotifyEndOfBitstreamBuffer(input_buffer_id);
533 } 529 }
534 530
535 void AndroidVideoDecodeAccelerator::NotifyFlushDone() { 531 void AndroidVideoDecodeAccelerator::NotifyFlushDone() {
536 client_->NotifyFlushDone(); 532 client_->NotifyFlushDone();
537 } 533 }
538 534
539 void AndroidVideoDecodeAccelerator::NotifyResetDone() { 535 void AndroidVideoDecodeAccelerator::NotifyResetDone() {
540 client_->NotifyResetDone(); 536 client_->NotifyResetDone();
541 } 537 }
542 538
543 void AndroidVideoDecodeAccelerator::NotifyError( 539 void AndroidVideoDecodeAccelerator::NotifyError(
544 media::VideoDecodeAccelerator::Error error) { 540 media::VideoDecodeAccelerator::Error error) {
545 client_->NotifyError(error); 541 client_->NotifyError(error);
546 } 542 }
547 543
548 } // namespace content 544 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/media/android_video_decode_accelerator.h ('k') | content/common/gpu/media/dxva_video_decode_accelerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698