media/filters/chunk_demuxer.cc - Issue 10534096: Generalize AesDecryptor to make it more spec compliant.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10534096: Generalize AesDecryptor to make it more spec compliant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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

OLD	NEW
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 "base/bind.h"	7 #include "base/bind.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/message_loop.h"	9 #include "base/message_loop.h"

10 #include "media/base/audio_decoder_config.h"	10 #include "media/base/audio_decoder_config.h"

(...skipping 784 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
795 return false;	795 return false;

796	796

797 // TODO(annacc): return Append's result after http://crbug.com/125072 is fixed	797 // TODO(annacc): return Append's result after http://crbug.com/125072 is fixed

798 video_->Append(buffers);	798 video_->Append(buffers);

799	799

800 return true;	800 return true;

801 }	801 }

802	802

803 bool ChunkDemuxer::OnKeyNeeded(scoped_array<uint8> init_data,	803 bool ChunkDemuxer::OnKeyNeeded(scoped_array<uint8> init_data,

804 int init_data_size) {	804 int init_data_size) {

805 client_->KeyNeeded(init_data.Pass(), init_data_size);	805 client_->DemuxerKeyNeeded(init_data.Pass(), init_data_size);

806 return true;	806 return true;

807 }	807 }

808	808

809 } // namespace media	809 } // namespace media

OLD	NEW

« media/crypto/decryptor_client.h ('K') | « media/crypto/decryptor_client.h ('k') | media/filters/chunk_demuxer_client.h » ('j') | media/filters/chunk_demuxer_client.h » ('J')