summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorhshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 17:04:45 +0000
committerhshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 17:04:45 +0000
commit348baf5a7b91cc4801dca5eae2921072055f35bc (patch)
tree5a5d0be56db613c9fef29ead4711abe7518eea5f /media
parent4f17b6707312cd857f888ea2e2e10fe994e76d92 (diff)
downloadchromium_src-348baf5a7b91cc4801dca5eae2921072055f35bc.zip
chromium_src-348baf5a7b91cc4801dca5eae2921072055f35bc.tar.gz
chromium_src-348baf5a7b91cc4801dca5eae2921072055f35bc.tar.bz2
Encoded video capture: wire up key frame and bitrate settings.
Define RequestKeyFrame in IPC message header. Wire up RequestKeyFrame and TrySetBitstreamConfig with the corresponding entry points in WebRTC video encoder. BUG=221441 TEST=trybot Review URL: https://chromiumcodereview.appspot.com/19860002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/video/encoded_video_source.h3
-rw-r--r--media/video/video_encode_types.h14
2 files changed, 11 insertions, 6 deletions
diff --git a/media/video/encoded_video_source.h b/media/video/encoded_video_source.h
index e2ce201..f0c9a13 100644
--- a/media/video/encoded_video_source.h
+++ b/media/video/encoded_video_source.h
@@ -68,6 +68,9 @@ class EncodedVideoSource {
// signaling successful change.
virtual void TrySetBitstreamConfig(
const RuntimeVideoEncodingParameters& params) = 0;
+
+ // RequestKeyFrame requests a key frame.
+ virtual void RequestKeyFrame() = 0;
};
} // namespace media
diff --git a/media/video/video_encode_types.h b/media/video/video_encode_types.h
index 0372019..15effab 100644
--- a/media/video/video_encode_types.h
+++ b/media/video/video_encode_types.h
@@ -15,22 +15,24 @@
namespace media {
// Data to represent limitations for a particular encoder config.
+// The |max_bitrate| value is in bits per second.
struct VideoEncodingConfig {
VideoCodec codec_type;
std::string codec_name;
gfx::Size max_resolution;
- int max_frames_per_second;
- int max_bitrate;
+ uint32 max_frames_per_second;
+ uint32 max_bitrate;
};
typedef std::vector<VideoEncodingConfig> VideoEncodingCapabilities;
// Encoding parameters that can be configured during streaming without removing
-// the bitstream first.
+// the bitstream first. The |target_bitrate| and |max_bitrate| values are in
+// bits per second.
struct RuntimeVideoEncodingParameters {
- int target_bitrate;
- int max_bitrate;
- int frames_per_second;
+ uint32 target_bitrate;
+ uint32 max_bitrate;
+ uint32 frames_per_second;
};
// Generic video encoding parameters to be configured during initialization