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

Side by Side Diff: webkit/glue/webmediaplayer_impl.cc

Issue 7867051: Introduce AudioDecoderConfig to migrate away from GetAVStream(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: samples_per_second Created 9 years, 3 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
« no previous file with comments | « media/video/ffmpeg_video_decode_engine_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "webkit/glue/webmediaplayer_impl.h" 5 #include "webkit/glue/webmediaplayer_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 764
765 case media::PIPELINE_ERROR_INITIALIZATION_FAILED: 765 case media::PIPELINE_ERROR_INITIALIZATION_FAILED:
766 case media::PIPELINE_ERROR_REQUIRED_FILTER_MISSING: 766 case media::PIPELINE_ERROR_REQUIRED_FILTER_MISSING:
767 case media::PIPELINE_ERROR_COULD_NOT_RENDER: 767 case media::PIPELINE_ERROR_COULD_NOT_RENDER:
768 case media::PIPELINE_ERROR_URL_NOT_FOUND: 768 case media::PIPELINE_ERROR_URL_NOT_FOUND:
769 case media::PIPELINE_ERROR_READ: 769 case media::PIPELINE_ERROR_READ:
770 case media::DEMUXER_ERROR_COULD_NOT_OPEN: 770 case media::DEMUXER_ERROR_COULD_NOT_OPEN:
771 case media::DEMUXER_ERROR_COULD_NOT_PARSE: 771 case media::DEMUXER_ERROR_COULD_NOT_PARSE:
772 case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS: 772 case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
773 case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD: 773 case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD:
774 case media::DECODER_ERROR_NOT_SUPPORTED:
774 case media::DATASOURCE_ERROR_URL_NOT_SUPPORTED: 775 case media::DATASOURCE_ERROR_URL_NOT_SUPPORTED:
775 // Format error. 776 // Format error.
776 SetNetworkState(WebMediaPlayer::FormatError); 777 SetNetworkState(WebMediaPlayer::FormatError);
777 break; 778 break;
778 779
779 case media::PIPELINE_ERROR_DECODE: 780 case media::PIPELINE_ERROR_DECODE:
780 case media::PIPELINE_ERROR_ABORT: 781 case media::PIPELINE_ERROR_ABORT:
781 case media::PIPELINE_ERROR_OUT_OF_MEMORY: 782 case media::PIPELINE_ERROR_OUT_OF_MEMORY:
782 case media::PIPELINE_ERROR_AUDIO_HARDWARE: 783 case media::PIPELINE_ERROR_AUDIO_HARDWARE:
783 case media::PIPELINE_ERROR_OPERATION_PENDING: 784 case media::PIPELINE_ERROR_OPERATION_PENDING:
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
870 871
871 void WebMediaPlayerImpl::UsesExtraMemoryTask( 872 void WebMediaPlayerImpl::UsesExtraMemoryTask(
872 scoped_refptr<DestructorOrTaskHadRun> destructor_or_task_had_run) { 873 scoped_refptr<DestructorOrTaskHadRun> destructor_or_task_had_run) {
873 if (!destructor_or_task_had_run->value()) { 874 if (!destructor_or_task_had_run->value()) {
874 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); 875 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
875 destructor_or_task_had_run->set_value(true); 876 destructor_or_task_had_run->set_value(true);
876 } 877 }
877 } 878 }
878 879
879 } // namespace webkit_glue 880 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « media/video/ffmpeg_video_decode_engine_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698