Merge "test-resample: clip instead of overflowing"
diff --git a/media/libstagefright/wifi-display/source/Converter.cpp b/media/libstagefright/wifi-display/source/Converter.cpp
index a4a6f07..7a8dd7c 100644
--- a/media/libstagefright/wifi-display/source/Converter.cpp
+++ b/media/libstagefright/wifi-display/source/Converter.cpp
@@ -143,7 +143,7 @@
mOutputFormat->setString("mime", outputMIME.c_str());
int32_t audioBitrate = getBitrate("media.wfd.audio-bitrate", 128000);
- int32_t videoBitrate = getBitrate("media.wfd.video-bitrate", 2500000);
+ int32_t videoBitrate = getBitrate("media.wfd.video-bitrate", 5000000);
ALOGI("using audio bitrate of %d bps, video bitrate of %d bps",
audioBitrate, videoBitrate);
diff --git a/media/libstagefright/wifi-display/source/Converter.h b/media/libstagefright/wifi-display/source/Converter.h
index 8dfff3d..2cdeda3 100644
--- a/media/libstagefright/wifi-display/source/Converter.h
+++ b/media/libstagefright/wifi-display/source/Converter.h
@@ -27,7 +27,7 @@
struct ABuffer;
struct MediaCodec;
-#define ENABLE_SILENCE_DETECTION 1
+#define ENABLE_SILENCE_DETECTION 0
// Utility class that receives media access units and converts them into
// media access unit of a different format.
@@ -120,4 +120,3 @@
} // namespace android
#endif // CONVERTER_H_
-