OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/common/gpu/media/android_video_encode_accelerator.h" | 5 #include "content/common/gpu/media/android_video_encode_accelerator.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
13 #include "base/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
14 #include "content/common/gpu/gpu_channel.h" | 14 #include "content/common/gpu/gpu_channel.h" |
| 15 #include "content/common/gpu/media/shared_memory_region.h" |
15 #include "content/public/common/content_switches.h" | 16 #include "content/public/common/content_switches.h" |
16 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" | 17 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
17 #include "media/base/android/media_codec_util.h" | 18 #include "media/base/android/media_codec_util.h" |
18 #include "media/base/bitstream_buffer.h" | 19 #include "media/base/bitstream_buffer.h" |
19 #include "media/base/limits.h" | 20 #include "media/base/limits.h" |
20 #include "media/video/picture.h" | 21 #include "media/video/picture.h" |
21 #include "third_party/libyuv/include/libyuv/convert_from.h" | 22 #include "third_party/libyuv/include/libyuv/convert_from.h" |
22 #include "ui/gl/android/scoped_java_surface.h" | 23 #include "ui/gl/android/scoped_java_surface.h" |
23 #include "ui/gl/gl_bindings.h" | 24 #include "ui/gl/gl_bindings.h" |
24 | 25 |
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
422 break; | 423 break; |
423 | 424 |
424 default: | 425 default: |
425 NOTREACHED(); | 426 NOTREACHED(); |
426 break; | 427 break; |
427 } | 428 } |
428 } while (buf_index < 0); | 429 } while (buf_index < 0); |
429 | 430 |
430 media::BitstreamBuffer bitstream_buffer = available_bitstream_buffers_.back(); | 431 media::BitstreamBuffer bitstream_buffer = available_bitstream_buffers_.back(); |
431 available_bitstream_buffers_.pop_back(); | 432 available_bitstream_buffers_.pop_back(); |
432 scoped_ptr<base::SharedMemory> shm( | 433 scoped_ptr<SharedMemoryRegion> shm( |
433 new base::SharedMemory(bitstream_buffer.handle(), false)); | 434 new SharedMemoryRegion(bitstream_buffer, false)); |
434 RETURN_ON_FAILURE(shm->Map(bitstream_buffer.size()), | 435 RETURN_ON_FAILURE(shm->Map(), "Failed to map SHM", kPlatformFailureError); |
435 "Failed to map SHM", | 436 RETURN_ON_FAILURE(size <= shm->size(), |
436 kPlatformFailureError); | 437 "Encoded buffer too large: " << size << ">" << shm->size(), |
437 RETURN_ON_FAILURE(size <= shm->mapped_size(), | |
438 "Encoded buffer too large: " << size << ">" | |
439 << shm->mapped_size(), | |
440 kPlatformFailureError); | 438 kPlatformFailureError); |
441 | 439 |
442 media_codec_->CopyFromOutputBuffer(buf_index, offset, shm->memory(), size); | 440 media_codec_->CopyFromOutputBuffer(buf_index, offset, shm->memory(), size); |
443 media_codec_->ReleaseOutputBuffer(buf_index, false); | 441 media_codec_->ReleaseOutputBuffer(buf_index, false); |
444 --num_buffers_at_codec_; | 442 --num_buffers_at_codec_; |
445 | 443 |
446 UMA_HISTOGRAM_COUNTS_10000("Media.AVEA.EncodedBufferSizeKB", size / 1024); | 444 UMA_HISTOGRAM_COUNTS_10000("Media.AVEA.EncodedBufferSizeKB", size / 1024); |
447 base::MessageLoop::current()->PostTask( | 445 base::MessageLoop::current()->PostTask( |
448 FROM_HERE, | 446 FROM_HERE, |
449 base::Bind(&VideoEncodeAccelerator::Client::BitstreamBufferReady, | 447 base::Bind(&VideoEncodeAccelerator::Client::BitstreamBufferReady, |
450 client_ptr_factory_->GetWeakPtr(), | 448 client_ptr_factory_->GetWeakPtr(), |
451 bitstream_buffer.id(), | 449 bitstream_buffer.id(), |
452 size, | 450 size, |
453 key_frame)); | 451 key_frame)); |
454 } | 452 } |
455 | 453 |
456 } // namespace content | 454 } // namespace content |
OLD | NEW |