Index: content/renderer/media_recorder/video_track_recorder.h |
diff --git a/content/renderer/media_recorder/video_track_recorder.h b/content/renderer/media_recorder/video_track_recorder.h |
index 53a871f32512a7e4a4a23462fa26e568ac1c6fcc..eecce71570d66c3cc40f34219ca86b995ffe5bb4 100644 |
--- a/content/renderer/media_recorder/video_track_recorder.h |
+++ b/content/renderer/media_recorder/video_track_recorder.h |
@@ -32,8 +32,18 @@ class VideoFrame; |
} // namespace media |
namespace video_track_recorder { |
+#if !defined(OS_ANDROID) |
mcasas
2017/04/17 20:10:39
Don't use negative conditionals:
#if defined(OS_A
braveyao
2017/04/18 16:15:38
Done.
|
const int kVEAEncoderMinResolutionWidth = 640; |
const int kVEAEncoderMinResolutionHeight = 480; |
+#else |
+// The minimum resolution supported by HW H264 on Android varies on each |
+// platform and OS version. |
+// Take Nexus 5 as an example, it's: |
+// 176x144 on KitKat; 160x120 on Lollipop; 96x64 on Marshmallow and above. |
+// Set 176x144 for now and revise it as the target API level changes. |
mcasas
2017/04/17 20:10:39
If there's an action for the future, we need a bug
braveyao
2017/04/18 16:15:38
Done.
Keeping minimum resolution to QCIF: 176x144
|
+const int kVEAEncoderMinResolutionWidth = 172; |
+const int kVEAEncoderMinResolutionHeight = 144; |
+#endif |
} // namespace video_track_recorder |
namespace content { |
@@ -51,7 +61,7 @@ class CONTENT_EXPORT VideoTrackRecorder |
enum class CodecId { |
VP8, |
VP9, |
-#if BUILDFLAG(RTC_USE_H264) |
+#if BUILDFLAG(RTC_USE_H264) || defined(OS_ANDROID) |
H264, |
#endif |
LAST |