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

Side by Side Diff: media/webm/webm_stream_parser.cc

Issue 11313016: Add "type" in GenerateKeyRequest() and OnNeedKey(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the DCHECK where init_data_type_ is set but NeedKey from decoder passes empty "type". Created 8 years, 1 month 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/mp4/mp4_stream_parser_unittest.cc ('k') | webkit/media/crypto/ppapi/clear_key_cdm.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/webm/webm_stream_parser.h" 5 #include "media/webm/webm_stream_parser.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "media/ffmpeg/ffmpeg_common.h" 11 #include "media/ffmpeg/ffmpeg_common.h"
12 #include "media/filters/ffmpeg_glue.h" 12 #include "media/filters/ffmpeg_glue.h"
13 #include "media/filters/in_memory_url_protocol.h" 13 #include "media/filters/in_memory_url_protocol.h"
14 #include "media/webm/webm_cluster_parser.h" 14 #include "media/webm/webm_cluster_parser.h"
15 #include "media/webm/webm_constants.h" 15 #include "media/webm/webm_constants.h"
16 #include "media/webm/webm_content_encodings.h" 16 #include "media/webm/webm_content_encodings.h"
17 #include "media/webm/webm_info_parser.h" 17 #include "media/webm/webm_info_parser.h"
18 #include "media/webm/webm_tracks_parser.h" 18 #include "media/webm/webm_tracks_parser.h"
19 19
20 namespace media { 20 namespace media {
21 21
22 // TODO(xhwang): Figure out the init data type appropriately once it's spec'ed.
23 static const char kWebMInitDataType[] = "video/webm";
24
22 // Helper class that uses FFmpeg to create AudioDecoderConfig & 25 // Helper class that uses FFmpeg to create AudioDecoderConfig &
23 // VideoDecoderConfig objects. 26 // VideoDecoderConfig objects.
24 // 27 //
25 // This dependency on FFmpeg can be removed once we update WebMTracksParser 28 // This dependency on FFmpeg can be removed once we update WebMTracksParser
26 // to parse the necessary data to construct AudioDecoderConfig & 29 // to parse the necessary data to construct AudioDecoderConfig &
27 // VideoDecoderConfig objects. http://crbug.com/108756 30 // VideoDecoderConfig objects. http://crbug.com/108756
28 class FFmpegConfigHelper { 31 class FFmpegConfigHelper {
29 public: 32 public:
30 FFmpegConfigHelper(); 33 FFmpegConfigHelper();
31 ~FFmpegConfigHelper(); 34 ~FFmpegConfigHelper();
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 end_of_segment_cb_.Run(); 470 end_of_segment_cb_.Run();
468 471
469 return bytes_parsed; 472 return bytes_parsed;
470 } 473 }
471 474
472 void WebMStreamParser::FireNeedKey(const std::string& key_id) { 475 void WebMStreamParser::FireNeedKey(const std::string& key_id) {
473 int key_id_size = key_id.size(); 476 int key_id_size = key_id.size();
474 DCHECK_GT(key_id_size, 0); 477 DCHECK_GT(key_id_size, 0);
475 scoped_array<uint8> key_id_array(new uint8[key_id_size]); 478 scoped_array<uint8> key_id_array(new uint8[key_id_size]);
476 memcpy(key_id_array.get(), key_id.data(), key_id_size); 479 memcpy(key_id_array.get(), key_id.data(), key_id_size);
477 need_key_cb_.Run(key_id_array.Pass(), key_id_size); 480 need_key_cb_.Run(kWebMInitDataType, key_id_array.Pass(), key_id_size);
478 } 481 }
479 482
480 } // namespace media 483 } // namespace media
OLDNEW
« no previous file with comments | « media/mp4/mp4_stream_parser_unittest.cc ('k') | webkit/media/crypto/ppapi/clear_key_cdm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698