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

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: blam 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
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 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 740
741 case media::PIPELINE_ERROR_INITIALIZATION_FAILED: 741 case media::PIPELINE_ERROR_INITIALIZATION_FAILED:
742 case media::PIPELINE_ERROR_REQUIRED_FILTER_MISSING: 742 case media::PIPELINE_ERROR_REQUIRED_FILTER_MISSING:
743 case media::PIPELINE_ERROR_COULD_NOT_RENDER: 743 case media::PIPELINE_ERROR_COULD_NOT_RENDER:
744 case media::PIPELINE_ERROR_URL_NOT_FOUND: 744 case media::PIPELINE_ERROR_URL_NOT_FOUND:
745 case media::PIPELINE_ERROR_READ: 745 case media::PIPELINE_ERROR_READ:
746 case media::DEMUXER_ERROR_COULD_NOT_OPEN: 746 case media::DEMUXER_ERROR_COULD_NOT_OPEN:
747 case media::DEMUXER_ERROR_COULD_NOT_PARSE: 747 case media::DEMUXER_ERROR_COULD_NOT_PARSE:
748 case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS: 748 case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
749 case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD: 749 case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD:
750 case media::DECODER_ERROR_NOT_SUPPORTED:
750 case media::DATASOURCE_ERROR_URL_NOT_SUPPORTED: 751 case media::DATASOURCE_ERROR_URL_NOT_SUPPORTED:
751 // Format error. 752 // Format error.
752 SetNetworkState(WebMediaPlayer::FormatError); 753 SetNetworkState(WebMediaPlayer::FormatError);
753 break; 754 break;
754 755
755 case media::PIPELINE_ERROR_DECODE: 756 case media::PIPELINE_ERROR_DECODE:
756 case media::PIPELINE_ERROR_ABORT: 757 case media::PIPELINE_ERROR_ABORT:
757 case media::PIPELINE_ERROR_OUT_OF_MEMORY: 758 case media::PIPELINE_ERROR_OUT_OF_MEMORY:
758 case media::PIPELINE_ERROR_AUDIO_HARDWARE: 759 case media::PIPELINE_ERROR_AUDIO_HARDWARE:
759 case media::PIPELINE_ERROR_OPERATION_PENDING: 760 case media::PIPELINE_ERROR_OPERATION_PENDING:
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 } 830 }
830 } 831 }
831 832
832 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { 833 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
833 DCHECK(MessageLoop::current() == main_loop_); 834 DCHECK(MessageLoop::current() == main_loop_);
834 DCHECK(client_); 835 DCHECK(client_);
835 return client_; 836 return client_;
836 } 837 }
837 838
838 } // namespace webkit_glue 839 } // namespace webkit_glue
OLDNEW
« media/filters/ffmpeg_audio_decoder.cc ('K') | « 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