[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/20.0.1132.21_r139451-1-8-g18428fd
Giuseppe Iuculano
iuculano at debian.org
Wed Jun 6 08:24:05 UTC 2012
The following commit has been merged in the master branch:
commit b4e5b1d5d8bdffcca8ed4071fdfafefe71c7e82a
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Fri Jun 1 15:32:50 2012 +0200
Fix FTBFS when compiling with pulseaudio support
diff --git a/debian/patches/protobuf.patch b/debian/patches/protobuf.patch
index ec77c4f..76b8120 100644
--- a/debian/patches/protobuf.patch
+++ b/debian/patches/protobuf.patch
@@ -1,7 +1,7 @@
Index: exp/src/chrome/app/policy/cloud_policy_codegen.gyp
===================================================================
---- exp.orig/src/chrome/app/policy/cloud_policy_codegen.gyp 2012-05-19 16:54:41.000000000 +0200
-+++ exp/src/chrome/app/policy/cloud_policy_codegen.gyp 2012-05-29 14:22:19.006236717 +0200
+--- exp.orig/src/chrome/app/policy/cloud_policy_codegen.gyp 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/chrome/app/policy/cloud_policy_codegen.gyp 2012-05-29 18:27:39.797884627 +0200
@@ -115,7 +115,7 @@
'cloud_policy_proto_compile',
'cloud_policy_backend_header_compile',
@@ -13,8 +13,8 @@ Index: exp/src/chrome/app/policy/cloud_policy_codegen.gyp
],
Index: exp/src/chrome/chrome_browser.gypi
===================================================================
---- exp.orig/src/chrome/chrome_browser.gypi 2012-05-28 09:38:34.000000000 +0200
-+++ exp/src/chrome/chrome_browser.gypi 2012-05-29 14:22:19.006236717 +0200
+--- exp.orig/src/chrome/chrome_browser.gypi 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/chrome/chrome_browser.gypi 2012-05-29 18:27:39.809884627 +0200
@@ -4843,8 +4843,7 @@
['chromeos==1',{
'dependencies': [
@@ -27,8 +27,8 @@ Index: exp/src/chrome/chrome_browser.gypi
['system_libcros==0', {
Index: exp/src/net/net.gyp
===================================================================
---- exp.orig/src/net/net.gyp 2012-05-19 16:54:19.000000000 +0200
-+++ exp/src/net/net.gyp 2012-05-29 14:22:19.006236717 +0200
+--- exp.orig/src/net/net.gyp 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/net/net.gyp 2012-05-29 18:27:39.821884626 +0200
@@ -1539,7 +1539,7 @@
'../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_compile',
# The test server uses Python modules generated by the sync protos.
@@ -40,8 +40,8 @@ Index: exp/src/net/net.gyp
['os_posix == 1 and OS != "mac" and OS != "android"', {
Index: exp/src/remoting/remoting.gyp
===================================================================
---- exp.orig/src/remoting/remoting.gyp 2012-05-29 14:22:01.046237146 +0200
-+++ exp/src/remoting/remoting.gyp 2012-05-29 14:22:19.010236718 +0200
+--- exp.orig/src/remoting/remoting.gyp 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/remoting/remoting.gyp 2012-05-29 18:27:39.837884626 +0200
@@ -1046,7 +1046,7 @@
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
@@ -62,8 +62,8 @@ Index: exp/src/remoting/remoting.gyp
# This target needs a hard dependency because dependent targets
Index: exp/src/third_party/cacheinvalidation/cacheinvalidation.gyp
===================================================================
---- exp.orig/src/third_party/cacheinvalidation/cacheinvalidation.gyp 2012-05-19 16:54:27.000000000 +0200
-+++ exp/src/third_party/cacheinvalidation/cacheinvalidation.gyp 2012-05-29 14:22:19.010236718 +0200
+--- exp.orig/src/third_party/cacheinvalidation/cacheinvalidation.gyp 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/third_party/cacheinvalidation/cacheinvalidation.gyp 2012-05-29 18:27:39.861884625 +0200
@@ -18,7 +18,7 @@
# Where files generated from proto files are put.
'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
@@ -102,8 +102,8 @@ Index: exp/src/third_party/cacheinvalidation/cacheinvalidation.gyp
# header files.
Index: exp/src/third_party/safe_browsing/safe_browsing.gyp
===================================================================
---- exp.orig/src/third_party/safe_browsing/safe_browsing.gyp 2012-05-19 16:54:32.000000000 +0200
-+++ exp/src/third_party/safe_browsing/safe_browsing.gyp 2012-05-29 14:22:19.010236718 +0200
+--- exp.orig/src/third_party/safe_browsing/safe_browsing.gyp 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/third_party/safe_browsing/safe_browsing.gyp 2012-05-29 18:27:39.881884625 +0200
@@ -13,10 +13,10 @@
'testing/testing_input.dat',
],
@@ -119,8 +119,8 @@ Index: exp/src/third_party/safe_browsing/safe_browsing.gyp
],
Index: exp/src/build/linux/system.gyp
===================================================================
---- exp.orig/src/build/linux/system.gyp 2012-05-29 14:22:18.926236719 +0200
-+++ exp/src/build/linux/system.gyp 2012-05-29 14:22:19.010236718 +0200
+--- exp.orig/src/build/linux/system.gyp 2012-05-29 18:27:39.581884632 +0200
++++ exp/src/build/linux/system.gyp 2012-05-29 18:27:39.881884625 +0200
@@ -447,6 +447,26 @@
],
},
@@ -150,8 +150,8 @@ Index: exp/src/build/linux/system.gyp
# link directly in this version of the target to allow this.
Index: exp/src/chrome/chrome_browser_extensions.gypi
===================================================================
---- exp.orig/src/chrome/chrome_browser_extensions.gypi 2012-05-19 16:55:35.000000000 +0200
-+++ exp/src/chrome/chrome_browser_extensions.gypi 2012-05-29 14:22:19.010236718 +0200
+--- exp.orig/src/chrome/chrome_browser_extensions.gypi 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/chrome/chrome_browser_extensions.gypi 2012-05-29 18:27:39.889884625 +0200
@@ -634,8 +634,7 @@
],
'dependencies': [
@@ -164,8 +164,8 @@ Index: exp/src/chrome/chrome_browser_extensions.gypi
['system_libcros==0', {
Index: exp/src/dbus/dbus.gyp
===================================================================
---- exp.orig/src/dbus/dbus.gyp 2012-05-19 16:54:07.000000000 +0200
-+++ exp/src/dbus/dbus.gyp 2012-05-29 14:22:19.010236718 +0200
+--- exp.orig/src/dbus/dbus.gyp 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/dbus/dbus.gyp 2012-05-29 18:27:39.897884626 +0200
@@ -13,7 +13,7 @@
'dependencies': [
'../base/base.gyp:base',
@@ -177,8 +177,8 @@ Index: exp/src/dbus/dbus.gyp
'../base/base.gyp:base',
Index: exp/src/third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp
===================================================================
---- exp.orig/src/third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp 2012-05-19 16:56:41.000000000 +0200
-+++ exp/src/third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp 2012-05-29 14:22:19.010236718 +0200
+--- exp.orig/src/third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp 2012-05-29 18:27:39.917884624 +0200
@@ -73,14 +73,14 @@
'rule_name': 'genproto',
'extension': 'proto',
@@ -217,8 +217,8 @@ Index: exp/src/third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp
{
Index: exp/src/third_party/webrtc/build/protoc.gypi
===================================================================
---- exp.orig/src/third_party/webrtc/build/protoc.gypi 2012-05-28 09:38:46.000000000 +0200
-+++ exp/src/third_party/webrtc/build/protoc.gypi 2012-05-29 14:22:19.010236718 +0200
+--- exp.orig/src/third_party/webrtc/build/protoc.gypi 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/third_party/webrtc/build/protoc.gypi 2012-05-29 18:27:39.925884624 +0200
@@ -44,7 +44,7 @@
{
@@ -249,8 +249,8 @@ Index: exp/src/third_party/webrtc/build/protoc.gypi
# files.
Index: exp/src/third_party/mozc/session/session.gyp
===================================================================
---- exp.orig/src/third_party/mozc/session/session.gyp 2012-05-19 16:56:45.000000000 +0200
-+++ exp/src/third_party/mozc/session/session.gyp 2012-05-29 14:22:19.010236718 +0200
+--- exp.orig/src/third_party/mozc/session/session.gyp 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/third_party/mozc/session/session.gyp 2012-05-29 18:27:39.925884624 +0200
@@ -70,7 +70,7 @@
'dependencies': [
'../composer/composer.gyp:composer',
@@ -262,8 +262,8 @@ Index: exp/src/third_party/mozc/session/session.gyp
],
Index: exp/src/third_party/mozc/session/session_base.gyp
===================================================================
---- exp.orig/src/third_party/mozc/session/session_base.gyp 2012-05-19 16:56:45.000000000 +0200
-+++ exp/src/third_party/mozc/session/session_base.gyp 2012-05-29 14:22:19.010236718 +0200
+--- exp.orig/src/third_party/mozc/session/session_base.gyp 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/third_party/mozc/session/session_base.gyp 2012-05-29 18:27:39.929884624 +0200
@@ -118,7 +118,7 @@
'<(proto_out_dir)/<(relative_dir)/state.pb.cc',
],
@@ -273,3 +273,289 @@ Index: exp/src/third_party/mozc/session/session_base.gyp
'genproto_session',
'../config/config.gyp:config_protocol',
],
+Index: exp/src/build/protoc.gypi
+===================================================================
+--- exp.orig/src/build/protoc.gypi 2012-05-29 17:56:56.673928712 +0200
++++ exp/src/build/protoc.gypi 2012-05-29 18:27:39.929884624 +0200
+@@ -39,7 +39,7 @@
+
+ {
+ 'variables': {
+- 'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
++ 'protoc': '/usr/bin/protoc',
+ 'cc_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out/<(proto_out_dir)',
+ 'py_dir': '<(PRODUCT_DIR)/pyproto/<(proto_out_dir)',
+ 'proto_in_dir%': '.',
+Index: exp/src/sync/protocol/app_notification_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/app_notification_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/app_notification_specifics.proto 2012-05-29 18:30:20.365880785 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/app_setting_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/app_setting_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/app_setting_specifics.proto 2012-05-29 18:33:22.621876427 +0200
+@@ -12,7 +12,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/app_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/app_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/app_specifics.proto 2012-05-29 18:30:05.725881135 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/autofill_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/autofill_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/autofill_specifics.proto 2012-05-29 18:29:25.189882105 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/bookmark_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/bookmark_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/bookmark_specifics.proto 2012-05-29 18:33:38.701876043 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/client_commands.proto
+===================================================================
+--- exp.orig/src/sync/protocol/client_commands.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/client_commands.proto 2012-05-29 18:36:15.333872297 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/client_debug_info.proto
+===================================================================
+--- exp.orig/src/sync/protocol/client_debug_info.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/client_debug_info.proto 2012-05-29 18:30:46.805880154 +0200
+@@ -7,7 +7,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/encryption.proto
+===================================================================
+--- exp.orig/src/sync/protocol/encryption.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/encryption.proto 2012-05-29 18:35:59.845872666 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/extension_setting_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/extension_setting_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/extension_setting_specifics.proto 2012-05-29 18:37:05.549871095 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/extension_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/extension_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/extension_specifics.proto 2012-05-29 18:35:50.589872888 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/get_updates_caller_info.proto
+===================================================================
+--- exp.orig/src/sync/protocol/get_updates_caller_info.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/get_updates_caller_info.proto 2012-05-29 18:34:50.029874337 +0200
+@@ -5,7 +5,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/nigori_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/nigori_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/nigori_specifics.proto 2012-05-29 18:33:58.205875576 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/password_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/password_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/password_specifics.proto 2012-05-29 18:35:19.461873631 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/preference_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/preference_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/preference_specifics.proto 2012-05-29 18:29:38.525881784 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/search_engine_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/search_engine_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/search_engine_specifics.proto 2012-05-29 18:36:54.213871368 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/session_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/session_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/session_specifics.proto 2012-05-29 18:35:04.725873984 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/sync.proto
+===================================================================
+--- exp.orig/src/sync/protocol/sync.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/sync.proto 2012-05-29 18:29:50.565881500 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/sync_enums.proto
+===================================================================
+--- exp.orig/src/sync/protocol/sync_enums.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/sync_enums.proto 2012-05-29 18:34:20.365875046 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/test.proto
+===================================================================
+--- exp.orig/src/sync/protocol/test.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/test.proto 2012-05-29 18:36:41.677871668 +0200
+@@ -7,7 +7,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/theme_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/theme_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/theme_specifics.proto 2012-05-29 18:36:28.613871979 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
+Index: exp/src/sync/protocol/typed_url_specifics.proto
+===================================================================
+--- exp.orig/src/sync/protocol/typed_url_specifics.proto 2012-05-19 16:54:15.000000000 +0200
++++ exp/src/sync/protocol/typed_url_specifics.proto 2012-05-29 18:35:36.085873235 +0200
+@@ -10,7 +10,7 @@
+ syntax = "proto2";
+
+ option optimize_for = LITE_RUNTIME;
+-option retain_unknown_fields = true;
++//option retain_unknown_fields = true;
+
+ package sync_pb;
+
diff --git a/debian/patches/pulseaudio.patch b/debian/patches/pulseaudio.patch
index 955fdbe..fe6a683 100644
--- a/debian/patches/pulseaudio.patch
+++ b/debian/patches/pulseaudio.patch
@@ -1,24 +1,44 @@
-description: fix pulseaudio messageloop comparisons
-author: Michael Gilbert <michael.s.gilbert at gmail.com>
Index: exp/src/media/audio/pulse/pulse_output.cc
===================================================================
---- exp.orig/src/media/audio/pulse/pulse_output.cc 2012-05-19 16:54:04.000000000 +0200
-+++ exp/src/media/audio/pulse/pulse_output.cc 2012-05-19 19:40:16.138682353 +0200
+--- exp.orig/src/media/audio/pulse/pulse_output.cc 2012-06-01 12:10:04.586631040 +0200
++++ exp/src/media/audio/pulse/pulse_output.cc 2012-06-01 12:25:23.754621364 +0200
@@ -128,7 +128,7 @@
PulseAudioOutputStream* stream =
reinterpret_cast<PulseAudioOutputStream*>(stream_addr);
- DCHECK_EQ(stream->manager_->GetMessageLoop(), MessageLoop::current());
-+ DCHECK_EQ(stream->manager_->GetMessageLoop(), MessageLoop::current()->message_loop_proxy());
++ DCHECK(stream->manager_->GetMessageLoop()->BelongsToCurrentThread());
stream->write_callback_handled_ = true;
+@@ -138,16 +138,16 @@
+
+ PulseAudioOutputStream::PulseAudioOutputStream(const AudioParameters& params,
+ AudioManagerPulse* manager)
+- : channel_layout_(params.channel_layout),
++ : channel_layout_(params.channel_layout()),
+ channel_count_(ChannelLayoutToChannelCount(channel_layout_)),
+- sample_format_(BitsToPASampleFormat(params.bits_per_sample)),
+- sample_rate_(params.sample_rate),
+- bytes_per_frame_(params.channels * params.bits_per_sample / 8),
++ sample_format_(BitsToPASampleFormat(params.bits_per_sample())),
++ sample_rate_(params.sample_rate()),
++ bytes_per_frame_(params.GetBytesPerFrame()),
+ manager_(manager),
+ pa_context_(NULL),
+ pa_mainloop_(NULL),
+ playback_handle_(NULL),
+- packet_size_(params.GetPacketSize()),
++ packet_size_(params.GetBytesPerBuffer()),
+ frames_per_packet_(packet_size_ / bytes_per_frame_),
+ client_buffer_(NULL),
+ volume_(1.0f),
@@ -155,7 +155,7 @@
write_callback_handled_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
source_callback_(NULL) {
- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current());
-+ DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()->message_loop_proxy());
++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread());
// TODO(slock): Sanity check input values.
}
@@ -27,7 +47,7 @@ Index: exp/src/media/audio/pulse/pulse_output.cc
bool PulseAudioOutputStream::Open() {
- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current());
-+ DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()->message_loop_proxy());
++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread());
// TODO(slock): Possibly move most of this to an OpenPlaybackDevice function
// in a new class 'pulse_util', like alsa_util.
@@ -36,7 +56,7 @@ Index: exp/src/media/audio/pulse/pulse_output.cc
void PulseAudioOutputStream::Close() {
- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current());
-+ DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()->message_loop_proxy());
++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread());
Reset();
@@ -45,16 +65,36 @@ Index: exp/src/media/audio/pulse/pulse_output.cc
void PulseAudioOutputStream::WaitForWriteRequest() {
- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current());
-+ DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()->message_loop_proxy());
++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread());
if (stream_stopped_)
return;
+@@ -337,8 +337,8 @@
+ // Request more data from the source until we can fulfill the request or
+ // fail to receive anymore data.
+ bool buffering_successful = true;
+- while (client_buffer_->forward_bytes() < requested_bytes &&
+- buffering_successful) {
++ size_t forward_bytes = static_cast<size_t>(client_buffer_->forward_bytes());
++ while (forward_bytes < requested_bytes && buffering_successful) {
+ buffering_successful = BufferPacketFromSource();
+ }
+
+@@ -369,7 +369,7 @@
+ *bytes_written = 0;
+ while (*bytes_written < bytes_to_write) {
+ const uint8* chunk;
+- size_t chunk_size;
++ int chunk_size;
+
+ // Stop writing if there is no more data available.
+ if (!client_buffer_->GetCurrentChunk(&chunk, &chunk_size))
@@ -384,7 +384,7 @@
}
void PulseAudioOutputStream::Start(AudioSourceCallback* callback) {
- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current());
-+ DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()->message_loop_proxy());
++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread());
CHECK(callback);
DLOG_IF(ERROR, !playback_handle_)
<< "Open() has not been called successfully";
@@ -63,21 +103,21 @@ Index: exp/src/media/audio/pulse/pulse_output.cc
void PulseAudioOutputStream::Stop() {
- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current());
-+ DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()->message_loop_proxy());
++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread());
stream_stopped_ = true;
}
void PulseAudioOutputStream::SetVolume(double volume) {
- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current());
-+ DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()->message_loop_proxy());
++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread());
volume_ = static_cast<float>(volume);
}
void PulseAudioOutputStream::GetVolume(double* volume) {
- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current());
-+ DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()->message_loop_proxy());
++ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread());
*volume = volume_;
}
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list