| OLD | NEW |
| 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 610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 621 break; | 621 break; |
| 622 | 622 |
| 623 case MEDIA_CODEC_OUTPUT_FORMAT_CHANGED: | 623 case MEDIA_CODEC_OUTPUT_FORMAT_CHANGED: |
| 624 DVLOG(2) << class_name() << "::" << __FUNCTION__ | 624 DVLOG(2) << class_name() << "::" << __FUNCTION__ |
| 625 << " MEDIA_CODEC_OUTPUT_FORMAT_CHANGED"; | 625 << " MEDIA_CODEC_OUTPUT_FORMAT_CHANGED"; |
| 626 OnOutputFormatChanged(); | 626 OnOutputFormatChanged(); |
| 627 break; | 627 break; |
| 628 | 628 |
| 629 case MEDIA_CODEC_OK: | 629 case MEDIA_CODEC_OK: |
| 630 // We got the decoded frame | 630 // We got the decoded frame |
| 631 Render(buffer_index, size, true, pts, eos_encountered); | 631 Render(buffer_index, offset, size, true, pts, eos_encountered); |
| 632 break; | 632 break; |
| 633 | 633 |
| 634 case MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER: | 634 case MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER: |
| 635 // Nothing to do. | 635 // Nothing to do. |
| 636 break; | 636 break; |
| 637 | 637 |
| 638 case MEDIA_CODEC_ERROR: | 638 case MEDIA_CODEC_ERROR: |
| 639 DVLOG(0) << class_name() << "::" << __FUNCTION__ | 639 DVLOG(0) << class_name() << "::" << __FUNCTION__ |
| 640 << ": MEDIA_CODEC_ERROR from DequeueOutputBuffer"; | 640 << ": MEDIA_CODEC_ERROR from DequeueOutputBuffer"; |
| 641 media_task_runner_->PostTask(FROM_HERE, internal_error_cb_); | 641 media_task_runner_->PostTask(FROM_HERE, internal_error_cb_); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 RETURN_STRING(kInEmergencyStop); | 691 RETURN_STRING(kInEmergencyStop); |
| 692 RETURN_STRING(kError); | 692 RETURN_STRING(kError); |
| 693 default: | 693 default: |
| 694 return "Unknown DecoderState"; | 694 return "Unknown DecoderState"; |
| 695 } | 695 } |
| 696 } | 696 } |
| 697 | 697 |
| 698 #undef RETURN_STRING | 698 #undef RETURN_STRING |
| 699 | 699 |
| 700 } // namespace media | 700 } // namespace media |
| OLD | NEW |