Exynos VEA: minor bugfix with frame size.

content/common/gpu/media/exynos_video_encode_accelerator.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/media/exynos_video_encode_accelerator.h"
 
 #include <fcntl.h>
 #include <linux/videodev2.h>
 #include <poll.h>
 #include <sys/eventfd.h>
@@ skipping 689 matching lines @@
     if (HANDLE_EINTR(ioctl(mfc_fd_, VIDIOC_DQBUF, &dqbuf)) != 0) {
       if (errno == EAGAIN) {
         // EAGAIN if we're just out of buffers to dequeue.
         break;
       }
       DPLOG(ERROR) << "DequeueMfc(): ioctl() failed: VIDIOC_DQBUF";
       NOTIFY_ERROR(kPlatformFailureError);
       return;
     }
     const bool key_frame = ((dqbuf.flags & V4L2_BUF_FLAG_KEYFRAME) != 0);
-    const size_t output_size = dqbuf.m.planes[0].bytesused;
+    size_t output_size = dqbuf.m.planes[0].bytesused;
     MfcOutputRecord& output_record = mfc_output_buffer_map_[dqbuf.index];
     DCHECK(output_record.at_device);
     DCHECK(output_record.buffer_ref.get());
     uint8* data =
         reinterpret_cast<uint8*>(output_record.buffer_ref->shm->memory());
     if (stream_header_size_ == 0) {
       // Assume that the first buffer dequeued is the stream header.
       stream_header_size_ = output_size;
       stream_header_.reset(new uint8[stream_header_size_]);
       memcpy(stream_header_.get(), data, stream_header_size_);
     }
     if (key_frame &&
         output_buffer_byte_size_ - stream_header_size_ >= output_size) {
       // Insert stream header before every keyframe.
       memmove(data + stream_header_size_, data, output_size);
       memcpy(data, stream_header_.get(), stream_header_size_);
+      output_size += stream_header_size_;
     }
     DVLOG(3) << "DequeueMfc(): returning "
                 "bitstream_buffer_id=" << output_record.buffer_ref->id
              << ", key_frame=" << key_frame;
     child_message_loop_proxy_->PostTask(
         FROM_HERE,
         base::Bind(&Client::BitstreamBufferReady,
                    client_,
                    output_record.buffer_ref->id,
-                   dqbuf.m.planes[0].bytesused,
+                   output_size,
                    key_frame));
     output_record.at_device = false;
     output_record.buffer_ref.reset();
     mfc_free_output_buffers_.push_back(dqbuf.index);
     mfc_output_buffer_queued_count_--;
   }
 }
 
 bool ExynosVideoEncodeAccelerator::EnqueueGscInputRecord() {
   DVLOG(3) << "EnqueueGscInputRecord()";
@@ skipping 734 matching lines @@
   reqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
   reqbufs.memory = V4L2_MEMORY_USERPTR;
   if (HANDLE_EINTR(ioctl(mfc_fd_, VIDIOC_REQBUFS, &reqbufs)) != 0)
     DPLOG(ERROR) << "DestroyMfcOutputBuffers(): ioctl() failed: VIDIOC_REQBUFS";
 
   mfc_output_buffer_map_.clear();
   mfc_free_output_buffers_.clear();
 }
 
 }  // namespace content