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

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

Issue 5744002: Refactor PipelineImpl to use CompositeFilter to manage Filter state transitions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Applied code review suggestions. Created 10 years 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
« media/base/mock_filters.h ('K') | « media/media.gyp ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS: 732 case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
733 case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD: 733 case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD:
734 // Format error. 734 // Format error.
735 SetNetworkState(WebMediaPlayer::FormatError); 735 SetNetworkState(WebMediaPlayer::FormatError);
736 break; 736 break;
737 737
738 case media::PIPELINE_ERROR_DECODE: 738 case media::PIPELINE_ERROR_DECODE:
739 case media::PIPELINE_ERROR_ABORT: 739 case media::PIPELINE_ERROR_ABORT:
740 case media::PIPELINE_ERROR_OUT_OF_MEMORY: 740 case media::PIPELINE_ERROR_OUT_OF_MEMORY:
741 case media::PIPELINE_ERROR_AUDIO_HARDWARE: 741 case media::PIPELINE_ERROR_AUDIO_HARDWARE:
742 case media::PIPELINE_ERROR_OPERATION_PENDING:
743 case media::PIPELINE_ERROR_INVALID_STATE:
742 // Decode error. 744 // Decode error.
743 SetNetworkState(WebMediaPlayer::DecodeError); 745 SetNetworkState(WebMediaPlayer::DecodeError);
744 break; 746 break;
745 } 747 }
746 748
747 // Repaint to trigger UI update. 749 // Repaint to trigger UI update.
748 Repaint(); 750 Repaint();
749 } 751 }
750 752
751 void WebMediaPlayerImpl::OnNetworkEvent() { 753 void WebMediaPlayerImpl::OnNetworkEvent() {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 pipeline_stopped_.Signal(); 811 pipeline_stopped_.Signal();
810 } 812 }
811 813
812 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { 814 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
813 DCHECK(MessageLoop::current() == main_loop_); 815 DCHECK(MessageLoop::current() == main_loop_);
814 DCHECK(client_); 816 DCHECK(client_);
815 return client_; 817 return client_;
816 } 818 }
817 819
818 } // namespace webkit_glue 820 } // namespace webkit_glue
OLDNEW
« media/base/mock_filters.h ('K') | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698