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

Unified Diff: content/renderer/media/android/media_source_delegate.cc

Issue 119203003: Drop DecryptConfig::data_offset_. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 7 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/android/media_source_delegate.cc
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc
index 57fc0157ca4ed157ea1e4837d90ee9153ae90d5e..42d728926ad515b7e4e9e554d673a1f7d746c7e7 100644
--- a/content/renderer/media/android/media_source_delegate.cc
+++ b/content/renderer/media/android/media_source_delegate.cc
@@ -450,14 +450,8 @@ void MediaSourceDelegate::OnBufferReady(
}
data->access_units[index].timestamp = buffer->timestamp();
- { // No local variable in switch-case scope.
- int data_offset = buffer->decrypt_config() ?
- buffer->decrypt_config()->data_offset() : 0;
- DCHECK_LT(data_offset, buffer->data_size());
- data->access_units[index].data = std::vector<uint8>(
- buffer->data() + data_offset,
- buffer->data() + buffer->data_size() - data_offset);
- }
+ data->access_units[index].data.assign(
+ buffer->data(), buffer->data() + buffer->data_size());
#if !defined(GOOGLE_TV)
// Vorbis needs 4 extra bytes padding on Android. Check
// NuMediaExtractor.cpp in Android source code.
« no previous file with comments | « no previous file | content/renderer/pepper/content_decryptor_delegate.cc » ('j') | media/webm/webm_cluster_parser.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698