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

Side by Side Diff: media/filters/chunk_demuxer.cc

Issue 560563002: Add default impl for DemuxerStream::EnableBitstreamConverter(); (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 6 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
« no previous file with comments | « media/filters/chunk_demuxer.h ('k') | media/filters/fake_demuxer_stream.h » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/filters/chunk_demuxer.h" 5 #include "media/filters/chunk_demuxer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <list> 9 #include <list>
10 10
(...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 base::AutoLock auto_lock(lock_); 926 base::AutoLock auto_lock(lock_);
927 DCHECK_NE(state_, UNINITIALIZED); 927 DCHECK_NE(state_, UNINITIALIZED);
928 DCHECK(read_cb_.is_null()); 928 DCHECK(read_cb_.is_null());
929 929
930 read_cb_ = BindToCurrentLoop(read_cb); 930 read_cb_ = BindToCurrentLoop(read_cb);
931 CompletePendingReadIfPossible_Locked(); 931 CompletePendingReadIfPossible_Locked();
932 } 932 }
933 933
934 DemuxerStream::Type ChunkDemuxerStream::type() { return type_; } 934 DemuxerStream::Type ChunkDemuxerStream::type() { return type_; }
935 935
936 void ChunkDemuxerStream::EnableBitstreamConverter() {}
937
938 AudioDecoderConfig ChunkDemuxerStream::audio_decoder_config() { 936 AudioDecoderConfig ChunkDemuxerStream::audio_decoder_config() {
939 CHECK_EQ(type_, AUDIO); 937 CHECK_EQ(type_, AUDIO);
940 base::AutoLock auto_lock(lock_); 938 base::AutoLock auto_lock(lock_);
941 return stream_->GetCurrentAudioDecoderConfig(); 939 return stream_->GetCurrentAudioDecoderConfig();
942 } 940 }
943 941
944 VideoDecoderConfig ChunkDemuxerStream::video_decoder_config() { 942 VideoDecoderConfig ChunkDemuxerStream::video_decoder_config() {
945 CHECK_EQ(type_, VIDEO); 943 CHECK_EQ(type_, VIDEO);
946 base::AutoLock auto_lock(lock_); 944 base::AutoLock auto_lock(lock_);
947 return stream_->GetCurrentVideoDecoderConfig(); 945 return stream_->GetCurrentVideoDecoderConfig();
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after
1752 } 1750 }
1753 1751
1754 void ChunkDemuxer::ShutdownAllStreams() { 1752 void ChunkDemuxer::ShutdownAllStreams() {
1755 for (SourceStateMap::iterator itr = source_state_map_.begin(); 1753 for (SourceStateMap::iterator itr = source_state_map_.begin();
1756 itr != source_state_map_.end(); ++itr) { 1754 itr != source_state_map_.end(); ++itr) {
1757 itr->second->Shutdown(); 1755 itr->second->Shutdown();
1758 } 1756 }
1759 } 1757 }
1760 1758
1761 } // namespace media 1759 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/chunk_demuxer.h ('k') | media/filters/fake_demuxer_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698