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

Unified Diff: webrtc/modules/video_coding/codecs/test/videoprocessor.cc

Issue 1306813009: H.264 video codec support using OpenH264/FFmpeg (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase with master Created 4 years, 11 months 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: webrtc/modules/video_coding/codecs/test/videoprocessor.cc
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc
index 7376000bd5d7937c0bc6804b0dd12558c69eb77e..47e9eec399ef6071a7d9e6966a717b40aeef6ae6 100644
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc
@@ -225,7 +225,9 @@ bool VideoProcessorImpl::ProcessFrame(int frame_number) {
}
}
-void VideoProcessorImpl::FrameEncoded(const EncodedImage& encoded_image) {
+void VideoProcessorImpl::FrameEncoded(
+ const EncodedImage& encoded_image,
+ const webrtc::RTPFragmentationHeader* fragmentation) {
// Timestamp is frame number, so this gives us #dropped frames.
int num_dropped_from_prev_encode =
encoded_image._timeStamp - prev_time_stamp_ - 1;
@@ -276,12 +278,16 @@ void VideoProcessorImpl::FrameEncoded(const EncodedImage& encoded_image) {
assert(false);
}
}
- rtc::scoped_ptr<uint8_t[]> copied_buffer(new uint8_t[encoded_image._length]);
- memcpy(copied_buffer.get(), encoded_image._buffer, encoded_image._length);
+
+ // The image to feed to the decoder.
EncodedImage copied_image;
memcpy(&copied_image, &encoded_image, sizeof(copied_image));
+ // Make a raw copy of the |encoded_image| buffer.
+ rtc::scoped_ptr<uint8_t[]> copied_buffer(new uint8_t[encoded_image._length]);
+ memcpy(copied_buffer.get(), encoded_image._buffer, encoded_image._length);
copied_image._size = copied_image._length;
copied_image._buffer = copied_buffer.get();
+
if (!exclude_this_frame) {
stat.packets_dropped =
packet_manipulator_->ManipulatePackets(&copied_image);
@@ -412,12 +418,14 @@ int32_t VideoProcessorImpl::VideoProcessorEncodeCompleteCallback::Encoded(
const EncodedImage& encoded_image,
const webrtc::CodecSpecificInfo* codec_specific_info,
const webrtc::RTPFragmentationHeader* fragmentation) {
- video_processor_->FrameEncoded(encoded_image); // Forward to parent class.
+ // Forward to parent class.
+ video_processor_->FrameEncoded(encoded_image, fragmentation);
return 0;
}
int32_t VideoProcessorImpl::VideoProcessorDecodeCompleteCallback::Decoded(
VideoFrame& image) {
- video_processor_->FrameDecoded(image); // forward to parent class
+ // Forward to parent class.
+ video_processor_->FrameDecoded(image);
return 0;
}

Powered by Google App Engine
This is Rietveld 408576698