Chromium Code Reviews

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

Issue 1285733002: Pass buffer offset to PlayOutputBuffer() call (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bot Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_codec_decoder.h" 5 #include "media/base/android/media_codec_decoder.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 615 matching lines...)
626 break; 626 break;
627 627
628 case MEDIA_CODEC_OUTPUT_FORMAT_CHANGED: 628 case MEDIA_CODEC_OUTPUT_FORMAT_CHANGED:
629 DVLOG(2) << class_name() << "::" << __FUNCTION__ 629 DVLOG(2) << class_name() << "::" << __FUNCTION__
630 << " MEDIA_CODEC_OUTPUT_FORMAT_CHANGED"; 630 << " MEDIA_CODEC_OUTPUT_FORMAT_CHANGED";
631 OnOutputFormatChanged(); 631 OnOutputFormatChanged();
632 break; 632 break;
633 633
634 case MEDIA_CODEC_OK: 634 case MEDIA_CODEC_OK:
635 // We got the decoded frame 635 // We got the decoded frame
636 Render(buffer_index, size, true, pts, eos_encountered); 636 Render(buffer_index, offset, size, true, pts, eos_encountered);
637 break; 637 break;
638 638
639 case MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER: 639 case MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER:
640 // Nothing to do. 640 // Nothing to do.
641 break; 641 break;
642 642
643 case MEDIA_CODEC_ERROR: 643 case MEDIA_CODEC_ERROR:
644 DVLOG(0) << class_name() << "::" << __FUNCTION__ 644 DVLOG(0) << class_name() << "::" << __FUNCTION__
645 << ": MEDIA_CODEC_ERROR from DequeueOutputBuffer"; 645 << ": MEDIA_CODEC_ERROR from DequeueOutputBuffer";
646 media_task_runner_->PostTask(FROM_HERE, internal_error_cb_); 646 media_task_runner_->PostTask(FROM_HERE, internal_error_cb_);
(...skipping 49 matching lines...)
696 RETURN_STRING(kInEmergencyStop); 696 RETURN_STRING(kInEmergencyStop);
697 RETURN_STRING(kError); 697 RETURN_STRING(kError);
698 default: 698 default:
699 return "Unknown DecoderState"; 699 return "Unknown DecoderState";
700 } 700 }
701 } 701 }
702 702
703 #undef RETURN_STRING 703 #undef RETURN_STRING
704 704
705 } // namespace media 705 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_codec_decoder.h ('k') | media/base/android/media_codec_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine